From e739a69ee991bac72c50bd8c7a00468bcd8039a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 16:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index ed7634f..04df303 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -32,6 +32,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -116,7 +117,7 @@
*/
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
- @ApiOperation(value = "添加系统用户", tags = {"管理后台-账号管理", "门店后台-部门管理"})
+ @ApiOperation(value = "添加系统用户", tags = {"管理后台-账号管理"})
public AjaxResult add(@RequestBody SysUser user) {
user.setUserName(user.getPhonenumber());
Long userid = tokenService.getLoginUser().getUserid();
@@ -295,6 +296,11 @@
return R.ok();
}
}
+ @PostMapping("/getSysUserAll")
+ public R<List<SysUser>> getSysUserAll() {
+ List<SysUser> list = userService.list();
+ return R.ok(list);
+ }
@PostMapping("/updateSysUser")
@Transactional(rollbackFor = Exception.class)
@@ -409,8 +415,6 @@
public AjaxResult resetPwd(@RequestBody SysUser user) {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
-
- //todo 双重加密，在登录时校验 修改密码时校验
user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5("a123456")));
user.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.resetPwd(user));
@@ -570,12 +574,56 @@
userRoleService.insertSysUserRole(sysUserRole);
return R.ok(user.getUserId());
}
+ @ResponseBody
+ @PostMapping("/addSysUserSite")
+ @Transactional(rollbackFor = Exception.class)
+ public R<Long> addSysUserSite(@RequestBody SysUser user) {
+ if(StringUtils.isEmpty(user.getUserName())){
+ user.setUserName(user.getPhonenumber());
+ }
+ if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
+ user.setNickName(user.getPhonenumber());
+ }
+// if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+// throw new RuntimeException("手机号已开通账号");
+// }
+ if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
+ throw new RuntimeException("登录账号已存在");
+ }
+ user.setCreateBy(SecurityUtils.getUsername());
+ user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5(user.getPassword())));
+ user.setRoleType(2);
+ userService.insertUser(user);
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setRoleId(user.getRoleId());
+ sysUserRole.setUserId(user.getUserId());
+ userRoleService.insertSysUserRole(sysUserRole);
+ return R.ok(user.getUserId());
+ }
+
+ public static void main(String[] args) {
+ String s = SecurityUtils.encryptPassword(MD5Generator.generateMD5("123456"));
+ System.err.println("加密"+s);
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+
+ System.err.println(passwordEncoder.matches(MD5Generator.generateMD5("123456"), "$2a$10$yxHB49D.WQOKiZvh8SHHv.1/MxHZzriuVA99sIIiHKmsjI.EQC9yC"));
+
+ }
@ResponseBody
@PostMapping("/resetPassword")
public R resetPassword(@RequestBody SysUser user) {
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setUpdateBy(SecurityUtils.getUsername());
+ userService.resetPwd(user);
+ return R.ok();
+ }
+
+ @ResponseBody
+ @PostMapping("/siteResetPassword")
+ public R siteResetPassword(@RequestBody SysUser user) {
+ user.setPassword(SecurityUtils.encryptPassword(MD5Generator.generateMD5(user.getPassword())));
user.setUpdateBy(SecurityUtils.getUsername());
userService.resetPwd(user);
return R.ok();
@@ -687,4 +735,9 @@
userService.deleteUserById(userId);
return R.ok();
}
+ @GetMapping("/queryUserBySiteId")
+ public R queryUserBySiteId(@RequestParam("siteId") Integer siteId){
+ SysUser user = userService.selectUserBySiteId(siteId);
+ return R.ok(user);
+ }
}
--
Gitblit v1.7.1