lyfO_o
2022-08-26 57b39bca1c6a2b6e5d2b9acc2b0238c4ad5d6005
rpc修改和线程配置
已修改11个文件
90 ■■■■ 文件已修改
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-guotai-uat.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-test.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/resources/config/application-uat.yaml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
@@ -37,14 +37,14 @@
    @RequestMapping(value = "/add", method = RequestMethod.POST)
    public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepAddRPCReqDTO depAddRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountDepartmentService.addDep(currentUser.getUid(), depAddRPCReqDTO);
        return accountDepartmentService.addDep(currentUser, depAddRPCReqDTO);
    }
    @RequestMapping(value = "/mod", method = RequestMethod.POST)
    public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepModRPCReqDTO depModRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountDepartmentService.modDep(currentUser.getUid(), depModRPCReqDTO);
        return accountDepartmentService.modDep(currentUser, depModRPCReqDTO);
    }
@@ -52,7 +52,7 @@
    public ResultVO<String> addDepartment(Authentication authentication, @RequestBody JSONObject json) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        Long depId = json.getLong("depId");
        return accountDepartmentService.delDep(currentUser.getUid(), depId);
        return accountDepartmentService.delDep(currentUser, depId);
    }
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/LoginController.java
@@ -34,6 +34,6 @@
    @RequestMapping("/menu")
    public ResultVO<List<MenuRPCRespDTO>> getMenu(Authentication authentication, Long projectId){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountAuthService.getMenu(currentUser.getUid(), projectId);
        return accountAuthService.getMenu(currentUser, projectId);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
@@ -30,7 +30,7 @@
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuAddRPCReqDTO menuAddDto) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountMenuService.addMenu(currentUser.getUid(), menuAddDto);
        return accountMenuService.addMenu(currentUser, menuAddDto);
    }
@@ -40,7 +40,7 @@
    @RequestMapping(value = "/mod",method = RequestMethod.POST)
    public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuModRPCReqDTO menuModDto) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountMenuService.modMenu(currentUser.getUid(), menuModDto);
        return accountMenuService.modMenu(currentUser, menuModDto);
    }
@@ -51,7 +51,7 @@
    public ResultVO<String> delMenu(Authentication authentication,@RequestBody JSONObject json ) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        Long id = json.getLong("id");
        return accountMenuService.delMenu(currentUser.getUid(), id);
        return accountMenuService.delMenu(currentUser, id);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/RoleController.java
@@ -42,7 +42,7 @@
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO<String> addRole(Authentication authentication, RoleAddRPCReqDTO roleAddRPCReqDTO){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountRoleService.addRole(currentUser.getUid(),roleAddRPCReqDTO);
        return accountRoleService.addRole(currentUser,roleAddRPCReqDTO);
    }
@@ -50,7 +50,7 @@
    @RequestMapping(value = "/mod",method = RequestMethod.POST)
    public ResultVO<String> modRole(Authentication authentication, RoleModRPCReqDTO roleModRPCReqDTO){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountRoleService.modRole(currentUser.getUid(),roleModRPCReqDTO);
        return accountRoleService.modRole(currentUser,roleModRPCReqDTO);
    }
@@ -58,6 +58,6 @@
    public ResultVO<String> modRole(Authentication authentication, JSONObject json){
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        Long depId = json.getLong("depId");
        return accountRoleService.delRole(currentUser.getUid(),depId);
        return accountRoleService.delRole(currentUser,depId);
    }
}
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/UserController.java
@@ -67,7 +67,7 @@
    @PreAuthorize("hasRole('ROLE_admin')")
    public ResultVO<String> addUser(Authentication authentication, @RequestBody AccountAddRPCReqDTO accountAddRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return  accountUserService.addAccount(currentUser.getUid(), accountAddRPCReqDTO);
        return  accountUserService.addAccount(currentUser, accountAddRPCReqDTO);
    }
@@ -77,9 +77,9 @@
    @RequestMapping(value = "/mod", method = RequestMethod.POST)
    @PreAuthorize("hasRole('ROLE_admin')")
    public ResultVO<String> modUser(Principal principal, @RequestBody AccountModRPCReqDTO accountModRPCReqDTO) {
        String userId = principal.getName();
        return accountUserService.modAccount(Long.valueOf(userId), accountModRPCReqDTO);
    public ResultVO<String> modUser(Authentication authentication, @RequestBody AccountModRPCReqDTO accountModRPCReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountUserService.modAccount(currentUser, accountModRPCReqDTO);
    }
@@ -88,9 +88,9 @@
     */
    @RequestMapping(value = "/del", method = RequestMethod.POST)
    @PreAuthorize("hasRole('ROLE_admin')")
    public ResultVO<String> delUser(Principal principal, @RequestBody JSONObject json) {
    public ResultVO<String> delUser(Authentication authentication, @RequestBody JSONObject json) {
        Long uid = json.getLong("uid");
        String userId = principal.getName();
        return accountUserService.delAccount(Long.valueOf(userId), uid);
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return accountUserService.delAccount(currentUser, uid);
    }
}
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -88,6 +88,17 @@
    # 取消服务启动检查
    check: false
#线程池配置
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -100,6 +100,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.30.107:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-guotai-uat.yaml
@@ -100,6 +100,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.30.107:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
@@ -96,6 +96,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-test.yaml
@@ -101,6 +101,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer:
safePlatfrom-out-web/src/main/resources/config/application-uat.yaml
@@ -101,6 +101,15 @@
    # 取消服务启动检查
    check: false
threadPool:
  corePoolSize: 20
  maxPoolSize: 20
  queueCapacity: 10000
  scheduling:
    #控制线程是否执行 true:执行;false:不执行
    enabled: true
#    enabled: false
rocketmq:
  name-server: 192.168.0.52:9876
  producer: