From bdd9b218a1e28cc70ad51f97318699ccba93a97e Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 23 May 2025 14:50:03 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/Base/BaseApplication.java     | 25 +------------
 .../java/com/dsideal/Base/Util/DbInit.java    |  5 ++-
 .../java/com/dsideal/Base/Util/JwtUtil.java   |  4 +-
 .../dsideal/Base/_JFinalDemoGenerator.java    |  5 ++-
 .../main/java/com/dsideal/Config/PropKit.java | 37 +++++++++++++++++++
 .../java/com/dsideal/Config}/YamlProp.java    |  2 +-
 .../main/java/com/dsideal/Config/PropKit.java |  1 -
 .../java/com/dsideal/Config}/YamlProp.java    |  2 +-
 .../java/com/dsideal/Res/Util/MinioUtils.java |  1 -
 9 files changed, 49 insertions(+), 33 deletions(-)
 create mode 100644 dsBase/src/main/java/com/dsideal/Config/PropKit.java
 rename {dsRes/src/main/java/com/dsideal/Res/Plugin => dsBase/src/main/java/com/dsideal/Config}/YamlProp.java (94%)
 rename {dsBase/src/main/java/com/dsideal/Base/Plugin => dsRes/src/main/java/com/dsideal/Config}/YamlProp.java (94%)

diff --git a/dsBase/src/main/java/com/dsideal/Base/BaseApplication.java b/dsBase/src/main/java/com/dsideal/Base/BaseApplication.java
index 3f8339ed..5cb2bddb 100644
--- a/dsBase/src/main/java/com/dsideal/Base/BaseApplication.java
+++ b/dsBase/src/main/java/com/dsideal/Base/BaseApplication.java
@@ -18,9 +18,10 @@ import com.dsideal.Base.Teacher.Controller.TeacherController;
 import com.dsideal.Base.TeacherYd.Controller.TeacherYdController;
 import com.dsideal.Base.Util.LogBackLogFactory;
 import com.dsideal.Base.Util.PkUtil;
+import com.dsideal.Config.PropKit;
 import com.jfinal.config.*;
 import com.jfinal.kit.Prop;
