From dd25573ebce3450d90d0012a30b12a5185bc7310 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 08 七月 2022 15:49:15 +0800
Subject: [PATCH] update 使用 @param 注释替换 @Parameter 注解 fix 修复 token 无法传递 与 无法持久化问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 114 +++++++++++++++++++++++++++++---------------------------
1 files changed, 59 insertions(+), 55 deletions(-)
diff --git 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
index cf63ea6..ee45ac2 100644
--- 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
@@ -1,51 +1,56 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.io.FileUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* 涓汉淇℃伅 涓氬姟澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Validated
+@Tag(name = "涓汉淇℃伅鎺у埗鍣�", description = "涓汉淇℃伅绠＄悊")
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/user/profile")
-public class SysProfileController extends BaseController
-{
- @Autowired
- private ISysUserService userService;
+public class SysProfileController extends BaseController {
- @Autowired
- private ISysOssService iSysOssService;
+ private final ISysUserService userService;
+ private final ISysOssService iSysOssService;
/**
* 涓汉淇℃伅
*/
@GetMapping
- public AjaxResult profile()
- {
- SysUser user = userService.getById(getUserId());
- Map<String,Object> ajax = new HashMap<>();
- ajax.put("user", user);
+ public R<Map<String, Object>> profile() {
+ SysUser user = userService.selectUserById(getUserId());
+ Map<String, Object> ajax = new HashMap<>();
+ ajax.put("user", user);
ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
- return AjaxResult.success(ajax);
+ return R.ok(ajax);
}
/**
@@ -53,71 +58,70 @@
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult updateProfile(@RequestBody SysUser user)
- {
+ public R<Void> updateProfile(@RequestBody SysUser user) {
if (StringUtils.isNotEmpty(user.getPhonenumber())
- && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
- {
- return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+ return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
}
if (StringUtils.isNotEmpty(user.getEmail())
- && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
- {
- return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+ return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
user.setUserId(getUserId());
+ user.setUserName(null);
user.setPassword(null);
- if (userService.updateUserProfile(user) > 0)
- {
- return AjaxResult.success();
+ if (userService.updateUserProfile(user) > 0) {
+ return R.ok();
}
- return AjaxResult.error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ return R.fail("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
/**
* 閲嶇疆瀵嗙爜
+ *
+ * @param newPassword 鏃у瘑鐮�
+ * @param oldPassword 鏂板瘑鐮�
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd")
- public AjaxResult updatePwd(String oldPassword, String newPassword)
- {
- SysUser user = SecurityUtils.getUser();
+ public R<Void> updatePwd(String oldPassword, String newPassword) {
+ SysUser user = userService.selectUserById(LoginHelper.getUserId());
String userName = user.getUserName();
String password = user.getPassword();
- if (!SecurityUtils.matchesPassword(oldPassword, password))
- {
- return AjaxResult.error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
+ if (!BCrypt.checkpw(oldPassword, password)) {
+ return R.fail("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
}
- if (SecurityUtils.matchesPassword(newPassword, password))
- {
- return AjaxResult.error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
+ if (BCrypt.checkpw(newPassword, password)) {
+ return R.fail("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
}
- if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
- {
- return AjaxResult.success();
+
+ if (userService.resetUserPwd(userName, BCrypt.hashpw(newPassword)) > 0) {
+ return R.ok();
}
- return AjaxResult.error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ return R.fail("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
/**
* 澶村儚涓婁紶
+ *
+ * @param avatarfile 鐢ㄦ埛澶村儚
*/
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
- @PostMapping("/avatar")
- public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws IOException
- {
- if (!file.isEmpty())
- {
- SysUser user = SecurityUtils.getUser();
- SysOss oss = iSysOssService.upload(file);
- String avatar = oss.getUrl();
- if (userService.updateUserAvatar(user.getUserName(), avatar))
- {
- Map<String,Object> ajax = new HashMap<>();
+ @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+ Map<String, Object> ajax = new HashMap<>();
+ if (!avatarfile.isEmpty()) {
+ String extension = FileUtil.extName(avatarfile.getOriginalFilename());
+ if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
+ return R.fail("鏂囦欢鏍煎紡涓嶆纭紝璇蜂笂浼�" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "鏍煎紡");
+ }
+ SysOss oss = iSysOssService.upload(avatarfile);
+ String avatar = oss.getUrl();
+ if (userService.updateUserAvatar(getUsername(), avatar)) {
ajax.put("imgUrl", avatar);
- return AjaxResult.success(ajax);
+ return R.ok(ajax);
}
}
- return AjaxResult.error("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ return R.fail("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
}
--
Gitblit v1.9.3