From 6bae45dfd31d647e4abc4e0246f495a29cc6896f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 11:20:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
index a2cca7e..e7db500 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -8,6 +8,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -19,13 +20,13 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+import org.springframework.web.bind.annotation.*;
/**
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
@@ -45,7 +46,8 @@
@ApiOperation("閰嶇疆鐢ㄦ埛瑙掕壊")
@PostMapping("/createUserRole")
@RequiresPermissions("system:user:createUserRole")
- public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
+ public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ dto.setCreateUser(this.getLoginUser(token).getId());
systemUserBiz.createUserRole(dto);
return ApiResponse.success(null);
}
@@ -55,8 +57,8 @@
@ApiOperation("閲嶇疆鐢ㄦ埛瀵嗙爜")
@PostMapping("/resetPwd")
@RequiresPermissions("system:user:resetPwd")
- public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
- dto.setOperaUserId(this.getLoginUser().getId());
+ public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ dto.setOperaUserId(this.getLoginUser(token).getId());
systemUserBiz.resetPwd(dto);
return ApiResponse.success(null);
}
@@ -66,8 +68,8 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("system:user:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
- systemUser.setCreateUser(this.getLoginUser().getId());
+ public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemUser.setCreateUser(this.getLoginUser(token).getId());
systemUserBiz.create(systemUser);
return ApiResponse.success(null);
}
@@ -97,8 +99,8 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
@RequiresPermissions("system:user:update")
- public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
- systemUser.setUpdateUser(this.getLoginUser().getId());
+ public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemUser.setUpdateUser(this.getLoginUser(token).getId());
systemUserBiz.updateById(systemUser);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3