Browse Source

修改网关模块bug

dev
管理员 6 years ago
parent
commit
1d26c2346f
  1. 9
      esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/TokenUtil.java
  2. 10
      esua-epdc/epdc-gateway/src/main/resources/application.yml
  3. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/config/WebConfig.java
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/interceptor/AuthorizationInterceptor.java
  5. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenProperties.java
  6. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/jwt/JwtTokenUtils.java
  7. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/resolver/LoginUserHandlerMethodArgumentResolver.java

9
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; package com.elink.esua.epdc.common.token.util;
import com.elink.esua.epdc.common.token.dto.TokenDto; 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 com.elink.esua.epdc.common.token.property.TokenPropertise;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -25,19 +24,11 @@ public class TokenUtil {
@Autowired @Autowired
private CpUserDetailRedis redisUtils; private CpUserDetailRedis redisUtils;
@Autowired
private JwtTokenUtils jwtUtils;
public TokenDto getTokenInfo(String userId) { public TokenDto getTokenInfo(String userId) {
TokenDto tokenDto = redisUtils.get(userId); TokenDto tokenDto = redisUtils.get(userId);
return tokenDto; return tokenDto;
} }
public String createToken(TokenDto tokenDto) {
redisUtils.set(tokenDto, tokenPropertise.getExpire());
return jwtUtils.generateToken(tokenDto.getUserId());
}
public void expireToken(String userId) { public void expireToken(String userId) {
redisUtils.logout(userId); redisUtils.logout(userId);
} }

10
esua-epdc/epdc-gateway/src/main/resources/application.yml

@ -71,6 +71,7 @@ spring:
- Path=/api/** - Path=/api/**
filters: filters:
- StripPrefix=0 - StripPrefix=0
- CpAuth=true
#爱心互助模块 #爱心互助模块
- id: epdc-heart-server - id: epdc-heart-server
uri: @gateway.routes.epdc-heart-server.uri@ uri: @gateway.routes.epdc-heart-server.uri@
@ -111,15 +112,6 @@ spring:
- Path=/services/** - Path=/services/**
filters: filters:
- StripPrefix=0 - 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用户模块 #APP用户模块
- id: epdc-user-server - id: epdc-user-server
uri: @gateway.routes.epdc-user-server.uri@ uri: @gateway.routes.epdc-user-server.uri@

4
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; package com.elink.esua.epdc.config;
import com.elink.esua.epdc.common.token.interceptor.AuthorizationInterceptor; import com.elink.esua.epdc.interceptor.AuthorizationInterceptor;
import com.elink.esua.epdc.common.token.resolver.LoginUserHandlerMethodArgumentResolver; import com.elink.esua.epdc.resolver.LoginUserHandlerMethodArgumentResolver;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;

4
esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/interceptor/AuthorizationInterceptor.java → 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. * 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.annotation.Login;
import com.elink.esua.epdc.common.token.dto.TokenDto; 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.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.common.token.util.TokenUtil;
import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.jwt.JwtTokenUtils;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

2
esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenProperties.java → 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.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

2
esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/jwt/JwtTokenUtils.java → 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.Claims;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;

2
esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/resolver/LoginUserHandlerMethodArgumentResolver.java → 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.dto.TokenDto;
import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
Loading…
Cancel
Save