From 08db4a5f53e17f3224e4f0caa66f1b76e3971aaf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 04 八月 2021 19:03:25 +0800
Subject: [PATCH] update 更改所有业务excel导出
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 31ca6dd..e106fa1 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,8 +1,6 @@
package com.ruoyi.web.controller.system;
-import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -11,8 +9,10 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
+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 org.springframework.web.bind.annotation.*;
@@ -37,6 +37,9 @@
@Autowired
private TokenService tokenService;
+ @Autowired
+ private ISysOssService iSysOssService;
+
/**
* 涓汉淇℃伅
*/
@@ -59,19 +62,22 @@
@PutMapping
public AjaxResult updateProfile(@RequestBody SysUser user)
{
- if (StrUtil.isNotEmpty(user.getPhonenumber())
+ if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
}
- if (StrUtil.isNotEmpty(user.getEmail())
+ if (StringUtils.isNotEmpty(user.getEmail())
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
{
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ SysUser sysUser = loginUser.getUser();
+ user.setUserId(sysUser.getUserId());
+ user.setPassword(null);
if (userService.updateUserProfile(user) > 0)
{
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
// 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
loginUser.getUser().setNickName(user.getNickName());
loginUser.getUser().setPhonenumber(user.getPhonenumber());
@@ -121,7 +127,8 @@
if (!file.isEmpty())
{
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
+ SysOss oss = iSysOssService.upload(file);
+ String avatar = oss.getUrl();
if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
{
Map<String,Object> ajax = new HashMap<>();
--
Gitblit v1.9.3