Merge branch 'master' into pre

# Conflicts:
#	netflix-common/src/main/java/com/cyksj/common/util/TicketCodeCommonUtil.java
#	netflix-service/src/main/java/com/cyksj/service/mail/impl/CuiQiuMailServiceImpl.java

netflix-common/src/main/java/com/cyksj/common/util/TicketCodeCommonUtil.java

@@ -56,7 +56,7 @@ public class TicketCodeCommonUtil {
 		while (matcher.find()) {
 			String url = matcher.group();
 			if (url.contains(prefixUrl)) {
-				return url.replace("\"", "");
+				return url.replaceAll("\"", "");
 			}
 		}
 		return null;

netflix-service/src/main/java/com/cyksj/service/mail/impl/CuiQiuMailServiceImpl.java

@@ -64,7 +64,7 @@ public class CuiQiuMailServiceImpl implements CuiQiuMailService {
 		DateTime now = DateTime.now();
 		params.put("token", CUI_QIU_TOKEN);
 		params.put("mail_id", ADMIN_MAIL_ID);
-		params.put("start_time", DateUtil.offsetDay(now, -10).toDateStr());
+		params.put("start_time", DateUtil.offsetDay(now, -1).toDateStr());
 		params.put("end_time", DateUtil.offsetDay(now, 1).toDateStr());
 		params.put("to", email);
 		params.put("limit", 20);
@@ -137,19 +137,18 @@ public class CuiQiuMailServiceImpl implements CuiQiuMailService {
 				}
 			} else {
 				String urlPref = "https://www.netflix.com/account/update-primary-location";
-				code = TicketCodeCommonUtil.extractUrl(body, urlPref);
-				if (StrUtil.isEmpty(code)) {
+				String nfVerifyUrl = TicketCodeCommonUtil.extractUrl(body, urlPref);
+				if (StrUtil.isEmpty(nfVerifyUrl)) {
 					urlPref = "https://www.netflix.com/account/travel/verify";
-					code = TicketCodeCommonUtil.extractUrl(body, urlPref);
-					if (StrUtil.isEmpty(code)) {
+					nfVerifyUrl = TicketCodeCommonUtil.extractUrl(body, urlPref);
+					if (StrUtil.isEmpty(nfVerifyUrl)) {
 						throw BusinessRuntimeException.getInstance("获取认证链接失败,请重新获取");
 					}
 				}
-				String neurl = urlPref + code;
 				//非点击装置同步更新按钮 直接返回链接
-				if (!sync) return neurl;
+				if (!sync) return nfVerifyUrl;
 				//失败返回验证链接
-				if (!groupsRelationNetflix.confirmUpdate(neurl)) {
+				if (!groupsRelationNetflix.confirmUpdate(nfVerifyUrl)) {
 					return url;
 				}
 				return StrUtil.EMPTY;