From 771a1045ee3ef382d02b08afb620ef0b34d9d13a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 31 一月 2023 22:13:58 +0800
Subject: [PATCH] update 重构 抽取 jackson 功能 ruoyi-common-json 成为独立模块
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
index 2bc05a6..e1dfae8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
@@ -2,15 +2,15 @@
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.io.FileUtil;
-import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.system.domain.SysUser;
-import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.MimeTypeUtils;
+import com.ruoyi.common.web.core.BaseController;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.satoken.utils.LoginHelper;
+import com.ruoyi.system.domain.SysUser;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;
@@ -21,7 +21,6 @@
import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -44,11 +43,11 @@
@GetMapping
public R<Map<String, Object>> profile() {
SysUser user = userService.selectUserById(LoginHelper.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 R.ok(ajax);
+ return R.ok(Map.of(
+ "user", user,
+ "roleGroup", userService.selectUserRoleGroup(user.getUserName()),
+ "postGroup", userService.selectUserPostGroup(user.getUserName())
+ ));
}
/**
@@ -109,7 +108,6 @@
@Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
@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)) {
@@ -118,8 +116,7 @@
SysOssVo oss = iSysOssService.upload(avatarfile);
String avatar = oss.getUrl();
if (userService.updateUserAvatar(LoginHelper.getUsername(), avatar)) {
- ajax.put("imgUrl", avatar);
- return R.ok(ajax);
+ return R.ok(Map.of("imgUrl", avatar));
}
}
return R.fail("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
--
Gitblit v1.9.3