修改token结构

hengleeme · Oct 19, 2017 · 980e53b · 980e53b
1 parent 70450f1
commit 980e53b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/.../web/UserTokenAuthenticationSupplier.java → ...oken/UserTokenAuthenticationSupplier.java b/.../web/UserTokenAuthenticationSupplier.java → ...oken/UserTokenAuthenticationSupplier.java
@@ -1,10 +1,11 @@
-package org.hswebframework.web.authorization.basic.web;
+package org.hswebframework.web.authorization.token;
 
 import org.hswebframework.web.ThreadLocalUtils;
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.AuthenticationManager;
 import org.hswebframework.web.authorization.AuthenticationSupplier;
 import org.hswebframework.web.authorization.token.UserToken;
+import org.hswebframework.web.authorization.token.UserTokenHolder;
 
 import java.util.Optional;
 

diff --git a/...horization/basic/web/UserTokenHolder.java → .../authorization/token/UserTokenHolder.java b/...horization/basic/web/UserTokenHolder.java → .../authorization/token/UserTokenHolder.java
@@ -1,4 +1,4 @@
-package org.hswebframework.web.authorization.basic.web;
+package org.hswebframework.web.authorization.token;
 
 import org.hswebframework.web.ThreadLocalUtils;
 import org.hswebframework.web.authorization.token.UserToken;

diff --git a/...n-api/src/main/java/org/hswebframework/web/authorization/token/event/UserSignInEvent.java b/...n-api/src/main/java/org/hswebframework/web/authorization/token/event/UserSignInEvent.java
@@ -3,13 +3,9 @@
 import org.hswebframework.web.authorization.token.UserToken;
 import org.hswebframework.web.authorization.listener.event.AuthorizationEvent;
 
-/**
- * Created by zhouhao on 2017/7/7.
- */
 public class UserSignInEvent implements AuthorizationEvent {
     private UserToken detail;
 
-
     public UserSignInEvent(UserToken detail) {
         this.detail = detail;
     }

diff --git a/...bframework/web/authorization/basic/configuration/AuthorizingHandlerAutoConfiguration.java b/...bframework/web/authorization/basic/configuration/AuthorizingHandlerAutoConfiguration.java
@@ -9,6 +9,7 @@
 import org.hswebframework.web.authorization.basic.handler.access.DefaultDataAccessController;
 import org.hswebframework.web.authorization.basic.web.*;
 import org.hswebframework.web.authorization.token.DefaultUserTokenManager;
+import org.hswebframework.web.authorization.token.UserTokenAuthenticationSupplier;
 import org.hswebframework.web.authorization.token.UserTokenManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanPostProcessor;

diff --git a/...tion-basic/src/main/java/org/hswebframework/web/authorization/basic/web/UserOnSignIn.java b/...tion-basic/src/main/java/org/hswebframework/web/authorization/basic/web/UserOnSignIn.java
@@ -1,17 +1,14 @@
 package org.hswebframework.web.authorization.basic.web;
 
-import org.apache.commons.codec.digest.DigestUtils;
-import org.hswebframework.web.WebUtil;
 import org.hswebframework.web.authorization.listener.AuthorizationListener;
 import org.hswebframework.web.authorization.listener.event.AuthorizationSuccessEvent;
 import org.hswebframework.web.authorization.token.UserToken;
+import org.hswebframework.web.authorization.token.UserTokenHolder;
 import org.hswebframework.web.authorization.token.UserTokenManager;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
 
 /**
  * @author zhouhao

diff --git a/...ion-basic/src/main/java/org/hswebframework/web/authorization/basic/web/UserOnSignOut.java b/...ion-basic/src/main/java/org/hswebframework/web/authorization/basic/web/UserOnSignOut.java
@@ -3,6 +3,7 @@
 import org.hswebframework.web.authorization.listener.AuthorizationListener;
 import org.hswebframework.web.authorization.listener.event.AuthorizationExitEvent;
 import org.hswebframework.web.authorization.token.UserToken;
+import org.hswebframework.web.authorization.token.UserTokenHolder;
 import org.hswebframework.web.authorization.token.UserTokenManager;
 
 /**

diff --git a/...src/main/java/org/hswebframework/web/authorization/basic/web/WebUserTokenInterceptor.java b/...src/main/java/org/hswebframework/web/authorization/basic/web/WebUserTokenInterceptor.java
@@ -1,6 +1,7 @@
 package org.hswebframework.web.authorization.basic.web;
 
 import org.hswebframework.web.authorization.token.UserToken;
+import org.hswebframework.web.authorization.token.UserTokenHolder;
 import org.hswebframework.web.authorization.token.UserTokenManager;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;