jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 同步 dev 分支 更新最新改动

Browse Source
This commit is contained in:
疯狂的狮子li
2021-10-27 13:28:26 +08:00
parent 82a2dd8732
commit 6e73d8b3ab
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View File

@ -18,6 +18,7 @@ import com.ruoyi.system.domain.SysUserOnline;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -10,7 +10,6 @@ import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService;
import io.swagger.annotations.Api;
@ -42,7 +41,6 @@ public class SysLoginController {
private final SysLoginService loginService;
private final ISysMenuService menuService;
private final SysPermissionService permissionService;
private final ISysUserService iSysUserService;
/**
* 登录方法
@ -63,7 +61,7 @@ public class SysLoginController {
@ApiOperation("登出方法")
@PostMapping("/logout")
public AjaxResult logout(){
public AjaxResult<Void> logout(){
try {
StpUtil.logout();
} catch (NotLoginException e) {

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -33,6 +33,7 @@ import java.util.Map;
@RequestMapping("/system/user/profile")
public class SysProfileController extends BaseController {
private final ISysUserService userService;
private final ISysOssService iSysOssService;
/**
@ -104,12 +105,12 @@ public class SysProfileController extends BaseController {
@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()) {
SysUser user = SecurityUtils.getUser();
SysOss oss = iSysOssService.upload(file);
String avatar = oss.getUrl();
if (userService.updateUserAvatar(user.getUserName(), avatar)) {
Map<String,Object> ajax = new HashMap<>();
ajax.put("imgUrl", avatar);
return AjaxResult.success(ajax);
}