From d9adbadd9fa14cb7174f6167c438a45e8176fd26 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期四, 23 二月 2023 15:22:04 +0800
Subject: [PATCH] 数据库连接池移除druid atomikos分布式事务使用com.mysql.cj.jdbc.MysqlXADataSource
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
index 3bc2502..f045906 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/DepartmentController.java
@@ -6,9 +6,11 @@
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.DepAddRPCReqDTO;
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.DepModRPCReqDTO;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepRPCRespDTO;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -33,24 +35,24 @@
@RequestMapping(value = "/add", method = RequestMethod.POST)
- public ResultVO<String> addDepartment(Principal principal, @RequestBody DepAddRPCReqDTO depAddRPCReqDTO) {
- String userId = principal.getName();
- return accountDepartmentService.addDep(Long.valueOf(userId) , depAddRPCReqDTO);
+ public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepAddRPCReqDTO depAddRPCReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountDepartmentService.addDep(currentUser, depAddRPCReqDTO);
}
@RequestMapping(value = "/mod", method = RequestMethod.POST)
- public ResultVO<String> addDepartment(Principal principal, @RequestBody DepModRPCReqDTO depModRPCReqDTO) {
- String userId = principal.getName();
- return accountDepartmentService.modDep(Long.valueOf(userId) , depModRPCReqDTO);
+ public ResultVO<String> addDepartment(Authentication authentication, @RequestBody DepModRPCReqDTO depModRPCReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountDepartmentService.modDep(currentUser, depModRPCReqDTO);
}
@RequestMapping(value = "/del", method = RequestMethod.POST)
- public ResultVO<String> addDepartment(Principal principal, @RequestBody JSONObject json) {
- String userId = principal.getName();
+ public ResultVO<String> addDepartment(Authentication authentication, @RequestBody JSONObject json) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
Long depId = json.getLong("depId");
- return accountDepartmentService.delDep(Long.valueOf(userId) , depId);
+ return accountDepartmentService.delDep(currentUser, depId);
}
--
Gitblit v1.9.2