Merge branch '20240416_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -174,12 +174,12 @@ public class YlServer {
         TreeMap<String, Object> map = new TreeMap<>();
         if (StringUtils.isNotEmpty(lrxx.getYlcode())) {
             lr.put("memberCode", lrxx.getYlcode());
-            map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), null,
+            map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), lrxx.getMchnt(),
                     null, lr);
         } else {
             try {
                 lr.put("memberUniqueId", lrxx.getLrZjhm());
-                map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), lrxx.getMchntCode(),
+                map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.hycx"), lrxx.getMchnt(),
                         null, lr);
             } catch (Exception e) {
                 throw new ServiceException("加密失败 ==> " + e.getMessage());

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java

@@ -24,7 +24,7 @@ import java.util.Arrays;
 
 /**
  * 个人信息 业务处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -33,10 +33,10 @@ public class SysProfileController extends BaseController
 {
     @Autowired
     private ISysUserService userService;
-    
+
     @Autowired
     private TokenService tokenService;
-    
+
     @Autowired
     private RemoteFileService remoteFileService;
 
@@ -123,7 +123,36 @@ public class SysProfileController extends BaseController
         }
         return AjaxResult.error("修改密码异常，请联系管理员");
     }
-    
+
+    @PostMapping("/updateLrPwd")
+    public AjaxResult updateLrPwd(String oldPassword, String newPassword)
+    {
+        String username = SecurityUtils.getUsername();
+        SysUser user = userService.selectLrUserByUserName(username);
+        String password = user.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return AjaxResult.error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return AjaxResult.error("新密码不能与旧密码相同");
+        }
+        if (!SecurityUtils.checkPassword(newPassword))
+        {
+            return AjaxResult.error("密码最少包含数字丶字母丶特殊字符中的两种");
+        }
+        if (userService.resetLrUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
+        {
+            // 更新缓存用户密码
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+            tokenService.setLoginUser(loginUser);
+            return AjaxResult.success("密码修改成功");
+        }
+        return AjaxResult.error("修改密码异常，请联系管理员");
+    }
+
     /**
      * 头像上传
      */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -95,6 +95,8 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser>
      */
     public int resetUserPwd(SysUser user);
 
+    public int resetLrUserPwd(SysUser user);
+
     /**
      * 通过用户ID删除用户
      *

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -190,6 +190,8 @@ public interface ISysUserService
      */
     public int resetUserPwd(String userName, String password);
 
+    public int resetLrUserPwd(String userName, String password);
+
     /**
      * 通过用户ID删除用户
      *

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -541,6 +541,13 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.resetUserPwd(user);
     }
 
+    @Override
+    public int resetLrUserPwd(String userName, String password) {
+        SysUser user = userMapper.selectLrUserByUserName(userName);
+        user.setPassword(password);
+        return userMapper.resetLrUserPwd(user);
+    }
+
     /**
      * 新增用户角色信息
      *

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -408,6 +408,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</set>
  		where user_name = #{userName}
 	</update>
+
+	<update id="resetLrUserPwd" parameterType="SysUser">
+		update lnst_user
+		<set>
+			password = #{password},
+			update_time_str = #{updateTimeStr},
+			update_user_id = #{updateUserId},
+			update_by = #{updateBy},
+			update_unit = #{updateUnit},
+			update_unit_name = #{updateUnitName},
+		</set>
+		where user_name = #{userName}
+	</update>
+
 	<update id="resetPwd">
 		update sys_user
 		<set>