迁移892-without-redis分支全量功能

2026-04-15 14:18:56 +08:00
parent 9fe1bffe0d
commit 79c5317414
97 changed files with 10922 additions and 232 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -13,14 +13,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.SysLoginService;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.framework.web.service.SysLoginService;
+import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysMenuService;

@@ -44,8 +45,11 @@ public class SysLoginController
    @Autowired
    private TokenService tokenService;

-    @Autowired
-    private ISysConfigService configService;
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    private PasswordTransferCryptoService passwordTransferCryptoService;

    /**
     * 登录方法
@@ -54,12 +58,13 @@ public class SysLoginController
     * @return 结果
     */
    @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
-        AjaxResult ajax = AjaxResult.success();
-        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+    public AjaxResult login(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        loginBody.setPassword(passwordTransferCryptoService.decrypt(loginBody.getPassword()));
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
        ajax.put(Constants.TOKEN, token);
        return ajax;
    }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -18,13 +18,14 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysUserService;

 /**
 * 个人信息 业务处理
@@ -38,8 +39,11 @@ public class SysProfileController extends BaseController
    @Autowired
    private ISysUserService userService;

-    @Autowired
-    private TokenService tokenService;
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private PasswordTransferCryptoService passwordTransferCryptoService;

    /**
     * 个人信息
@@ -90,13 +94,13 @@ public class SysProfileController extends BaseController
     */
    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
    @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
-    {
-        String oldPassword = params.get("oldPassword");
-        String newPassword = params.get("newPassword");
-        LoginUser loginUser = getLoginUser();
-        Long userId = loginUser.getUserId();
-        SysUser user = userService.selectUserById(userId);
+    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
+    {
+        String oldPassword = passwordTransferCryptoService.decrypt(params.get("oldPassword"));
+        String newPassword = passwordTransferCryptoService.decrypt(params.get("newPassword"));
+        LoginUser loginUser = getLoginUser();
+        Long userId = loginUser.getUserId();
+        SysUser user = userService.selectUserById(userId);
        String password = user.getPassword();
        if (!SecurityUtils.matchesPassword(oldPassword, password))
        {
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
@@ -4,12 +4,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.SysRegisterService;
-import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.RegisterBody;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.framework.web.service.SysRegisterService;
+import com.ruoyi.system.service.ISysConfigService;

 /**
 * 注册验证
@@ -22,17 +23,21 @@ public class SysRegisterController extends BaseController
    @Autowired
    private SysRegisterService registerService;

-    @Autowired
-    private ISysConfigService configService;
+    @Autowired
+    private ISysConfigService configService;
+
+    @Autowired
+    private PasswordTransferCryptoService passwordTransferCryptoService;

    @PostMapping("/register")
    public AjaxResult register(@RequestBody RegisterBody user)
    {
-        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
-        {
-            return error("当前系统没有开启注册功能！");
-        }
-        String msg = registerService.register(user);
-        return StringUtils.isEmpty(msg) ? success() : error(msg);
-    }
-}
+        if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
+        {
+            return error("当前系统没有开启注册功能！");
+        }
+        user.setPassword(passwordTransferCryptoService.decrypt(user.getPassword()));
+        String msg = registerService.register(user);
+        return StringUtils.isEmpty(msg) ? success() : error(msg);
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -24,12 +24,13 @@ import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysPostService;
-import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;

 /**
@@ -50,8 +51,11 @@ public class SysUserController extends BaseController
    @Autowired
    private ISysDeptService deptService;

-    @Autowired
-    private ISysPostService postService;
+    @Autowired
+    private ISysPostService postService;
+
+    @Autowired
+    private PasswordTransferCryptoService passwordTransferCryptoService;

    /**
     * 获取用户列表
@@ -134,13 +138,14 @@ public class SysUserController extends BaseController
        {
            return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
-        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
-        {
-            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
-        user.setCreateBy(getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        return toAjax(userService.insertUser(user));
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+        {
+            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setCreateBy(getUsername());
+        user.setPassword(passwordTransferCryptoService.decrypt(user.getPassword()));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        return toAjax(userService.insertUser(user));
    }

    /**
@@ -192,13 +197,14 @@ public class SysUserController extends BaseController
    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
-    {
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setUpdateBy(getUsername());
-        return toAjax(userService.resetPwd(user));
+    public AjaxResult resetPwd(@RequestBody SysUser user)
+    {
+        userService.checkUserAllowed(user);
+        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(passwordTransferCryptoService.decrypt(user.getPassword()));
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.resetPwd(user));
    }

    /**
--- a/ruoyi-admin/src/main/resources/application-pro.yml
+++ b/ruoyi-admin/src/main/resources/application-pro.yml
@@ -0,0 +1,86 @@
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为63310
+    port: 63310
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://64.127.23.7:3306/loan-pricing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: lrdb
+                password: Synx2024
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+model:
+    url: http://64.202.32.40:8083/api/service/interface/invokeService/syllcs
+
+security:
+    password-transfer:
+        key: "1234567890abcdef"
--- a/ruoyi-admin/src/main/resources/application-uat.yml
+++ b/ruoyi-admin/src/main/resources/application-uat.yml
@@ -0,0 +1,86 @@
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为63310
+    port: 63310
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
+
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                url: jdbc:mysql://192.168.0.111:40628/loan-pricing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: Kfcx@1234
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: ruoyi
+                login-password: 123456
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+model:
+    url: http://localhost:63310/rate/pricing/mock/invokeModel
+
+security:
+    password-transfer:
+        key: "1234567890abcdef"
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -98,14 +98,18 @@ swagger:
  pathMapping: /dev-api

 # 防盗链配置
-referer:
-  # 防盗链开关
-  enabled: false
-  # 允许的域名列表
-  allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip
-
-# 防止XSS攻击
-xss:
+referer:
+  # 防盗链开关
+  enabled: false
+  # 允许的域名列表
+  allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip
+
+security:
+  password-transfer:
+    key: "1234567890abcdef"
+
+# 防止XSS攻击
+xss:
  # 过滤开关
  enabled: true
  # 排除链接（多个用逗号分隔）
--- a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysLoginControllerPasswordTransferTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysLoginControllerPasswordTransferTest.java
@@ -0,0 +1,40 @@
+package com.ruoyi.web.controller.system;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.framework.web.service.SysLoginService;
+
+class SysLoginControllerPasswordTransferTest
+{
+    @Test
+    void shouldDecryptPasswordBeforeCallingLoginService() throws Exception
+    {
+        SysLoginService loginService = mock(SysLoginService.class);
+        PasswordTransferCryptoService passwordTransferCryptoService = mock(PasswordTransferCryptoService.class);
+        when(passwordTransferCryptoService.decrypt("cipher")).thenReturn("admin123");
+        when(loginService.login("admin", "admin123", "1", "u")).thenReturn("token");
+
+        SysLoginController controller = new SysLoginController();
+        ReflectionTestUtils.setField(controller, "loginService", loginService);
+        ReflectionTestUtils.setField(controller, "passwordTransferCryptoService", passwordTransferCryptoService);
+
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+
+        mockMvc.perform(post("/login")
+                .contentType("application/json")
+                .content("{\"username\":\"admin\",\"password\":\"cipher\",\"code\":\"1\",\"uuid\":\"u\"}"))
+                .andExpect(status().isOk());
+
+        verify(passwordTransferCryptoService).decrypt("cipher");
+        verify(loginService).login("admin", "admin123", "1", "u");
+    }
+}
--- a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysProfileControllerPasswordTransferTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysProfileControllerPasswordTransferTest.java
@@ -0,0 +1,72 @@
+package com.ruoyi.web.controller.system;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.Collections;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysUserService;
+
+class SysProfileControllerPasswordTransferTest
+{
+    @AfterEach
+    void tearDown()
+    {
+        SecurityContextHolder.clearContext();
+    }
+
+    @Test
+    void shouldDecryptPasswordsBeforeCheckingOldPassword() throws Exception
+    {
+        ISysUserService userService = mock(ISysUserService.class);
+        TokenService tokenService = mock(TokenService.class);
+        PasswordTransferCryptoService passwordTransferCryptoService = mock(PasswordTransferCryptoService.class);
+        when(passwordTransferCryptoService.decrypt("oldCipher")).thenReturn("oldPlain");
+        when(passwordTransferCryptoService.decrypt("newCipher")).thenReturn("newPlain");
+        when(userService.resetUserPwd(org.mockito.ArgumentMatchers.anyLong(), org.mockito.ArgumentMatchers.anyString()))
+                .thenReturn(1);
+
+        SysUser storedUser = new SysUser();
+        storedUser.setUserId(2L);
+        storedUser.setPassword(SecurityUtils.encryptPassword("oldPlain"));
+        when(userService.selectUserById(2L)).thenReturn(storedUser);
+
+        SysUser currentUser = new SysUser();
+        currentUser.setUserId(2L);
+        currentUser.setUserName("admin");
+        LoginUser loginUser = new LoginUser(2L, 1L, currentUser, Collections.emptySet());
+        SecurityContextHolder.getContext()
+                .setAuthentication(new UsernamePasswordAuthenticationToken(loginUser, null, Collections.emptyList()));
+
+        SysProfileController controller = new SysProfileController();
+        ReflectionTestUtils.setField(controller, "userService", userService);
+        ReflectionTestUtils.setField(controller, "tokenService", tokenService);
+        ReflectionTestUtils.setField(controller, "passwordTransferCryptoService", passwordTransferCryptoService);
+
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+
+        mockMvc.perform(put("/system/user/profile/updatePwd")
+                .contentType("application/json")
+                .content("{\"oldPassword\":\"oldCipher\",\"newPassword\":\"newCipher\"}"))
+                .andExpect(status().isOk());
+
+        verify(passwordTransferCryptoService).decrypt("oldCipher");
+        verify(passwordTransferCryptoService).decrypt("newCipher");
+        verify(userService).resetUserPwd(org.mockito.ArgumentMatchers.eq(2L), org.mockito.ArgumentMatchers.anyString());
+        verify(tokenService).setLoginUser(loginUser);
+    }
+}
--- a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysRegisterControllerPasswordTransferTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysRegisterControllerPasswordTransferTest.java
@@ -0,0 +1,50 @@
+package com.ruoyi.web.controller.system;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import com.ruoyi.common.core.domain.model.RegisterBody;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.framework.web.service.SysRegisterService;
+import com.ruoyi.system.service.ISysConfigService;
+
+class SysRegisterControllerPasswordTransferTest
+{
+    @Test
+    void shouldDecryptPasswordBeforeCallingRegisterService() throws Exception
+    {
+        SysRegisterService registerService = mock(SysRegisterService.class);
+        ISysConfigService configService = mock(ISysConfigService.class);
+        PasswordTransferCryptoService passwordTransferCryptoService = mock(PasswordTransferCryptoService.class);
+        when(configService.selectConfigByKey("sys.account.registerUser")).thenReturn("true");
+        when(passwordTransferCryptoService.decrypt("cipher")).thenReturn("admin123");
+        when(registerService.register(any(RegisterBody.class))).thenReturn("");
+
+        SysRegisterController controller = new SysRegisterController();
+        ReflectionTestUtils.setField(controller, "registerService", registerService);
+        ReflectionTestUtils.setField(controller, "configService", configService);
+        ReflectionTestUtils.setField(controller, "passwordTransferCryptoService", passwordTransferCryptoService);
+
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+
+        mockMvc.perform(post("/register")
+                .contentType("application/json")
+                .content("{\"username\":\"u1\",\"password\":\"cipher\",\"code\":\"1\",\"uuid\":\"u\"}"))
+                .andExpect(status().isOk());
+
+        verify(passwordTransferCryptoService).decrypt("cipher");
+        ArgumentCaptor<RegisterBody> captor = ArgumentCaptor.forClass(RegisterBody.class);
+        verify(registerService).register(captor.capture());
+        assertEquals("admin123", captor.getValue().getPassword());
+    }
+}
--- a/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysUserControllerPasswordTransferTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/web/controller/system/SysUserControllerPasswordTransferTest.java
@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.system;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.Collections;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.service.PasswordTransferCryptoService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+
+class SysUserControllerPasswordTransferTest
+{
+    @AfterEach
+    void tearDown()
+    {
+        SecurityContextHolder.clearContext();
+    }
+
+    @Test
+    void shouldDecryptPasswordBeforeAddingUser() throws Exception
+    {
+        ISysUserService userService = mock(ISysUserService.class);
+        ISysRoleService roleService = mock(ISysRoleService.class);
+        ISysDeptService deptService = mock(ISysDeptService.class);
+        ISysPostService postService = mock(ISysPostService.class);
+        PasswordTransferCryptoService passwordTransferCryptoService = mock(PasswordTransferCryptoService.class);
+        when(passwordTransferCryptoService.decrypt("cipher")).thenReturn("initPwd");
+        when(userService.checkUserNameUnique(org.mockito.ArgumentMatchers.any(SysUser.class))).thenReturn(true);
+        when(userService.insertUser(org.mockito.ArgumentMatchers.any(SysUser.class))).thenReturn(1);
+
+        setAuthentication();
+
+        SysUserController controller = new SysUserController();
+        ReflectionTestUtils.setField(controller, "userService", userService);
+        ReflectionTestUtils.setField(controller, "roleService", roleService);
+        ReflectionTestUtils.setField(controller, "deptService", deptService);
+        ReflectionTestUtils.setField(controller, "postService", postService);
+        ReflectionTestUtils.setField(controller, "passwordTransferCryptoService", passwordTransferCryptoService);
+
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+
+        mockMvc.perform(post("/system/user")
+                .contentType("application/json")
+                .content("{\"userName\":\"u1\",\"nickName\":\"n1\",\"deptId\":1,\"password\":\"cipher\"}"))
+                .andExpect(status().isOk());
+
+        verify(passwordTransferCryptoService).decrypt("cipher");
+        ArgumentCaptor<SysUser> captor = ArgumentCaptor.forClass(SysUser.class);
+        verify(userService).insertUser(captor.capture());
+        assertTrue(SecurityUtils.matchesPassword("initPwd", captor.getValue().getPassword()));
+    }
+
+    @Test
+    void shouldDecryptPasswordBeforeResettingUserPassword() throws Exception
+    {
+        ISysUserService userService = mock(ISysUserService.class);
+        ISysRoleService roleService = mock(ISysRoleService.class);
+        ISysDeptService deptService = mock(ISysDeptService.class);
+        ISysPostService postService = mock(ISysPostService.class);
+        PasswordTransferCryptoService passwordTransferCryptoService = mock(PasswordTransferCryptoService.class);
+        when(passwordTransferCryptoService.decrypt("cipher")).thenReturn("resetPwd");
+        when(userService.resetPwd(org.mockito.ArgumentMatchers.any(SysUser.class))).thenReturn(1);
+
+        setAuthentication();
+
+        SysUserController controller = new SysUserController();
+        ReflectionTestUtils.setField(controller, "userService", userService);
+        ReflectionTestUtils.setField(controller, "roleService", roleService);
+        ReflectionTestUtils.setField(controller, "deptService", deptService);
+        ReflectionTestUtils.setField(controller, "postService", postService);
+        ReflectionTestUtils.setField(controller, "passwordTransferCryptoService", passwordTransferCryptoService);
+
+        MockMvc mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
+
+        mockMvc.perform(put("/system/user/resetPwd")
+                .contentType("application/json")
+                .content("{\"userId\":2,\"password\":\"cipher\"}"))
+                .andExpect(status().isOk());
+
+        verify(passwordTransferCryptoService).decrypt("cipher");
+        ArgumentCaptor<SysUser> captor = ArgumentCaptor.forClass(SysUser.class);
+        verify(userService).resetPwd(captor.capture());
+        assertTrue(SecurityUtils.matchesPassword("resetPwd", captor.getValue().getPassword()));
+    }
+
+    private void setAuthentication()
+    {
+        SysUser currentUser = new SysUser();
+        currentUser.setUserId(1L);
+        currentUser.setUserName("admin");
+        LoginUser loginUser = new LoginUser(1L, 1L, currentUser, Collections.emptySet());
+        SecurityContextHolder.getContext()
+                .setAuthentication(new UsernamePasswordAuthenticationToken(loginUser, null, Collections.emptyList()));
+    }
+}