From 9c512951ffd34a1fdb8052bda9d2fa92360a7233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sat, 21 Sep 2024 15:26:13 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/base/Interceptor/IsLoginInterceptor.java   | 2 +-
 .../base/LoginPerson/Controller/LoginPersonController.java | 2 +-
 dsBase/src/main/resource/application_dev.yaml              | 5 ++---
 dsBase/src/main/resource/application_pro.yaml              | 2 ++
 .../main/java/com/dsideal/gw/Handler/RouterHandler.java    | 2 +-
 dsGw/src/main/resources/application_dev.yaml               | 6 +++---
 dsGw/src/main/resources/application_pro.yaml               | 7 ++-----
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java b/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java
index 462d1f55..232418fd 100644
--- a/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java
+++ b/dsBase/src/main/java/com/dsideal/base/Interceptor/IsLoginInterceptor.java
@@ -45,7 +45,7 @@ public class IsLoginInterceptor implements Interceptor {
             loginMap.put("person_id", con.getCookie("person_id"));
             loginMap.put("bureau_id", con.getCookie("bureau_id"));
             //2、根据cookie中获取到的map，得到一个 share
-            String token = CommonUtil.Sign(loginMap, BaseApplication.PropKit.get("jwt.CookieMd5SingPwd"));
+            String token = CommonUtil.Sign(loginMap, BaseApplication.PropKit.get("CookieMd5SingPwd"));
             //3、与cookie中的token进行对比
             if (token.equals(con.getCookie("token"))) {
                 isTrue = true;
diff --git a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
index 87e82f16..deb0983b 100644
--- a/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
+++ b/dsBase/src/main/java/com/dsideal/base/LoginPerson/Controller/LoginPersonController.java
@@ -97,7 +97,7 @@ public class LoginPersonController extends Controller {
         _map.put("person_id", loginMap.get("person_id"));
         _map.put("bureau_id", loginMap.get("bureau_id"));
 
-        String token = CommonUtil.Sign(_map, BaseApplication.PropKit.get("jwt.CookieMd5SingPwd"));
+        String token = CommonUtil.Sign(_map, BaseApplication.PropKit.get("CookieMd5SingPwd"));
         CookieUtil.set(getResponse(), "identity_id", loginMap.get("identity_id").toString(), false, true);
         CookieUtil.set(getResponse(), "person_id", loginMap.get("person_id").toString(), false, true);
         CookieUtil.set(getResponse(), "bureau_id", loginMap.get("bureau_id").toString(), false, true);
diff --git a/dsBase/src/main/resource/application_dev.yaml b/dsBase/src/main/resource/application_dev.yaml
index 746c9655..7673bd7f 100644
--- a/dsBase/src/main/resource/application_dev.yaml
+++ b/dsBase/src/main/resource/application_dev.yaml
@@ -2,6 +2,8 @@
 uploadTempPath: c:/Windows/Temp
 # JWT
 SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
+# 生成Token的密码
+CookieMd5SingPwd: DsideaL4r5t6y7u
 
 mysql:
   # 数据库信息
@@ -17,9 +19,6 @@ redis:
   password:
 
 # ==============================================================
-jwt:
-  # 生成Token的密码
-  CookieMd5SingPwd: DsideaL4r5t6y7u
 
 excel:
   #  导出excel 的模板配置路径
diff --git a/dsBase/src/main/resource/application_pro.yaml b/dsBase/src/main/resource/application_pro.yaml
index 8bcd10b9..0af87d49 100644
--- a/dsBase/src/main/resource/application_pro.yaml
+++ b/dsBase/src/main/resource/application_pro.yaml
@@ -2,6 +2,8 @@
 uploadTempPath: /tmp
 # JWT
 SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
+# 生成Token的密码
+CookieMd5SingPwd: DsideaL4r5t6y7u
 
 mysql:
   # 数据库信息
diff --git a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java
index 131c084d..139bfbf1 100644
--- a/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java
+++ b/dsGw/src/main/java/com/dsideal/gw/Handler/RouterHandler.java
@@ -133,7 +133,7 @@ public class RouterHandler extends Handler {
                 loginMap.put("identity_id", identity_id);
                 loginMap.put("person_id", person_id);
                 loginMap.put("bureau_id", bureau_id);
-                String cookie_token = CommonUtil.Sign(loginMap, GwApplication.PropKit.get("jwt.CookieMd5SingPwd"));
+                String cookie_token = CommonUtil.Sign(loginMap, GwApplication.PropKit.get("CookieMd5SingPwd"));
                 if (!token.equals(cookie_token)) {//根据Cookie中的Token，和计算出来的Token是否一致
                     canPass = false;
                 }
diff --git a/dsGw/src/main/resources/application_dev.yaml b/dsGw/src/main/resources/application_dev.yaml
index 47c05879..e621d785 100644
--- a/dsGw/src/main/resources/application_dev.yaml
+++ b/dsGw/src/main/resources/application_dev.yaml
@@ -3,6 +3,8 @@ uploadTempPath: c:/Windows/Temp
 
 # JWT
 SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
+# 生成Token的密码
+CookieMd5SingPwd: DsideaL4r5t6y7u
 
 # 路由
 route:
@@ -13,9 +15,7 @@ route:
   dsResource:
     url: http://dsResouce:8002
 
-jwt:
-  # 生成Token的密码
-  CookieMd5SingPwd: DsideaL4r5t6y7u
+
 
 # 白名单
 whitelist:
diff --git a/dsGw/src/main/resources/application_pro.yaml b/dsGw/src/main/resources/application_pro.yaml
index 9714b581..e5c95df8 100644
--- a/dsGw/src/main/resources/application_pro.yaml
+++ b/dsGw/src/main/resources/application_pro.yaml
@@ -2,6 +2,8 @@
 uploadTempPath: /tmp
 # JWT
 SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
+# 生成Token的密码
+CookieMd5SingPwd: DsideaL4r5t6y7u
 
 # 路由
 route:
@@ -12,11 +14,6 @@ route:
   dsResource:
     url: http://ds-resouce:8002
 
-
-jwt:
-  # 生成Token的密码
-  CookieMd5SingPwd: DsideaL4r5t6y7u
-
 # 白名单
 whitelist:
   # 全局变量获取