Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -25,7 +25,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <放开设备注册账号的限制> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <放开设备注册账号的限制-只限制仙剑导量包> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/LoginServiceImpl.java

@@ -214,7 +214,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
             return ResultVO.ok(userLoginVO);
         }
         //设备账号数量检测
-//        this.accountCheck(username, userData);
+        this.accountCheck(username, userData);
         //用户注册, 用户名密码校验
         HttpStatusEnum checkRegisterEnum = this.checkRegister(userData.getGameId(), username, password);
         if (!Objects.equals(checkRegisterEnum, HttpStatusEnum.SUCCESS)) {
@@ -264,7 +264,7 @@ public class LoginServiceImpl implements IRegisterLoginService {
             return ResultVO.ok(userLoginVO);
         }
         //设备账号数量检测
-//        this.accountCheck(mobile, userData);
+        this.accountCheck(mobile, userData);
         //用户注册
         user = userCreateSave(userData, mobile, null, mobile, null, null);
         //返回登录信息
@@ -273,13 +273,12 @@ public class LoginServiceImpl implements IRegisterLoginService {
     }
 
     private void accountCheck(String userName, UserData userData) {
-        //非安卓设备, 无法限制
-        if (Strings.isBlank(userData.getAndroidId())) {
+        //只限制仙剑导量包
+        if (!Objects.equals(userData.getGameId(), 36L)) {
             return;
         }
-        Game game = gameService.getById(userData.getGameId());
-        //仙剑游戏限制注册账号数量, 其他游戏直接过
-        if (game == null || !Objects.equals(game.getSuperGameId(), 12L)) {
+        //非安卓设备, 无法限制
+        if (Strings.isBlank(userData.getAndroidId())) {
             return;
         }
         //内部账号, 不受监控