From ee75b5077465422de46faec89354a491cf3a8c05 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 9 May 2023 11:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E6=94=B9=E9=80=A0=E3=80=91=E3=80=90config=E3=80=91?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/rule/constants/RuleConstants.java  |  5 +++
 kernel-d-config/config-business/pom.xml       | 37 ++++++++-----------
 .../modular/listener/ConfigInitListener.java  |  2 +-
 .../service/impl/SysConfigServiceImpl.java    |  3 +-
 .../file/api/constants/FileConstants.java     |  5 ---
 .../file/api/expander/FileConfigExpander.java |  3 +-
 6 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
index 15d620be1..2dfae5e2a 100644
--- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
+++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/RuleConstants.java
@@ -102,4 +102,9 @@ public interface RuleConstants {
      */
     int DEFAULT_BATCH_INSERT_SIZE = 100;
 
+    /**
+     * 服务默认部署的环境地址，不要改这个常量，改系统配置表中的配置 SYS_SERVER_DEPLOY_HOST
+     */
+    String DEFAULT_SERVER_DEPLOY_HOST = "http://localhost:8080";
+
 }
diff --git a/kernel-d-config/config-business/pom.xml b/kernel-d-config/config-business/pom.xml
index 15b2fdb41..7f1adeb5b 100644
--- a/kernel-d-config/config-business/pom.xml
+++ b/kernel-d-config/config-business/pom.xml
@@ -17,28 +17,6 @@
 
     <dependencies>
 
-        <!--文件api-->
-        <dependency>
-            <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>file-api</artifactId>
-            <version>${roses.version}</version>
-        </dependency>
-
-        <!--系统配置表的redis的sdk-->
-        <dependency>
-            <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>config-sdk-redis</artifactId>
-            <version>${roses.version}</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!--默认系统配置表的sdk-->
-        <dependency>
-            <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>config-sdk-map</artifactId>
-            <version>${roses.version}</version>
-        </dependency>
-
         <!--资源api模块-->
         <!--用在资源控制器，资源扫描上-->
         <dependency>
@@ -55,6 +33,21 @@
             <version>${roses.version}</version>
         </dependency>
 
+        <!--系统配置表的缓存，使用redis还是map，Redis用在将系统部署在分布式环境-->
+        <!--默认使用Map，如果分布式环境，则在项目依赖中切换-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>config-sdk-map</artifactId>
+            <version>${roses.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>config-sdk-redis</artifactId>
+            <version>${roses.version}</version>
+            <optional>true</optional>
+        </dependency>
+
         <!--数据库sdk-->
         <!--数据库dao框架-->
         <dependency>
diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java
index 6428f0fa3..93c4667e8 100644
--- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java
+++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java
@@ -117,7 +117,7 @@ public class ConfigInitListener extends ContextInitializedListener implements Or
                 entityList.forEach(sysConfig -> ConfigContext.me().putConfig(sysConfig.getStr("config_code"), sysConfig.getStr("config_value")));
             }
         } catch (ClassNotFoundException e) {
-            log.error("初始化系统配置表失败，找不到{}类 : {}", driverClassName, e);
+            log.error("初始化系统配置表失败，找不到{}类 : {}", driverClassName, driverClassName);
             throw new ConfigException(ConfigExceptionEnum.CLASS_NOT_FOUND_ERROR);
         } catch (SQLException sqlException) {
             log.error("初始化系统配置表失败，执行查询语句失败", sqlException);
diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java
index 5142a88e0..86c503575 100644
--- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java
+++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/service/impl/SysConfigServiceImpl.java
@@ -46,7 +46,6 @@ import cn.stylefeng.roses.kernel.config.modular.service.SysConfigService;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
 import cn.stylefeng.roses.kernel.rule.callback.ConfigUpdateCallback;
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
@@ -267,7 +266,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         if (sysConfig != null) {
             return sysConfig.getConfigValue();
         } else {
-            return FileConstants.DEFAULT_SERVER_DEPLOY_HOST;
+            return RuleConstants.DEFAULT_SERVER_DEPLOY_HOST;
         }
     }
 
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
index 724d272e1..ef961e658 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/constants/FileConstants.java
@@ -52,11 +52,6 @@ public interface FileConstants {
      */
     String DEFAULT_BUCKET_NAME = "defaultBucket";
 
-    /**
-     * 服务默认部署的环境地址，不要改这个常量，改系统配置表中的配置 SYS_SERVER_DEPLOY_HOST
-     */
-    String DEFAULT_SERVER_DEPLOY_HOST = "http://localhost:8080";
-
     /**
      * 文件鉴权的时间，默认两小时
      */
diff --git a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/expander/FileConfigExpander.java b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/expander/FileConfigExpander.java
index c389afd9a..1c565e08e 100644
--- a/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/expander/FileConfigExpander.java
+++ b/kernel-d-file/file-api/src/main/java/cn/stylefeng/roses/kernel/file/api/expander/FileConfigExpander.java
@@ -28,6 +28,7 @@ import cn.hutool.core.util.RandomUtil;
 import cn.stylefeng.roses.kernel.config.api.context.ConfigContext;
 import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
 import cn.stylefeng.roses.kernel.file.api.pojo.props.LocalFileProperties;
+import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 
 /**
  * 文件相关的配置获取
@@ -56,7 +57,7 @@ public class FileConfigExpander {
      * @since 2020/11/29 16:13
      */
     public static String getServerDeployHost() {
-        return ConfigContext.me().getSysConfigValueWithDefault("SYS_SERVER_DEPLOY_HOST", String.class, FileConstants.DEFAULT_SERVER_DEPLOY_HOST);
+        return ConfigContext.me().getSysConfigValueWithDefault("SYS_SERVER_DEPLOY_HOST", String.class, RuleConstants.DEFAULT_SERVER_DEPLOY_HOST);
     }
 
     /**