Browse Source

修复依赖错误

zhou-hao 7 years ago
parent
commit
7fcc6f246b

+ 1 - 7
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/UserOnSignIn.java

@@ -21,8 +21,7 @@ import java.util.List;
  * @see UserTokenGenerator
  * @since 3.0
  */
-public class UserOnSignIn implements AuthorizationListener<AuthorizationSuccessEvent>
-        , ApplicationListener<AuthorizationSuccessEvent> {
+public class UserOnSignIn implements ApplicationListener<AuthorizationSuccessEvent> {
 
     /**
      * 默认到令牌类型
@@ -51,11 +50,6 @@ public class UserOnSignIn implements AuthorizationListener<AuthorizationSuccessE
         this.userTokenGenerators = userTokenGenerators;
     }
 
-    @Override
-    public void on(AuthorizationSuccessEvent event) {
-        onApplicationEvent(event);
-    }
-
     @Override
     public void onApplicationEvent(AuthorizationSuccessEvent event) {
         UserToken token = UserTokenHolder.currentToken();

+ 1 - 8
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/web/UserOnSignOut.java

@@ -1,8 +1,6 @@
 package org.hswebframework.web.authorization.basic.web;
 
-import org.hswebframework.web.authorization.listener.AuthorizationListener;
 import org.hswebframework.web.authorization.listener.event.AuthorizationExitEvent;
-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;
@@ -11,18 +9,13 @@ import org.springframework.context.ApplicationListener;
 /**
  * @author zhouhao
  */
-public class UserOnSignOut implements AuthorizationListener<AuthorizationExitEvent>,ApplicationListener<AuthorizationExitEvent> {
+public class UserOnSignOut implements  ApplicationListener<AuthorizationExitEvent> {
     private UserTokenManager userTokenManager;
 
     public UserOnSignOut(UserTokenManager userTokenManager) {
         this.userTokenManager = userTokenManager;
     }
 
-    @Override
-    public void on(AuthorizationExitEvent event) {
-       onApplicationEvent(event);
-    }
-
     private String geToken() {
         UserToken token = UserTokenHolder.currentToken();
         return null != token ? token.getToken() : "";

+ 1 - 0
hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/src/main/java/org/hswebframework/web/authorization/oauth2/client/simple/SimpleOAuth2RequestService.java

@@ -86,6 +86,7 @@ public class SimpleOAuth2RequestService implements OAuth2RequestService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void doEvent(String serverId, OAuth2Event event, Class<? extends OAuth2Event> eventType) {
         listenerStore.getOrDefault(serverId, Collections.emptyMap())
                 .getOrDefault(eventType, Collections.emptyList())

+ 1 - 1
hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/src/main/java/org/hswebframework/web/authorization/oauth2/client/simple/session/AuthorizationCodeSession.java

@@ -18,10 +18,10 @@
 
 package org.hswebframework.web.authorization.oauth2.client.simple.session;
 
-import org.hswebframework.web.authorization.oauth2.client.OAuth2Constants;
 import org.hswebframework.web.authorization.oauth2.client.request.OAuth2Request;
 import org.hswebframework.web.authorization.oauth2.client.request.OAuth2Session;
 import org.hswebframework.web.oauth2.core.GrantType;
+import org.hswebframework.web.oauth2.core.OAuth2Constants;
 
 /**
  * @author zhouhao

+ 1 - 1
hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/src/main/java/org/hswebframework/web/authorization/oauth2/client/simple/session/PasswordSession.java

@@ -18,9 +18,9 @@
 
 package org.hswebframework.web.authorization.oauth2.client.simple.session;
 
-import org.hswebframework.web.authorization.oauth2.client.OAuth2Constants;
 import org.hswebframework.web.authorization.oauth2.client.request.OAuth2Request;
 import org.hswebframework.web.oauth2.core.GrantType;
+import org.hswebframework.web.oauth2.core.OAuth2Constants;
 
 /**
  * @author zhouhao