瀏覽代碼

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

zhimo 1 年之前
父節點
當前提交
8f0b855ab4

+ 1 - 1
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导致的token入侵问题´・・)ノ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (处理Websocket导致的token入侵问题02´・・)ノ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

+ 1 - 7
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/AgentController.java

@@ -2,7 +2,6 @@ package com.zanxiang.game.module.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.erp.security.annotation.PreAuthorize;
-import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.game.module.base.pojo.enums.AccountTypeEnum;
 import com.zanxiang.game.module.manage.pojo.params.AgentAddParam;
 import com.zanxiang.game.module.manage.pojo.params.AgentListParam;
@@ -11,14 +10,12 @@ import com.zanxiang.game.module.manage.service.IAgentService;
 import com.zanxiang.game.module.mybatis.entity.Agent;
 import com.zanxiang.module.util.exception.BaseException;
 import com.zanxiang.module.util.pojo.ResultVO;
-import com.zanxiang.module.web.util.IpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Slf4j
@@ -31,10 +28,7 @@ public class AgentController {
 
     @PreAuthorize(permissionKey = "manage:agent:list")
     @PostMapping("/list")
-    public ResultVO<IPage<AgentVO>> listOfPage(@Validated @RequestBody AgentListParam dto, HttpServletRequest request) {
-        log.error("userId : {}, ip : {}, ua : {}, name : {}, token : {}",
-                SecurityUtil.getUserId(), IpUtil.getRealIp(request), request.getHeader("user-agent"),
-                SecurityUtil.getTokenInfo().getNickname(), SecurityUtil.getToken());
+    public ResultVO<IPage<AgentVO>> listOfPage(@Validated @RequestBody AgentListParam dto) {
         return ResultVO.ok(agentService.listOfPage(dto));
     }