From 868942e202aeb967b8ce47b38cc2433a636a128d Mon Sep 17 00:00:00 2001
From: phanes <5411232+phanes@user.noreply.gitee.com>
Date: 星期日, 16 一月 2022 17:46:24 +0800
Subject: [PATCH] update 格式化代码结构 统一编码格式
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 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 d037e79..155d510 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
@@ -5,21 +5,25 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.service.TokenService;
+import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.LoginUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -30,13 +34,12 @@
*/
@Validated
@Api(value = "涓汉淇℃伅鎺у埗鍣�", tags = {"涓汉淇℃伅绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/user/profile")
public class SysProfileController extends BaseController {
private final ISysUserService userService;
- private final TokenService tokenService;
private final ISysOssService iSysOssService;
/**
@@ -45,12 +48,11 @@
@ApiOperation("涓汉淇℃伅")
@GetMapping
public AjaxResult<Map<String, Object>> profile() {
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
+ SysUser user = userService.selectUserById(getUserId());
Map<String, Object> ajax = new HashMap<>();
ajax.put("user", user);
- ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
- ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+ ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
+ ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
return AjaxResult.success(ajax);
}
@@ -62,24 +64,17 @@
@PutMapping
public AjaxResult<Void> updateProfile(@RequestBody SysUser user) {
if (StringUtils.isNotEmpty(user.getPhonenumber())
- && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+ && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
}
if (StringUtils.isNotEmpty(user.getEmail())
- && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+ && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- LoginUser loginUser = getLoginUser();
- SysUser sysUser = loginUser.getUser();
- user.setUserId(sysUser.getUserId());
+ user.setUserId(getUserId());
+ user.setUserName(null);
user.setPassword(null);
if (userService.updateUserProfile(user) > 0) {
- // 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
- sysUser.setNickName(user.getNickName());
- sysUser.setPhonenumber(user.getPhonenumber());
- sysUser.setEmail(user.getEmail());
- sysUser.setSex(user.getSex());
- tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -89,12 +84,16 @@
* 閲嶇疆瀵嗙爜
*/
@ApiOperation("閲嶇疆瀵嗙爜")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "oldPassword", value = "鏃у瘑鐮�", paramType = "query", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "newPassword", value = "鏂板瘑鐮�", paramType = "query", dataTypeClass = String.class)
+ })
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd")
public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) {
- LoginUser loginUser = getLoginUser();
- String userName = loginUser.getUsername();
- String password = loginUser.getPassword();
+ SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId());
+ String userName = user.getUserName();
+ String password = user.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password)) {
return AjaxResult.error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
}
@@ -102,9 +101,6 @@
return AjaxResult.error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
}
if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {
- // 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
- loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
- tokenService.setLoginUser(loginUser);
return AjaxResult.success();
}
return AjaxResult.error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -115,21 +111,17 @@
*/
@ApiOperation("澶村儚涓婁紶")
@ApiImplicitParams({
- @ApiImplicitParam(name = "file", value = "鐢ㄦ埛澶村儚", dataType = "java.io.File", required = true),
+ @ApiImplicitParam(name = "avatarfile", value = "鐢ㄦ埛澶村儚", dataTypeClass = File.class, required = true),
})
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
@PostMapping("/avatar")
public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
Map<String, Object> ajax = new HashMap<>();
if (!file.isEmpty()) {
- LoginUser loginUser = getLoginUser();
SysOss oss = iSysOssService.upload(file);
String avatar = oss.getUrl();
- if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) {
+ if (userService.updateUserAvatar(getUsername(), avatar)) {
ajax.put("imgUrl", avatar);
- // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
- loginUser.getUser().setAvatar(avatar);
- tokenService.setLoginUser(loginUser);
return AjaxResult.success(ajax);
}
}
--
Gitblit v1.9.3