From c8e377c3d6656ccf8b5ce4f833fe33392500a0ed Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 25 Sep 2019 09:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0gateway=E7=99=BD=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=EF=BC=9B=E6=9A=82=E5=AD=98=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java  | 5 +++++
 .../main/java/com/elink/esua/epdc/filter/CpProperty.java    | 5 +++++
 esua-epdc/epdc-gateway/src/main/resources/application.yml   | 4 ++++
 .../elink/esua/epdc/service/impl/AppUserServiceImpl.java    | 6 ++++++
 4 files changed, 20 insertions(+)

diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
index c0547b488..eb394b104 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
@@ -97,6 +97,11 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
     }
 
     private boolean pathMatcher(String requestUri) {
+        for (String url : cpProperty.getSwaggerUrls()) {
+            if (antPathMatcher.match(url, requestUri)) {
+                return false;
+            }
+        }
         for (String url : cpProperty.getUrls()) {
             if (antPathMatcher.match(url, requestUri)) {
                 return true;
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
index 33f7af4ca..b15e785e7 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java
@@ -19,4 +19,9 @@ public class CpProperty {
 
     private List<String> urls;
 
+    /**
+     * 不处理token，直接通过
+     */
+    private List<String> swaggerUrls;
+
 }
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 8295a91cd..7fb1f0644 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -189,3 +189,7 @@ epdc:
   # 党建e家接口
   urls:
     - /api/**
+  # 不处理token，直接通过
+  swaggerUrls:
+    - /api/wx/getWxConfig
+    - /api/admin/dept/completeName
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 41efc2793..74c6fdbea 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -8,6 +8,7 @@ import com.elink.esua.epdc.common.token.util.TokenUtil;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
@@ -77,6 +78,9 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private JwtTokenUtils jwtTokenUtils;
 
+    @Autowired
+    private RedisUtils redisUtils;
+
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMpToken(EpdcAppUserTokenFormDTO formDto) {
@@ -168,6 +172,8 @@ public class AppUserServiceImpl implements AppUserService {
             TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class);
             tokenDto.setUserId(userId);
             cpUserDetailRedis.set(tokenDto, expire);
+            // 暂用，部署生产环境时删除
+            redisUtils.set("epdc:sys:security:cpuser:token:" + userId, token);
 
             authorization.setUserState(AppUserStateEnum.REGISTERED.value());
             authorization.setToken(token);