RuoYi лет назад: 5
Родитель
Сommit
4ec6d51aca

+ 1 - 1
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -27,7 +27,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
27
             @Override
27
             @Override
28
             public R<LoginUser> getUserInfo(String username)
28
             public R<LoginUser> getUserInfo(String username)
29
             {
29
             {
30
-                return null;
30
+                return R.fail("获取用户失败:" + throwable.getMessage());
31
             }
31
             }
32
         };
32
         };
33
     }
33
     }

+ 6 - 0
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -55,6 +55,12 @@ public class SysLoginService
55
         }
55
         }
56
         // 查询用户信息
56
         // 查询用户信息
57
         R<LoginUser> userResult = remoteUserService.getUserInfo(username);
57
         R<LoginUser> userResult = remoteUserService.getUserInfo(username);
58
+
59
+        if (R.FAIL == userResult.getCode())
60
+        {
61
+            throw new BaseException(userResult.getMsg());
62
+        }
63
+
58
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
64
         if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
59
         {
65
         {
60
             remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
66
             remoteLogService.saveLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");

+ 1 - 1
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -29,7 +29,7 @@ public class GlobalExceptionHandler
29
     @ExceptionHandler(BaseException.class)
29
     @ExceptionHandler(BaseException.class)
30
     public AjaxResult baseException(BaseException e)
30
     public AjaxResult baseException(BaseException e)
31
     {
31
     {
32
-        return AjaxResult.error(e.getMessage());
32
+        return AjaxResult.error(e.getDefaultMessage());
33
     }
33
     }
34
 
34
 
35
     /**
35
     /**