From 1d26c2346fa791bd6e5e515d397c63a637252b01 Mon Sep 17 00:00:00 2001 From: rongchao Date: Thu, 5 Sep 2019 16:19:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E5=85=B3=E6=A8=A1?= =?UTF-8?q?=E5=9D=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/common/token/util/TokenUtil.java | 9 --------- .../epdc-gateway/src/main/resources/application.yml | 10 +--------- .../java/com/elink/esua/epdc/config/WebConfig.java | 4 ++-- .../epdc}/interceptor/AuthorizationInterceptor.java | 4 ++-- .../com/elink/esua/epdc}/jwt/JwtTokenProperties.java | 2 +- .../java/com/elink/esua/epdc}/jwt/JwtTokenUtils.java | 2 +- .../LoginUserHandlerMethodArgumentResolver.java | 2 +- 7 files changed, 8 insertions(+), 25 deletions(-) rename esua-epdc/{epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token => epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc}/interceptor/AuthorizationInterceptor.java (96%) rename esua-epdc/{epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token => epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc}/jwt/JwtTokenProperties.java (94%) rename esua-epdc/{epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token => epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc}/jwt/JwtTokenUtils.java (97%) rename esua-epdc/{epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token => epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc}/resolver/LoginUserHandlerMethodArgumentResolver.java (97%) diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/TokenUtil.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/TokenUtil.java index 530069e8a..ba8a32beb 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/TokenUtil.java +++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/TokenUtil.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.common.token.util; import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.common.token.jwt.JwtTokenUtils; import com.elink.esua.epdc.common.token.property.TokenPropertise; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,19 +24,11 @@ public class TokenUtil { @Autowired private CpUserDetailRedis redisUtils; - @Autowired - private JwtTokenUtils jwtUtils; - public TokenDto getTokenInfo(String userId) { TokenDto tokenDto = redisUtils.get(userId); return tokenDto; } - public String createToken(TokenDto tokenDto) { - redisUtils.set(tokenDto, tokenPropertise.getExpire()); - return jwtUtils.generateToken(tokenDto.getUserId()); - } - public void expireToken(String userId) { redisUtils.logout(userId); } diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 667a89c9a..da2c4d266 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -71,6 +71,7 @@ spring: - Path=/api/** filters: - StripPrefix=0 + - CpAuth=true #爱心互助模块 - id: epdc-heart-server uri: @gateway.routes.epdc-heart-server.uri@ @@ -111,15 +112,6 @@ spring: - Path=/services/** filters: - StripPrefix=0 - #移动端接口模块 - - id: epdc-app-server - uri: @gateway.routes.epdc-app-server.uri@ - order: 13 - predicates: - - Path=/epdc-app/** - filters: - - StripPrefix=0 - - CpAuth=true #APP用户模块 - id: epdc-user-server uri: @gateway.routes.epdc-user-server.uri@ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java index e7e5c8015..21ddc3bd4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java @@ -8,8 +8,8 @@ package com.elink.esua.epdc.config; -import com.elink.esua.epdc.common.token.interceptor.AuthorizationInterceptor; -import com.elink.esua.epdc.common.token.resolver.LoginUserHandlerMethodArgumentResolver; +import com.elink.esua.epdc.interceptor.AuthorizationInterceptor; +import com.elink.esua.epdc.resolver.LoginUserHandlerMethodArgumentResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/interceptor/AuthorizationInterceptor.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/interceptor/AuthorizationInterceptor.java similarity index 96% rename from esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/interceptor/AuthorizationInterceptor.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/interceptor/AuthorizationInterceptor.java index 3877934e7..de7aecf63 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/interceptor/AuthorizationInterceptor.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/interceptor/AuthorizationInterceptor.java @@ -14,16 +14,16 @@ * the License. */ -package com.elink.esua.epdc.common.token.interceptor; +package com.elink.esua.epdc.interceptor; import com.elink.esua.epdc.common.token.annotation.Login; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.enums.ErrorCode; -import com.elink.esua.epdc.common.token.jwt.JwtTokenUtils; import com.elink.esua.epdc.common.token.util.TokenUtil; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.exception.RenException; +import com.elink.esua.epdc.jwt.JwtTokenUtils; import io.jsonwebtoken.Claims; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenProperties.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenProperties.java similarity index 94% rename from esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenProperties.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenProperties.java index ad484aa5a..3e938f90d 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenProperties.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenProperties.java @@ -6,7 +6,7 @@ * 版权所有，侵权必究！ */ -package com.elink.esua.epdc.common.token.jwt; +package com.elink.esua.epdc.jwt; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenUtils.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenUtils.java similarity index 97% rename from esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenUtils.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenUtils.java index 2dd2ba97f..736be6d35 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenUtils.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenUtils.java @@ -6,7 +6,7 @@ * 版权所有，侵权必究！ */ -package com.elink.esua.epdc.common.token.jwt; +package com.elink.esua.epdc.jwt; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/resolver/LoginUserHandlerMethodArgumentResolver.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java similarity index 97% rename from esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/resolver/LoginUserHandlerMethodArgumentResolver.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java index 0a6dc910e..6e999b148 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -6,7 +6,7 @@ * 版权所有，侵权必究！ */ -package com.elink.esua.epdc.common.token.resolver; +package com.elink.esua.epdc.resolver; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;