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 | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 20828c9..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
@@ -619,6 +619,15 @@
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();
+ }
@ResponseBody
@@ -726,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