From c20bd4227691a59bd64f678fbe2cf3b771501915 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Thu, 6 Jul 2023 09:47:15 +0800 Subject: [PATCH 1/2] update README.md --- README.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index aab4e9d2..30af5b9f 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,9 @@ #### 项目简介 -一个基于 Spring Boot 2.1.0 、 Spring Boot Jpa、 JWT、Spring Security、Redis、Vue的前后端分离的后台管理系统 -现已发布基于 mybatis-plus 版本，项目地址：[https://github.com/elunez/eladmin-mp](https://github.com/elunez/eladmin-mp)。 +一个基于 Spring Boot 2.6.4 、 Spring Boot Jpa、 JWT、Spring Security、Redis、Vue的前后端分离的后台管理系统 + +现已发布基于 mybatis-plus 版本，项目地址：[https://github.com/elunez/eladmin-mp](https://github.com/elunez/eladmin-mp)、[https://gitee.com/elunez/eladmin-mp](https://gitee.com/elunez/eladmin-mp)。 **开发文档：** [https://eladmin.vip](https://eladmin.vip) @@ -69,9 +70,9 @@ - `eladmin-logging` 为系统的日志模块，其他模块如果需要记录日志需要引入该模块 -- `eladmin-tools` 为第三方工具模块，包含：图床、邮件、云存储、本地存储、支付宝 +- `eladmin-tools` 为第三方工具模块，包含：邮件、七牛云存储、本地存储、支付宝 -- `eladmin-generator` 为系统的代码生成模块，代码生成的模板在 system 模块中 +- `eladmin-generator` 为系统的代码生成模块，支持生成前后端CRUD代码 #### 详细结构 @@ -94,10 +95,6 @@ #### 特别鸣谢 -- 感谢 [七牛云](https://portal.qiniu.com/signup?utm_source=kaiyuan&utm_media=ELADMIN) 提供的免费云存储与CDN加速支持 - -- 感谢 [JetBrains](https://www.jetbrains.com/) 提供的非商业开源软件开发授权 - - 感谢 [PanJiaChen](https://github.com/PanJiaChen/vue-element-admin) 大佬提供的前端模板 - 感谢 [Moxun](https://github.com/moxun1639) 大佬提供的前端 Curd 通用组件 From e0777d868168092e611ec98bea1ac4590ea39d33 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Thu, 6 Jul 2023 14:24:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/repository/UserRepository.java | 9 +++++++++ .../me/zhengjie/modules/system/rest/UserController.java | 8 ++++++++ .../me/zhengjie/modules/system/service/UserService.java | 7 +++++++ .../modules/system/service/impl/UserServiceImpl.java | 6 ++++++ 4 files changed, 30 insertions(+) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java index c5c88a8d..f7583b04 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java @@ -127,4 +127,13 @@ public interface UserRepository extends JpaRepository, JpaSpecificat @Query(value = "SELECT count(1) FROM sys_user u, sys_users_roles r WHERE " + "u.user_id = r.user_id AND r.role_id in ?1", nativeQuery = true) int countByRoles(Set ids); + + /** + * 重置密码 + * @param ids 、 + * @param pwd 、 + */ + @Modifying + @Query(value = "update sys_user set password = ?2 where user_id in ?1",nativeQuery = true) + void resetPwd(Set ids, String pwd); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index 92a9fb6b..f75b8bb8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -168,6 +168,14 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } + @ApiOperation("重置密码") + @PutMapping(value = "/resetPwd") + public ResponseEntity resetPwd(@RequestBody Set ids) { + String pwd = passwordEncoder.encode("123456"); + userService.resetPwd(ids, pwd); + return new ResponseEntity<>(HttpStatus.OK); + } + @ApiOperation("修改头像") @PostMapping(value = "/updateAvatar") public ResponseEntity updateUserAvatar(@RequestParam MultipartFile avatar){ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java index 24fc6677..a3cc4f24 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java @@ -123,4 +123,11 @@ public interface UserService { * @param resources / */ void updateCenter(User resources); + + /** + * 重置密码 + * @param ids 用户id + * @param pwd 密码 + */ + void resetPwd(Set ids, String pwd); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index a9fef8c0..9a6e543b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -196,6 +196,12 @@ public class UserServiceImpl implements UserService { flushCache(username); } + @Override + @Transactional(rollbackFor = Exception.class) + public void resetPwd(Set ids, String pwd) { + userRepository.resetPwd(ids, pwd); + } + @Override @Transactional(rollbackFor = Exception.class) public Map updateAvatar(MultipartFile multipartFile) {