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

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

@@ -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;

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

@@ -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) {

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

@@ -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);
             }

ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -76,14 +76,14 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
 	 * 获取登录用户名
 	 */
 	private String getLoginUsername() {
-		LoginUser loginUser;
+		SysUser user;
 		try {
-			loginUser = SecurityUtils.getLoginUser();
+            user = SecurityUtils.getUser();
 		} catch (Exception e) {
 			log.warn("自动注入警告 => 用户未登录");
 			return null;
 		}
-		return loginUser.getUsername();
+		return user.getUserName();
 	}
 
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java

@@ -9,7 +9,6 @@ import com.ruoyi.common.exception.DemoModeException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.AccessDeniedException;
 import org.springframework.validation.BindException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -42,8 +41,7 @@ public class GlobalExceptionHandler {
      * 角色校验异常
      */
     @ExceptionHandler(NotRoleException.class)
-    public AjaxResult handleAccessDeniedException(NotRoleException e, HttpServletRequest request)
+    public AjaxResult<Void> handleAccessDeniedException(NotRoleException e, HttpServletRequest request) {
-    {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',角色校验失败'{}'", requestURI, e.getMessage());
         return AjaxResult.error(HttpStatus.HTTP_FORBIDDEN, "没有角色，请联系管理员授权");
@@ -53,11 +51,10 @@ public class GlobalExceptionHandler {
      * 认证失败
      */
     @ExceptionHandler(NotLoginException.class)
-    public AjaxResult handleAccessDeniedException(NotLoginException e, HttpServletRequest request)
+    public AjaxResult<Void> handleAccessDeniedException(NotLoginException e, HttpServletRequest request) {
-    {
         String requestURI = request.getRequestURI();
-        log.error("请求访问：{}，认证失败，无法访问系统资源", requestURI, e.getMessage());
+        log.error("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI, e.getMessage());
-        return AjaxResult.error(HttpStatus.HTTP_UNAUTHORIZED, StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", requestURI));
+        return AjaxResult.error(HttpStatus.HTTP_UNAUTHORIZED, StringUtils.format("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI));
     }
 
     /**