From 1e4ed04a65e41ca1e36fd8170e530da2a65ab69c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 16 Aug 2021 22:26:29 +0800
Subject: [PATCH] 优化异常信息
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
index 56f8fbe..cb56788 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
@@ -1,17 +1,29 @@
package com.ruoyi.system.controller;
+import java.io.IOException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.SecurityUtils;
+import com.ruoyi.common.core.utils.ServletUtils;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.system.api.RemoteFileService;
+import com.ruoyi.system.api.domain.SysFile;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.service.ISysUserService;
/**
@@ -25,6 +37,12 @@
{
@Autowired
private ISysUserService userService;
+
+ @Autowired
+ private TokenService tokenService;
+
+ @Autowired
+ private RemoteFileService remoteFileService;
/**
* 个人信息
@@ -47,8 +65,28 @@
@PutMapping
public AjaxResult updateProfile(@RequestBody SysUser user)
{
+ if (StringUtils.isNotEmpty(user.getPhonenumber())
+ && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+ {
+ return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+ }
+ else if (StringUtils.isNotEmpty(user.getEmail())
+ && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
+ {
+ return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+ }
+ LoginUser loginUser = tokenService.getLoginUser();
+ SysUser sysUser = loginUser.getSysUser();
+ user.setUserId(sysUser.getUserId());
+ user.setPassword(null);
if (userService.updateUserProfile(user) > 0)
{
+ // 更新缓存用户信息
+ loginUser.getSysUser().setNickName(user.getNickName());
+ loginUser.getSysUser().setPhonenumber(user.getPhonenumber());
+ loginUser.getSysUser().setEmail(user.getEmail());
+ loginUser.getSysUser().setSex(user.getSex());
+ tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("修改个人信息异常，请联系管理员");
@@ -74,8 +112,41 @@
}
if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
{
+ // 更新缓存用户密码
+ LoginUser loginUser = tokenService.getLoginUser();
+ loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+ tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("修改密码异常，请联系管理员");
}
+
+ /**
+ * 头像上传
+ */
+ @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+ @PostMapping("/avatar")
+ public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
+ {
+ if (!file.isEmpty())
+ {
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ R<SysFile> fileResult = remoteFileService.upload(file);
+ if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData()))
+ {
+ return AjaxResult.error("文件服务异常，请联系管理员");
+ }
+ String url = fileResult.getData().getUrl();
+ if (userService.updateUserAvatar(loginUser.getUsername(), url))
+ {
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("imgUrl", url);
+ // 更新缓存用户头像
+ loginUser.getSysUser().setAvatar(url);
+ tokenService.setLoginUser(loginUser);
+ return ajax;
+ }
+ }
+ return AjaxResult.error("上传图片异常，请联系管理员");
+ }
}
--
Gitblit v1.9.3