From 3692386628cfdcbf497a5d8bbbc087a3ff75176a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 30 八月 2024 20:27:57 +0800
Subject: [PATCH] 重置密码
---
se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java | 129 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java
index b6d3ea3..8704198 100644
--- a/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java
+++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysUserController.java
@@ -5,8 +5,12 @@
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+
+import com.se.common.core.utils.AesUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -46,8 +50,7 @@
*/
@RestController
@RequestMapping("/user")
-public class SysUserController extends BaseController
-{
+public class SysUserController extends BaseController {
@Autowired
private ISysUserService userService;
@@ -66,24 +69,37 @@
@Autowired
private ISysConfigService configService;
+ @Value("${enableEncrypt}")
+ boolean enableEncrypt;
+
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
@RequiresPermissions("system:user:list")
@GetMapping("/list")
- public TableDataInfo list(SysUser user)
- {
+ public TableDataInfo list(SysUser user) {
startPage();
List<SysUser> list = userService.selectUserList(user);
+ if (!CollectionUtils.isEmpty(list)) {
+ for (SysUser sysUser : list) {
+ // 璁剧疆瀵嗙爜涓虹┖
+ sysUser.setPassword(null);
+ }
+ }
return getDataTable(list);
}
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:user:export")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysUser user)
- {
+ public void export(HttpServletResponse response, SysUser user) {
List<SysUser> list = userService.selectUserList(user);
+ if (!CollectionUtils.isEmpty(list)) {
+ for (SysUser sysUser : list) {
+ // 璁剧疆瀵嗙爜涓虹┖
+ sysUser.setPassword(null);
+ }
+ }
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
}
@@ -91,8 +107,7 @@
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@RequiresPermissions("system:user:import")
@PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
- {
+ public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
List<SysUser> userList = util.importExcel(file.getInputStream());
String operName = SecurityUtils.getUsername();
@@ -101,8 +116,7 @@
}
@PostMapping("/importTemplate")
- public void importTemplate(HttpServletResponse response) throws IOException
- {
+ public void importTemplate(HttpServletResponse response) throws IOException {
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
util.importTemplateExcel(response, "鐢ㄦ埛鏁版嵁");
}
@@ -112,13 +126,13 @@
*/
@InnerAuth
@GetMapping("/info/{username}")
- public R<LoginUser> info(@PathVariable("username") String username)
- {
+ public R<LoginUser> info(@PathVariable("username") String username) {
SysUser sysUser = userService.selectUserByUserName(username);
- if (StringUtils.isNull(sysUser))
- {
+ if (StringUtils.isNull(sysUser)) {
return R.fail("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
+ // 璁剧疆瀵嗙爜涓虹┖
+ sysUser.setPassword(null);
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(sysUser);
// 鏉冮檺闆嗗悎
@@ -135,38 +149,38 @@
*/
@InnerAuth
@PostMapping("/register")
- public R<Boolean> register(@RequestBody SysUser sysUser)
- {
+ public R<Boolean> register(@RequestBody SysUser sysUser) {
String username = sysUser.getUserName();
- if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
- {
+ if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
}
- if (!userService.checkUserNameUnique(sysUser))
- {
+ if (!userService.checkUserNameUnique(sysUser)) {
return R.fail("淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪");
}
return R.ok(userService.registerUser(sysUser));
}
/**
- *璁板綍鐢ㄦ埛鐧诲綍IP鍦板潃鍜岀櫥褰曟椂闂�
+ * 璁板綍鐢ㄦ埛鐧诲綍IP鍦板潃鍜岀櫥褰曟椂闂�
*/
@InnerAuth
@PutMapping("/recordlogin")
- public R<Boolean> recordlogin(@RequestBody SysUser sysUser)
- {
+ public R<Boolean> recordlogin(@RequestBody SysUser sysUser) {
return R.ok(userService.updateUserProfile(sysUser));
}
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
- *
+ *
* @return 鐢ㄦ埛淇℃伅
*/
@GetMapping("getInfo")
public AjaxResult getInfo() {
SysUser user = userService.selectUserById(SecurityUtils.getUserId());
+ if (null != user) {
+ // 璁剧疆瀵嗙爜涓虹┖
+ user.setPassword(null);
+ }
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -185,17 +199,19 @@
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@RequiresPermissions("system:user:query")
- @GetMapping(value = { "/", "/{userId}" })
- public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
- {
+ @GetMapping(value = {"/", "/{userId}"})
+ public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
- if (StringUtils.isNotNull(userId))
- {
+ if (StringUtils.isNotNull(userId)) {
SysUser sysUser = userService.selectUserById(userId);
+ if (null != sysUser) {
+ // 璁剧疆瀵嗙爜涓虹┖
+ sysUser.setPassword(null);
+ }
ajax.put(AjaxResult.DATA_TAG, sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId));
ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
@@ -209,21 +225,18 @@
@RequiresPermissions("system:user:add")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@Validated @RequestBody SysUser user)
- {
+ public AjaxResult add(@Validated @RequestBody SysUser user) throws Exception {
deptService.checkDeptDataScope(user.getDeptId());
roleService.checkRoleDataScope(user.getRoleIds());
- if (!userService.checkUserNameUnique(user))
- {
+ if (!userService.checkUserNameUnique(user)) {
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
+ } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
- {
+ } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ }
+ if (enableEncrypt && !StringUtils.isEmpty(user.getPassword())) {
+ user.setPassword(AesUtils.decrypt(user.getPassword()));
}
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -236,22 +249,16 @@
@RequiresPermissions("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@Validated @RequestBody SysUser user)
- {
+ public AjaxResult edit(@Validated @RequestBody SysUser user) {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
deptService.checkDeptDataScope(user.getDeptId());
roleService.checkRoleDataScope(user.getRoleIds());
- if (!userService.checkUserNameUnique(user))
- {
+ if (!userService.checkUserNameUnique(user)) {
return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
+ } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
- {
+ } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
user.setUpdateBy(SecurityUtils.getUsername());
@@ -264,10 +271,8 @@
@RequiresPermissions("system:user:remove")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
- public AjaxResult remove(@PathVariable Long[] userIds)
- {
- if (ArrayUtils.contains(userIds, SecurityUtils.getUserId()))
- {
+ public AjaxResult remove(@PathVariable Long[] userIds) {
+ if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
return toAjax(userService.deleteUserByIds(userIds));
@@ -279,10 +284,12 @@
@RequiresPermissions("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
- public AjaxResult resetPwd(@RequestBody SysUser user)
- {
+ public AjaxResult resetPwd(@RequestBody SysUser user) throws Exception {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
+ if (enableEncrypt && !StringUtils.isEmpty(user.getPassword())) {
+ user.setPassword(AesUtils.decrypt(user.getPassword()));
+ }
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.resetPwd(user));
@@ -294,8 +301,7 @@
@RequiresPermissions("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysUser user)
- {
+ public AjaxResult changeStatus(@RequestBody SysUser user) {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
user.setUpdateBy(SecurityUtils.getUsername());
@@ -307,8 +313,7 @@
*/
@RequiresPermissions("system:user:query")
@GetMapping("/authRole/{userId}")
- public AjaxResult authRole(@PathVariable("userId") Long userId)
- {
+ public AjaxResult authRole(@PathVariable("userId") Long userId) {
AjaxResult ajax = AjaxResult.success();
SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId);
@@ -323,8 +328,7 @@
@RequiresPermissions("system:user:edit")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authRole")
- public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
- {
+ public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
userService.checkUserDataScope(userId);
roleService.checkRoleDataScope(roleIds);
userService.insertUserAuth(userId, roleIds);
@@ -336,8 +340,7 @@
*/
@RequiresPermissions("system:user:list")
@GetMapping("/deptTree")
- public AjaxResult deptTree(SysDept dept)
- {
+ public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
}
}
--
Gitblit v1.9.3