登陆相关

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -114,7 +114,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
         } else if (userType.equals(UserEnum.APP.getName())) {
             result = userClient.userInfo(tenantId, username, UserEnum.APP.getName());
         } else {
-            result = userClient.userInfo(tenantId, username, UserEnum.OTHER.getName());
+            result = userClient.userInfo(tenantId, username, UserEnum.ALL.getName());
         }
 
         // 判断返回信息
@@ -142,7 +142,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
                 throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_ROLE);
             }
 
-            /*校验登陆账号权限，客户端登陆userType=1，app端登陆userType=2，后管与客户端登陆userType=3*/
+            /*校验登陆账号权限，客户端登陆userType=1，app端登陆userType=2，全部端均可登陆userType=3*/
             if (user.getUserType().equals(1) || user.getUserType().equals(2) || user.getUserType().equals(3)) {
                 if (!user.getUserType().equals(3)) {
                     this.judgeLoginPermission(user);

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/enums/UserEnum.java

@@ -29,19 +29,19 @@ import lombok.Getter;
 public enum UserEnum {
 
 	/**
-	 * web
+	 * web客户端
 	 */
 	WEB("web", 1),
 
 	/**
-	 * app
+	 * app端
 	 */
 	APP("app", 2),
 
 	/**
-	 * other
+	 * all全部端
 	 */
-	OTHER("other", 3),
+	ALL("all", 3),
 	;
 
 	final String name;