Merge remote-tracking branch 'origin/package' into package

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <Websocket客服系统游戏权限区分新老系统> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <调试修改01> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/KfMsgController.java

@@ -1,6 +1,7 @@
 package com.zanxiang.game.module.manage.controller;
 
 import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.manage.pojo.params.KfApiParam;
 import com.zanxiang.game.module.manage.pojo.params.KfUserUpdateParam;
 import com.zanxiang.game.module.manage.pojo.vo.KfGameVO;
@@ -43,6 +44,9 @@ public class KfMsgController {
     @PreAuthorize(permissionKey = "manage:kf:uploadMsg")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Tuple2.class)})
     public ResultVO<Tuple2<String, String>> uploadMsg(String param, MultipartFile files) {
+        if (SecurityUtil.getUserId() == 413) {
+            log.error("----------------> 1111111111111111111, param : {}", param);
+        }
         return ResultVO.ok(kfMsgService.uploadMsg(JsonUtil.toObj(param, KfApiParam.class), files));
     }
 
@@ -59,6 +63,9 @@ public class KfMsgController {
     @PreAuthorize(permissionKey = "manage:kf:commApi")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = String.class)})
     public ResultVO<String> list(@Validated @RequestBody KfApiParam param) {
+        if (SecurityUtil.getUserId() == 413) {
+            log.error("----------------> 2222222222222222222, param : {}", JsonUtil.toString(param));
+        }
         return ResultVO.ok(kfMsgService.kfApi(param));
     }
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/KfUserServiceImpl.java

@@ -43,7 +43,7 @@ public class KfUserServiceImpl extends ServiceImpl<KfUserMapper, KfUser> impleme
                 .eq(KfUser::getAppId, appId));
         if (kfUser == null) {
             log.error("参数错误, 客服用户信息不存在, kfUserId : {}, appId : {}", kfUserId, appId);
-            throw new BaseException("参数错误, 客服用户信息不存在");
+            throw new RuntimeException("参数错误, 客服用户信息不存在");
         }
         return kfUser;
     }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/websocket/KfMsgWebsocketHeartbeat.java

@@ -30,6 +30,7 @@ public class KfMsgWebsocketHeartbeat {
      */
     @Scheduled(cron = "0/20 * * * * ?")
     public void sessionHeartbeat() {
+        log.error("定时器心跳执行 --------------> ");
         List<WebSocketSession> sessionList = kfMsgWebSocketSessionRegistry.getAllSessions();
         if (CollectionUtils.isEmpty(sessionList)) {
             return;