From ff527561d9ab7f279d7e183c18b307b4d763210e Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 9 Aug 2023 23:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90auth=E3=80=91?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4auth=E6=A8=A1=E5=9D=97=E7=9A=84=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/api/expander/AuthConfigExpander.java | 30 -------------------
 .../api/loginuser/CommonLoginUserUtil.java    |  6 ++--
 .../V8.0.0_20230809_2309__remove_config.sql   |  3 ++
 3 files changed, 6 insertions(+), 33 deletions(-)
 create mode 100644 kernel-d-auth/auth-spring-boot-starter/src/main/resources/db/migration/mysql/V8.0.0_20230809_2309__remove_config.sql

diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java
index 81453a3ac..673456e8f 100644
--- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java
+++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/expander/AuthConfigExpander.java
@@ -114,36 +114,6 @@ public class AuthConfigExpander {
         return ConfigContext.me().getSysConfigValueWithDefault("SYS_SINGLE_ACCOUNT_LOGIN_FLAG", Boolean.class, false);
     }
 
-    /**
-     * 获取携带token的header头的名称
-     *
-     * @author fengshuonan
-     * @since 2020/10/22 14:11
-     */
-    public static String getAuthTokenHeaderName() {
-        return ConfigContext.me().getSysConfigValueWithDefault("SYS_AUTH_HEADER_NAME", String.class, DEFAULT_AUTH_HEADER_NAME);
-    }
-
-    /**
-     * 获取携带token的param传参的名称
-     *
-     * @author fengshuonan
-     * @since 2020/10/22 14:11
-     */
-    public static String getAuthTokenParamName() {
-        return ConfigContext.me().getSysConfigValueWithDefault("SYS_AUTH_PARAM_NAME", String.class, DEFAULT_AUTH_PARAM_NAME);
-    }
-
-    /**
-     * 会话保存在cookie中时，cooke的name
-     *
-     * @author fengshuonan
-     * @since 2020/12/27 13:18
-     */
-    public static String getSessionCookieName() {
-        return ConfigContext.me().getSysConfigValueWithDefault("SYS_SESSION_COOKIE_NAME", String.class, DEFAULT_AUTH_HEADER_NAME);
-    }
-
     /**
      * 默认解析jwt的秘钥（用于解析sso传过来的token）
      *
diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/loginuser/CommonLoginUserUtil.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/loginuser/CommonLoginUserUtil.java
index 0eb5ffe2c..900ab493c 100644
--- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/loginuser/CommonLoginUserUtil.java
+++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/loginuser/CommonLoginUserUtil.java
@@ -1,9 +1,9 @@
 package cn.stylefeng.roses.kernel.auth.api.loginuser;
 
 import cn.hutool.core.util.StrUtil;
+import cn.stylefeng.roses.kernel.auth.api.constants.AuthConstants;
 import cn.stylefeng.roses.kernel.auth.api.exception.AuthException;
 import cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum;
-import cn.stylefeng.roses.kernel.auth.api.expander.AuthConfigExpander;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 
 import javax.servlet.http.HttpServletRequest;
@@ -28,7 +28,7 @@ public class CommonLoginUserUtil {
         HttpServletRequest request = HttpServletUtil.getRequest();
 
         // 1. 优先从param参数中获取token
-        String parameterToken = request.getParameter(AuthConfigExpander.getAuthTokenParamName());
+        String parameterToken = request.getParameter(AuthConstants.DEFAULT_AUTH_PARAM_NAME);
 
         // 不为空则直接返回param的token
         if (StrUtil.isNotBlank(parameterToken)) {
@@ -36,7 +36,7 @@ public class CommonLoginUserUtil {
         }
 
         // 2. 从header中获取token
-        String authToken = request.getHeader(AuthConfigExpander.getAuthTokenHeaderName());
+        String authToken = request.getHeader(AuthConstants.DEFAULT_AUTH_HEADER_NAME);
         if (StrUtil.isNotBlank(authToken)) {
             return authToken;
         }
diff --git a/kernel-d-auth/auth-spring-boot-starter/src/main/resources/db/migration/mysql/V8.0.0_20230809_2309__remove_config.sql b/kernel-d-auth/auth-spring-boot-starter/src/main/resources/db/migration/mysql/V8.0.0_20230809_2309__remove_config.sql
new file mode 100644
index 000000000..3461b1244
--- /dev/null
+++ b/kernel-d-auth/auth-spring-boot-starter/src/main/resources/db/migration/mysql/V8.0.0_20230809_2309__remove_config.sql
@@ -0,0 +1,3 @@
+delete from sys_config where config_code = 'SYS_AUTH_PARAM_NAME';
+delete from sys_config where config_code = 'SYS_AUTH_HEADER_NAME';
+delete from sys_config where config_code = 'SYS_SESSION_COOKIE_NAME';
\ No newline at end of file