|
@@ -1,8 +1,6 @@
|
|
|
package com.ruoyi.web.controller.system;
|
|
|
|
|
|
-import com.ruoyi.common.utils.StringUtils;
|
|
|
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.core.domain.model.LoginUser;
|
|
|
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 @@ public class SysProfileController extends BaseController
|
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISysOssService iSysOssService;
|
|
|
+
|
|
|
/**
|
|
|
* 个人信息
|
|
|
*/
|
|
@@ -124,7 +127,8 @@ public class SysProfileController extends BaseController
|
|
|
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<>();
|