优化代码

RuoYi

2025-08-28 50a9337ee8c1fe93e6a49f1bb860936814702472

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

@@ -1,6 +1,7 @@
package com.ruoyi.system.controller;



import java.util.Arrays;

import java.util.Map;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

@@ -11,6 +12,7 @@
import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.core.domain.R;

import com.ruoyi.common.core.utils.DateUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.file.FileTypeUtils;

import com.ruoyi.common.core.utils.file.MimeTypeUtils;

@@ -93,11 +95,13 @@
     */

    @Log(title = "个人信息", businessType = BusinessType.UPDATE)

    @PutMapping("/updatePwd")

    public AjaxResult updatePwd(String oldPassword, String newPassword)

    public AjaxResult updatePwd(@RequestBody Map<String, String> params)

    {

        String username = SecurityUtils.getUsername();

        SysUser user = userService.selectUserByUserName(username);

        String password = user.getPassword();

        String oldPassword = params.get("oldPassword");

        String newPassword = params.get("newPassword");

        LoginUser loginUser = SecurityUtils.getLoginUser();

        Long userId = loginUser.getUserid();

        String password = loginUser.getSysUser().getPassword();

        if (!SecurityUtils.matchesPassword(oldPassword, password))

        {

            return error("修改密码失败，旧密码错误");

@@ -107,10 +111,10 @@
            return error("新密码不能与旧密码相同");

        }

        newPassword = SecurityUtils.encryptPassword(newPassword);

        if (userService.resetUserPwd(username, newPassword) > 0)

        if (userService.resetUserPwd(userId, newPassword) > 0)

        {

            // 更新缓存用户密码

            LoginUser loginUser = SecurityUtils.getLoginUser();

            // 更新缓存用户密码&密码最后更新时间

            loginUser.getSysUser().setPwdUpdateDate(DateUtils.getNowDate());

            loginUser.getSysUser().setPassword(newPassword);

            tokenService.setLoginUser(loginUser);

            return success();

@@ -139,8 +143,13 @@
                return error("文件服务异常，请联系管理员");

            }

            String url = fileResult.getData().getUrl();

            if (userService.updateUserAvatar(loginUser.getUsername(), url))

            if (userService.updateUserAvatar(loginUser.getUserid(), url))

            {

                String oldAvatarUrl = loginUser.getSysUser().getAvatar();

                if (StringUtils.isNotEmpty(oldAvatarUrl))

                {

                    remoteFileService.delete(oldAvatarUrl);

                }

                AjaxResult ajax = AjaxResult.success();

                ajax.put("imgUrl", url);

                // 更新缓存用户头像