From 4d02466fed4f3ea012a80c3359cde9af0737141f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 十一月 2022 20:01:12 +0800
Subject: [PATCH] add 增加 skywalking 集成 默认注释不开启
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 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 0710e8b..77a8767 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
@@ -12,14 +12,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.system.domain.SysOss;
+import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-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;
@@ -34,7 +31,6 @@
* @author Lion Li
*/
@Validated
-@Tag(name ="涓汉淇℃伅鎺у埗鍣�", description = "涓汉淇℃伅绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/user/profile")
@@ -46,7 +42,6 @@
/**
* 涓汉淇℃伅
*/
- @Operation(summary = "涓汉淇℃伅")
@GetMapping
public R<Map<String, Object>> profile() {
SysUser user = userService.selectUserById(getUserId());
@@ -60,7 +55,6 @@
/**
* 淇敼鐢ㄦ埛
*/
- @Operation(summary = "淇敼鐢ㄦ埛")
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> updateProfile(@RequestBody SysUser user) {
@@ -75,6 +69,8 @@
user.setUserId(getUserId());
user.setUserName(null);
user.setPassword(null);
+ user.setAvatar(null);
+ user.setDeptId(null);
if (userService.updateUserProfile(user) > 0) {
return R.ok();
}
@@ -83,12 +79,10 @@
/**
* 閲嶇疆瀵嗙爜
+ *
+ * @param newPassword 鏃у瘑鐮�
+ * @param oldPassword 鏂板瘑鐮�
*/
- @Operation(summary = "閲嶇疆瀵嗙爜")
- @Parameters({
- @Parameter(name = "oldPassword", description = "鏃у瘑鐮�", in = ParameterIn.QUERY),
- @Parameter(name = "newPassword", description = "鏂板瘑鐮�", in = ParameterIn.QUERY)
- })
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd")
public R<Void> updatePwd(String oldPassword, String newPassword) {
@@ -110,21 +104,19 @@
/**
* 澶村儚涓婁紶
+ *
+ * @param avatarfile 鐢ㄦ埛澶村儚
*/
- @Operation(summary = "澶村儚涓婁紶")
- @Parameters({
- @Parameter(name = "avatarfile", description = "鐢ㄦ埛澶村儚", in = ParameterIn.QUERY, required = true)
- })
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
- @PostMapping("/avatar")
- public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
+ @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 (!file.isEmpty()) {
- String extension = FileUtil.extName(file.getOriginalFilename());
+ 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(file);
+ SysOssVo oss = iSysOssService.upload(avatarfile);
String avatar = oss.getUrl();
if (userService.updateUserAvatar(getUsername(), avatar)) {
ajax.put("imgUrl", avatar);
--
Gitblit v1.9.3