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

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/component/DataPowerComponent.java

@@ -50,19 +50,19 @@ public class DataPowerComponent {
             return Tuple2.with(null, null);
         }
         Collection<Long> subUserIds = sysGameUserGroupRpc.memberUserIds(SecurityUtil.getCompanyId(), SecurityUtil.getUserId()).getData();
-        if(!"ZX_ONE".equals(sdk)) {
+        if (!"ZX_ONE".equals(sdk)) {
             return Tuple2.with(new ArrayList<>(subUserIds), null);
         }
         GameAuthUserVO userGameInfo = gameAuthRpc.getGameAuthByUserIds().getData();
-        if(CollectionUtils.isEmpty(userGameInfo.getGameIdList())) {
+        if (CollectionUtils.isEmpty(userGameInfo.getGameIdList())) {
             throw new BaseException("没有游戏查看权限，请联系管理员指派游戏权限");
         }
         GameAuthEnum gameAuth = userGameInfo.getGameAuthEnum();
-        if(CollectionUtils.isEmpty(subUserIds)) {
+        if (CollectionUtils.isEmpty(subUserIds)) {
             throw new BaseException("服务异常，获取用户列表失败！！");
         }
         if (subUserIds.size() == 1) {
-            if(gameAuth == GameAuthEnum.OPERATE) {
+            if (gameAuth == GameAuthEnum.OPERATE || gameAuth == GameAuthEnum.CUSTOMER || gameAuth == GameAuthEnum.GS) {
                 // 运营
                 return Tuple2.with(null, userGameInfo.getGameIdList());
             } else {
@@ -71,7 +71,7 @@ public class DataPowerComponent {
             }
         } else {
             // 组长
-            if(gameAuth == GameAuthEnum.OPERATE) {
+            if (gameAuth == GameAuthEnum.OPERATE || gameAuth == GameAuthEnum.CUSTOMER || gameAuth == GameAuthEnum.GS) {
                 // 运营组长
                 return Tuple2.with(null, userGameInfo.getGameIdList());
             } else {
@@ -119,7 +119,7 @@ public class DataPowerComponent {
             return null;
         }
         List<Long> gameIdList = gameAuthRpc.getGameAuthByUserIds().getData().getGameIdList();
-        if(CollectionUtils.isEmpty(gameIdList)) {
+        if (CollectionUtils.isEmpty(gameIdList)) {
             throw new BaseException("没有游戏查看权限，请联系管理员指派游戏权限");
         }
         return gameIdList;

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

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <修正用户渠道变更的回传BUG> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <渠道变更不上线时长更新为60天> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

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

@@ -69,7 +69,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
             //最近登录时间
             LocalDateTime lastLoginTime = userLoginLogList.get(0).getCreateTime();
             //最近登录未超过30天
-            if (lastLoginTime.plusDays(30L).isAfter(LocalDateTime.now())) {
+            if (lastLoginTime.plusDays(60L).isAfter(LocalDateTime.now())) {
                 return;
             }
             //30天未登录, 更新渠道