-import com.dsideal.Base.Plugin.YamlProp;
+import com.dsideal.Config.YamlProp;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
@@ -37,28 +38,6 @@ import java.util.Objects;
 public class BaseApplication extends JFinalConfig {
     private static final Logger logger = LoggerFactory.getLogger(BaseApplication.class);
 
-    static {
-        //加载配置文件
-        String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
-        PropKit = new YamlProp(configFile);
-        System.out.println("当前环境: " + getEnvPrefix());
-    }
-    /**
-     * 功能：获取是否为开发环境
-     *
-     * @return
-     */
-    public static String getEnvPrefix() {
-        String myEnvVar = System.getenv("WORKING_ENV");
-        if (myEnvVar == null) {
-            myEnvVar = "dev";
-        }
-        return myEnvVar;
-    }
-
-    public static Prop PropKit;
-
-
     public static void main(String[] args) {
         UndertowServer.create(BaseApplication.class, "undertow.properties").start();
     }
diff --git a/dsBase/src/main/java/com/dsideal/Base/Util/DbInit.java b/dsBase/src/main/java/com/dsideal/Base/Util/DbInit.java
index 8d82cafa..d818f831 100644
--- a/dsBase/src/main/java/com/dsideal/Base/Util/DbInit.java
+++ b/dsBase/src/main/java/com/dsideal/Base/Util/DbInit.java
@@ -2,6 +2,7 @@ package com.dsideal.Base.Util;
 
 import com.dsideal.Base.BaseApplication;
 import com.dsideal.Base.Model._MappingKit;
+import com.dsideal.Config.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
@@ -12,8 +13,8 @@ public class DbInit {
 
     public static void Start(){
         //加载数据库
-        DruidPlugin plugin = new DruidPlugin(BaseApplication.PropKit.get("mysql.jdbcUrl"), BaseApplication.PropKit.get("mysql.user"),
-                BaseApplication.PropKit.get("mysql.password").trim(), BaseApplication.PropKit.get("mysql.driverClassName"));
+        DruidPlugin plugin = new DruidPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
+                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
         plugin.start();
         // 配置ActiveRecord插件
         ActiveRecordPlugin arp = new ActiveRecordPlugin("master", plugin);
diff --git a/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java b/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java
index 070975af..2afeee06 100644
--- a/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java
+++ b/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java
@@ -1,6 +1,6 @@
 package com.dsideal.Base.Util;
 
-import com.dsideal.Base.BaseApplication;
+import com.dsideal.Config.PropKit;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -16,7 +16,7 @@ import java.util.Map;
 
 public class JwtUtil {
     public static final String AUTHORIZATION_STARTER = "Bearer ";
-    public static final String SECRET = BaseApplication.PropKit.get("jwt.SECRET");
+    public static final String SECRET = PropKit.get("jwt.SECRET");
 
     // 生成安全的密钥
     private static final SecretKey key = Keys.hmacShaKeyFor(SECRET.getBytes(StandardCharsets.UTF_8));
diff --git a/dsBase/src/main/java/com/dsideal/Base/_JFinalDemoGenerator.java b/dsBase/src/main/java/com/dsideal/Base/_JFinalDemoGenerator.java
index 746ed11f..f4398d95 100644
--- a/dsBase/src/main/java/com/dsideal/Base/_JFinalDemoGenerator.java
+++ b/dsBase/src/main/java/com/dsideal/Base/_JFinalDemoGenerator.java
@@ -1,5 +1,6 @@
 package com.dsideal.Base;
 
+import com.dsideal.Config.PropKit;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.activerecord.generator.Generator;
 import com.jfinal.plugin.activerecord.generator.TypeMapping;
@@ -19,8 +20,8 @@ import java.util.Date;
 public class _JFinalDemoGenerator {
 
     public static DataSource getDataSource() {
-        DruidPlugin plugin = new DruidPlugin(BaseApplication.PropKit.get("mysql.jdbcUrl"), BaseApplication.PropKit.get("mysql.user"),
-                BaseApplication.PropKit.get("mysql.password").trim(), BaseApplication.PropKit.get("mysql.driverClassName"));
+        DruidPlugin plugin = new DruidPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
+                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
         plugin.start();
         return plugin.getDataSource();
     }
diff --git a/dsBase/src/main/java/com/dsideal/Config/PropKit.java b/dsBase/src/main/java/com/dsideal/Config/PropKit.java
new file mode 100644
index 00000000..4757450b
--- /dev/null
+++ b/dsBase/src/main/java/com/dsideal/Config/PropKit.java
@@ -0,0 +1,37 @@
+package com.dsideal.Config;
+
+import com.jfinal.kit.Prop;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PropKit {
+    private static final Logger logger = LoggerFactory.getLogger(PropKit.class);
+
+    public static String getEnvPrefix() {
+        String myEnvVar = System.getenv("WORKING_ENV");
+        if (myEnvVar == null) {
+            myEnvVar = "dev";
+        }
+        return myEnvVar;
+    }
+
+    public static Prop prop;
+    public static String configFile;
+
+    static {
+        //加载配置文件
+        configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
+        prop = new YamlProp(configFile);
+    }
+
+    public static String get(String key) {
+        if (!prop.containsKey(key)) {
+            throw new RuntimeException("没有找到配置文件" + configFile + "中的键值：" + key);
+        }
+        return prop.get(key);
+    }
+
+    public static int getInt(String key) {
+        return prop.getInt(key);
+    }
+}
diff --git a/dsRes/src/main/java/com/dsideal/Res/Plugin/YamlProp.java b/dsBase/src/main/java/com/dsideal/Config/YamlProp.java
similarity index 94%
rename from dsRes/src/main/java/com/dsideal/Res/Plugin/YamlProp.java
rename to dsBase/src/main/java/com/dsideal/Config/YamlProp.java
index 6828b1fe..b41f1004 100644
--- a/dsRes/src/main/java/com/dsideal/Res/Plugin/YamlProp.java
+++ b/dsBase/src/main/java/com/dsideal/Config/YamlProp.java
@@ -1,4 +1,4 @@
-package com.dsideal.Res.Plugin;
+package com.dsideal.Config;
 
 import com.jfinal.kit.Prop;
 import org.yaml.snakeyaml.Yaml;
diff --git a/dsRes/src/main/java/com/dsideal/Config/PropKit.java b/dsRes/src/main/java/com/dsideal/Config/PropKit.java
index bb15d95e..4757450b 100644
--- a/dsRes/src/main/java/com/dsideal/Config/PropKit.java
+++ b/dsRes/src/main/java/com/dsideal/Config/PropKit.java
@@ -1,6 +1,5 @@
 package com.dsideal.Config;
 
-import com.dsideal.Res.Plugin.YamlProp;
 import com.jfinal.kit.Prop;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/dsBase/src/main/java/com/dsideal/Base/Plugin/YamlProp.java b/dsRes/src/main/java/com/dsideal/Config/YamlProp.java
similarity index 94%
rename from dsBase/src/main/java/com/dsideal/Base/Plugin/YamlProp.java
rename to dsRes/src/main/java/com/dsideal/Config/YamlProp.java
index a6bd51b0..b41f1004 100644
--- a/dsBase/src/main/java/com/dsideal/Base/Plugin/YamlProp.java
+++ b/dsRes/src/main/java/com/dsideal/Config/YamlProp.java
@@ -1,4 +1,4 @@
-package com.dsideal.Base.Plugin;
+package com.dsideal.Config;
 
 import com.jfinal.kit.Prop;
 import org.yaml.snakeyaml.Yaml;
diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java b/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java
index 221b1729..1c361923 100644
--- a/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java
+++ b/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java
@@ -2,7 +2,6 @@ package com.dsideal.Res.Util;
 
 import cn.hutool.core.io.FileUtil;
 import com.dsideal.Config.PropKit;
-import com.dsideal.Res.Plugin.YamlProp;
 import com.jfinal.kit.PathKit;
 import io.minio.GetPresignedObjectUrlArgs;
 import io.minio.MinioClient;