From be952c582727dfa7f180ce0e1ea21dca566ec7f4 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 19 Dec 2020 18:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90config=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/config/modular/listener/ConfigInitListener.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 32d491edf..924b010d3 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
@@ -10,6 +10,7 @@ import cn.stylefeng.roses.kernel.config.api.context.ConfigContext;
 import cn.stylefeng.roses.kernel.config.api.exception.ConfigException;
 import cn.stylefeng.roses.kernel.config.api.exception.enums.ConfigExceptionEnum;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
+import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.event.ApplicationContextInitializedEvent;
 import org.springframework.context.ApplicationListener;
@@ -37,7 +38,7 @@ import static cn.stylefeng.roses.kernel.config.api.exception.enums.ConfigExcepti
 @Slf4j
 public class ConfigInitListener implements ApplicationListener<ApplicationContextInitializedEvent>, Ordered {
 
-    private static final String CONFIG_LIST_SQL = "select code,value from sys_config where status = ?";
+    private static final String CONFIG_LIST_SQL = "select config_code, config_value from sys_config where status_flag = ? and del_flag = ?";
 
     @Override
     public int getOrder() {
@@ -75,11 +76,11 @@ public class ConfigInitListener implements ApplicationListener<ApplicationContex
             conn = DriverManager.getConnection(dataSourceUrl, dataSourceUsername, dataSourcePassword);
 
             // 获取sys_config表的数据
-            List<Entity> entityList = SqlExecutor.query(conn, CONFIG_LIST_SQL, new EntityListHandler(), StatusEnum.ENABLE.getCode());
+            List<Entity> entityList = SqlExecutor.query(conn, CONFIG_LIST_SQL, new EntityListHandler(), StatusEnum.ENABLE.getCode(), YesOrNotEnum.N.getCode());
 
             // 将查询到的参数配置添加到缓存
             if (ObjectUtil.isNotEmpty(entityList)) {
-                entityList.forEach(sysConfig -> ConfigContext.me().putConfig(sysConfig.getStr("code"), sysConfig.getStr("value")));
+                entityList.forEach(sysConfig -> ConfigContext.me().putConfig(sysConfig.getStr("config_code"), sysConfig.getStr("config_value")));
             }
         } catch (ClassNotFoundException e) {
             log.error(">>> 初始化系统配置表失败，找不到com.mysql.cj.jdbc.Driver类", e);