From 23ebae6d3400d4ea9a35533d5553ab9c32b99aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E9=A3=9E=E4=BA=91?= <1941783199@qq.com>
Date: Mon, 28 Sep 2020 09:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/daqing/financial/hrauth/util/JwtUtil.java     |  6 +++---
 .../financial/gateway/config/ApiGlobalFilter.java     | 11 +++++++----
 dq-govern-gateway/src/main/resources/application.yml  |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/JwtUtil.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/JwtUtil.java
index d38eac5d..a727451a 100644
--- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/JwtUtil.java
+++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/JwtUtil.java
@@ -24,8 +24,8 @@ public class JwtUtil {
      * @param timeout; 单位是秒
      */
     public static String createJwtToken(Long userId, long timeout) {
-        String token = Md5Util.md5(userId+timeout+"dq");
-        RedisUtil.setEx("dq:token:"+userId, token, timeout);
+        String token = Md5Util.md5("dq"+userId+timeout+System.currentTimeMillis());
+        RedisUtil.setEx("dq:token:"+token, String.valueOf(userId), timeout);
         return token;
         /*return JWT.create()
             .withClaim("member", userId)
@@ -55,7 +55,7 @@ public class JwtUtil {
     }*/
 
     public static String getRedisKey(Long userId, String token) {
-        return String.format("dq:token:%d:%s", userId, token);
+        return String.format("dq:token:"+token, token, String.valueOf(userId));
     }
 
     public static void putTokenToRedis(Long userId, String token, long times) {
diff --git a/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java b/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java
index 06e5a291..27639e65 100644
--- a/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java
+++ b/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java
@@ -2,6 +2,7 @@ package com.daqing.financial.gateway.config;
 
 import com.alibaba.fastjson.JSONObject;
 import com.daqing.financial.gateway.util.JwtUtil;
+import com.daqing.financial.gateway.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
@@ -57,10 +58,11 @@ public class ApiGlobalFilter implements GlobalFilter, Ordered {
                 //有数据
             }else {
                 //校验token
-                Long userId = verifyJWT(token);
-                if (userId == null){
+                //Long userId = verifyJWT(token);
+                String userId = RedisUtil.get("dq:token:"+token);
+                if (userId == null || "".equals(userId)){
                     JSONObject message = new JSONObject();
-                    message.put("message", "请重新登录");
+                    message.put("message", "登录已失效,请重新登录");
                     message.put("code", "401");
                     byte[] bits = message.toString().getBytes(StandardCharsets.UTF_8);
                     DataBuffer buffer = response.bufferFactory().wrap(bits);
@@ -69,7 +71,7 @@ public class ApiGlobalFilter implements GlobalFilter, Ordered {
                     return response.writeWith(Mono.just(buffer));
                 }
                 //将现在的request，添加当前身份
-                ServerHttpRequest mutableReq = exchange.getRequest().mutate().header("Authorization-UserId", String.valueOf(userId)).build();
+                ServerHttpRequest mutableReq = exchange.getRequest().mutate().header("Authorization-UserId", userId).build();
                 ServerWebExchange mutableExchange = exchange.mutate().request(mutableReq).build();
                 return chain.filter(mutableExchange);
             }
@@ -83,6 +85,7 @@ public class ApiGlobalFilter implements GlobalFilter, Ordered {
      * @return userPhone
      */
     private Long verifyJWT(String token){
+        String id = RedisUtil.get("dq:token:"+token);
         return JwtUtil.verifyToken(token);
     }
 
diff --git a/dq-govern-gateway/src/main/resources/application.yml b/dq-govern-gateway/src/main/resources/application.yml
index 865b65c5..6ea9f3a1 100644
--- a/dq-govern-gateway/src/main/resources/application.yml
+++ b/dq-govern-gateway/src/main/resources/application.yml
@@ -17,7 +17,7 @@ spring:
           predicates:
             - Path=/api/**
           filters:
-            - RewritePath=/api/(?<segment>.*),/ $\{segment}
+            - RewritePath=/api/(?<segment>.*), /$\{segment}
         - id: hrms_auth_route
           uri: http://localhost:9000/dq-financial-hrms-auth #lb://dq-financial-hrms-auth
           predicates: