优化shiro配置

zhou-hao · zhou-hao · commit 24f4753cd44d · 2017-02-27T11:52:58.000+08:00
diff --git a/hsweb-authorization/hsweb-authorization-shiro/src/main/java/org/hswebframework/web/authorization/shiro/ListenerAuthorizingRealm.java b/hsweb-authorization/hsweb-authorization-shiro/src/main/java/org/hswebframework/web/authorization/shiro/ListenerAuthorizingRealm.java
@@ -41,7 +41,7 @@
 public class ListenerAuthorizingRealm extends AuthorizingRealm implements UserAuthorizationListener {
 
     public ListenerAuthorizingRealm() {
-        setAuthenticationTokenClass(CustomAuthenticationToken.class);
+        setAuthenticationTokenClass(SimpleAuthenticationToken.class);
     }
 
     @Override
@@ -53,7 +53,7 @@ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principal
 
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
-        if (token instanceof CustomAuthenticationToken) {
+        if (token instanceof SimpleAuthenticationToken) {
             return this.<String, AuthenticationInfo>getCache((String) token.getPrincipal())
                     .get(AuthenticationInfo.class.getName());
         }
@@ -63,8 +63,7 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)
     private AuthenticationInfo createAuthenticationInfo(Authorization authorization) {
         return new SimpleAuthenticationInfo(
                 authorization.getUser().getUsername(),
-                authorization.getUser().getId(),
-                authorization.getUser().getName());
+                authorization.getUser().getId(), ListenerAuthorizingRealm.class.getName());
     }
 
     @Override
@@ -96,7 +95,7 @@ public void onAuthorizeSuccess(boolean isRemembered, Authorization authorization
                 .put(AuthenticationInfo.class.getName(), createAuthenticationInfo(authorization));
 
         Subject subject = SecurityUtils.getSubject();
-        subject.login(new CustomAuthenticationToken(authorization, isRemembered));
+        subject.login(new SimpleAuthenticationToken(authorization, isRemembered));
         subject.getSession().setAttribute(Authorization.class.getName(), authorization);
     }
 
diff --git a/hsweb-authorization/hsweb-authorization-shiro/src/main/java/org/hswebframework/web/authorization/shiro/SimpleAuthenticationToken.java b/hsweb-authorization/hsweb-authorization-shiro/src/main/java/org/hswebframework/web/authorization/shiro/SimpleAuthenticationToken.java
@@ -27,14 +27,14 @@
  *
  * @author zhouhao
  */
-public class CustomAuthenticationToken implements AuthenticationToken, HostAuthenticationToken, RememberMeAuthenticationToken {
+public class SimpleAuthenticationToken implements AuthenticationToken, HostAuthenticationToken, RememberMeAuthenticationToken {
     private Authorization authorization;
 
     private boolean rememberMe;
 
     private String host;
 
-    public CustomAuthenticationToken(Authorization authorization, boolean rememberMe) {
+    public SimpleAuthenticationToken(Authorization authorization, boolean rememberMe) {
         this.authorization = authorization;
         this.rememberMe = rememberMe;
     }

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,14 @@`
`27`	`27`	`*`
`28`	`28`	`* @author zhouhao`
`29`	`29`	`*/`
`30`		`-public class CustomAuthenticationToken implements AuthenticationToken, HostAuthenticationToken, RememberMeAuthenticationToken {`
	`30`	`+public class SimpleAuthenticationToken implements AuthenticationToken, HostAuthenticationToken, RememberMeAuthenticationToken {`
`31`	`31`	`private Authorization authorization;`
`32`	`32`
`33`	`33`	`private boolean rememberMe;`
`34`	`34`
`35`	`35`	`private String host;`
`36`	`36`
`37`		`- public CustomAuthenticationToken(Authorization authorization, boolean rememberMe) {`
	`37`	`+ public SimpleAuthenticationToken(Authorization authorization, boolean rememberMe) {`
`38`	`38`	`this.authorization = authorization;`
`39`	`39`	`this.rememberMe = rememberMe;`
`40`	`40`	`}`