소스 검색

优化命名

zhou-hao 7 년 전
부모
커밋
27b7017816

+ 2 - 2
hsweb-authorization/hsweb-authorization-api/src/test/java/org/hswebframework/web/authorization/UserTokenManagerTests.java

@@ -65,7 +65,7 @@ public class UserTokenManagerTests {
         } catch (AccessDenyException e) {
 
         }
-        Assert.assertTrue(userTokenManager.getByToken("test").isEffective());
+        Assert.assertTrue(userTokenManager.getByToken("test").isNormal());
         Assert.assertTrue(userTokenManager.getByToken("test2")==null);
 
     }
@@ -82,7 +82,7 @@ public class UserTokenManagerTests {
 
         userTokenManager.signIn("test2", "sessionId", "admin", 30000);
 
-        Assert.assertTrue(userTokenManager.getByToken("test2").isEffective());
+        Assert.assertTrue(userTokenManager.getByToken("test2").isNormal());
 
         Assert.assertTrue(userTokenManager.getByToken("test").isOffline());
 

+ 1 - 1
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/main/java/org/hswebframework/web/authorization/starter/BasicAuthorizationTokenParser.java

@@ -41,7 +41,7 @@ public class BasicAuthorizationTokenParser implements UserTokenForTypeParser {
         try {
             String usernameAndPassword = new String(Base64.decodeBase64(authorization));
             UserToken token = userTokenManager.getByToken(usernameAndPassword);
-            if (token != null && token.isEffective()) {
+            if (token != null && token.isNormal()) {
                 return new ParsedToken() {
                     @Override
                     public String getToken() {