兼容美区appid导入格式

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -121,6 +121,8 @@ public interface Constant {
 	 */
 	String NEW_APPID_SECRET = "朋友 %s 工作 %s 父母 %s 国家 %s";
 
+	String NEW_APPID_NO_COUNTRY_SECRET = "朋友 %s 工作 %s 父母 %s";
+
 	String ACCOUNT_DOUBLE_VERIFY_KEY = "account_double_verify_key";
 
 	/**

netflix-service/src/main/java/com/cyksj/service/mange/account/CmsAccountServiceImpl.java

@@ -266,14 +266,19 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 				Map<String, Object> map = Jsons.toMap(accountData);
 				Account insert = new Account();
 				insert.setGoodsId(goodsId);
-				if (map.keySet().size() >= 6) {
+				if (map.keySet().size() >= 5) {
 					String account = map.get("0").toString();
 					String password = map.get("1").toString();
 					String friend = map.get("2").toString();
 					String work = map.get("3").toString();
 					String parents = map.get("4").toString();
-					String country = map.get("5").toString();
-					String secret = String.format(Constant.NEW_APPID_SECRET, friend, work, parents, country);
+					String secret;
+					if (map.keySet().size() == 6) {
+						String country = map.get("5").toString();
+						secret = String.format(Constant.NEW_APPID_SECRET, friend, work, parents, country);
+					} else {
+						secret = String.format(Constant.NEW_APPID_NO_COUNTRY_SECRET, friend, work, parents);
+					}
 					insert.setAccount(account);
 					insert.setPassword(password);
 					insert.setSecret(secret);