Merge branch 'grok_inner' into pre

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

@@ -134,6 +134,9 @@ public interface Constant {
 	//含生日
 	String NEW_APPID_NO_COUNTRY_SECRET_DATE = "%s 朋友 %s 工作 %s 父母 %s";
 
+    //5.26
+    String APP_ID_SECRET = "朋友%s 工作%s 父母%s 出生日期%s";
+
 	String ACCOUNT_DOUBLE_VERIFY_KEY = "account_double_verify_key";
 
 	/**

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

@@ -399,6 +399,11 @@ public class CmsAccountServiceImpl extends ServiceImpl<AccountMapper, Account> i
 										string = builder.append("生日").append(Constant.ONE_EMPTY).append(part[2]).append(Constant.ONE_EMPTY).append(string).toString();
 									}
 									insert.setSecret(string);
+
+                                    if (sb.length() == 0) {
+                                        String secret = String.format(Constant.APP_ID_SECRET, part[2], part[3], part[4], part[5]);
+                                        insert.setSecret(secret);
+                                    }
 								} else {
 									//密保
 									if (part.length > 5) {

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -579,11 +579,11 @@ public class MirrorController {
             JSONObject result = new JSONObject();
 
             if (user == null) {
-                result.putOpt("code",0);
+                result.putOpt("code",1);
                 result.putOpt("msg","用户不存在或已过期");
                 return result.toString();
             }
-            result.putOpt("code",1);
+            result.putOpt("code",0);
             result.putOpt("msg","登陆成功");
             result.putOpt("isPro",true);
             result.putOpt("usertoken",userToken);
@@ -593,7 +593,7 @@ public class MirrorController {
         } catch (Exception e) {
             log.error("服务器错误", e);
             JSONObject result = new JSONObject();
-            result.putOpt("code",0);
+            result.putOpt("code",1);
             result.putOpt("msg","服务器错误");
             return result.toString();
         }