From 022bf25985d87aca78c648d1a5c66a44b0448b27 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 21 Apr 2020 19:06:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=8B=A6=E6=88=AATokenDto?=
 =?UTF-8?q?=20Filter=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/common/token/util/TokenUtil.java   |  5 -----
 .../epmet/commons/tools/utils/CpUserDetailRedis.java  |  6 ++----
 .../com/epmet/filter/CpAuthGatewayFilterFactory.java  | 11 ++++++++++-
 .../main/java/com/epmet/filter/UserTokenFilter.java   |  3 +--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
index efefc5e16a..8042695c85 100644
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
@@ -25,11 +25,6 @@ public class TokenUtil {
     @Autowired
     private CpUserDetailRedis redisUtils;
 
-    public TokenDto getTokenInfo(String app, String client, String userId) {
-        TokenDto tokenDto = redisUtils.get(app,client,userId);
-        return tokenDto;
-    }
-
     public void expireToken(String app,String client,String userId) {
         redisUtils.logout(app,client,userId);
     }
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java
index 9d3e2c3083..4c0845fc6c 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java
@@ -49,7 +49,7 @@ public class CpUserDetailRedis {
 	 * @param userId oper_user、customer_user、customer_staff表主键
 	 * @return
 	 */
-	public TokenDto get(String app, String client, String userId) {
+	public <T> T get(String app, String client, String userId, Class<T> clz) {
 		String key = RedisKeys.getCpUserKey(app,client,userId);
 
 		Map<String, Object> map = redisUtils.hGetAll(key);
@@ -58,9 +58,7 @@ public class CpUserDetailRedis {
 		}
 
 		//map to bean
-		TokenDto user = BeanUtil.mapToBean(map, TokenDto.class, true);
-
-		return user;
+		return BeanUtil.mapToBean(map, clz, true);
 	}
 
 	/**
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
index c4687b2ea6..ba348745d9 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpAuthGatewayFilterFactory.java
@@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.BaseTokenDto;
+import com.epmet.commons.tools.security.dto.GovTokenDto;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
@@ -93,7 +94,15 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 			}
 			try {
 				BaseTokenDto baseTokenDto = getBaseTokenDto(token, jwtTokenUtils);
-				validateTokenDto(baseTokenDto, token);
+				if (AppClientConstant.APP_RESI.equals(baseTokenDto.getApp())) {
+					// 居民端
+					TokenDto resiTokenDto = getLoginUserInfoByToken(token, jwtTokenUtils, cpUserDetailRedis, TokenDto.class);
+					validateTokenDto(resiTokenDto, token);
+				} else if (AppClientConstant.APP_GOV.equals(baseTokenDto.getApp())) {
+					// 政府端
+					GovTokenDto govTokenDto = getLoginUserInfoByToken(token, jwtTokenUtils, cpUserDetailRedis, GovTokenDto.class);
+					validateTokenDto(govTokenDto, token);
+				}
 
 				//当前登录用户userId，添加到header中
 				String redisKey = baseTokenDto.getApp() + "-" + baseTokenDto.getClient() + "-" + baseTokenDto.getUserId();
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java
index a2af608232..d268e02708 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java
@@ -29,8 +29,7 @@ public interface UserTokenFilter {
     default <T> T getLoginUserInfoByToken(String token, JwtTokenUtils jwtTokenUtils, CpUserDetailRedis cpUserDetailRedis, Class<T> clz) {
         BaseTokenDto baseTokenDto = getBaseTokenDto(token, jwtTokenUtils);
         //查询Redis
-        T tokenDto = (T)cpUserDetailRedis.get(baseTokenDto.getApp(), baseTokenDto.getClient(), baseTokenDto.getUserId());
-        return tokenDto;
+        return cpUserDetailRedis.get(baseTokenDto.getApp(), baseTokenDto.getClient(), baseTokenDto.getUserId(), clz);
     }
 
 }