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

---
 dsBase/pom.xml                                |  6 +++
 dsRes/pom.xml                                 |  6 +++
 .../main/java/com/dsideal/Config/PropKit.java | 37 ---------------
 .../java/com/dsideal/Config/YamlProp.java     | 47 -------------------
 dsUtils/pom.xml                               | 14 +++---
 .../main/java/com/dsideal/Config/PropKit.java |  0
 .../java/com/dsideal/Config/YamlProp.java     |  0
 7 files changed, 19 insertions(+), 91 deletions(-)
 delete mode 100644 dsRes/src/main/java/com/dsideal/Config/PropKit.java
 delete mode 100644 dsRes/src/main/java/com/dsideal/Config/YamlProp.java
 rename {dsBase => dsUtils}/src/main/java/com/dsideal/Config/PropKit.java (100%)
 rename {dsBase => dsUtils}/src/main/java/com/dsideal/Config/YamlProp.java (100%)

diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 0aafda48..31dcdb41 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -211,6 +211,12 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.dsideal</groupId>
+            <artifactId>dsUtils</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/dsRes/pom.xml b/dsRes/pom.xml
index 9ec781c0..fb02b427 100644
--- a/dsRes/pom.xml
+++ b/dsRes/pom.xml
@@ -205,6 +205,12 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.dsideal</groupId>
+            <artifactId>dsUtils</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>dsRes</finalName>
diff --git a/dsRes/src/main/java/com/dsideal/Config/PropKit.java b/dsRes/src/main/java/com/dsideal/Config/PropKit.java
deleted file mode 100644
index 4757450b..00000000
--- a/dsRes/src/main/java/com/dsideal/Config/PropKit.java
+++ /dev/null
@@ -1,37 +0,0 @@
-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/Config/YamlProp.java b/dsRes/src/main/java/com/dsideal/Config/YamlProp.java
deleted file mode 100644
index b41f1004..00000000
--- a/dsRes/src/main/java/com/dsideal/Config/YamlProp.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dsideal.Config;
-
-import com.jfinal.kit.Prop;
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-
-public class YamlProp extends Prop {
-    public YamlProp(String yamlFile) {
-        setYaml(yamlFile);
-    }
-
-    private void setYaml(String yamlFile) {
-        LinkedHashMap map = null;
-        Properties properties = new Properties();
-        InputStream in;
-        try {
-            Yaml yaml = new Yaml();
-            in = YamlProp.class.getClassLoader().getResourceAsStream(yamlFile);
-            map = yaml.loadAs(in, LinkedHashMap.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        setProperties(properties, map, "");
-        this.properties = properties;
-    }
-
-    private static void setProperties(Properties properties, Map map, String prefix) {
-        for (Object key : map.keySet()) {
-            Object value = map.get(key);
-            if (key == null) {
-                continue;
-            }
-            if (value instanceof Map) {
-                setProperties(properties, (Map) value, prefix + key + ".");
-            } else {
-                if (value == null) {
-                    continue;
-                }
-                properties.setProperty(prefix + key, value.toString());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/dsUtils/pom.xml b/dsUtils/pom.xml
index 242eaa9c..eac44e8e 100644
--- a/dsUtils/pom.xml
+++ b/dsUtils/pom.xml
@@ -10,12 +10,7 @@
         <artifactId>dsProject</artifactId>
         <version>1.0</version>
     </parent>
-    <!--使用jdk8进行编译-->
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
+
 
     <dependencies>
         <!--jfinal主框架-->
@@ -36,7 +31,12 @@
             <artifactId>cos</artifactId>
             <version>${jfinal-cos.version}</version>
         </dependency>
-
+        <!-- YAML处理 -->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>${snakeyaml.version}</version>
+        </dependency>
         <dependency>
             <groupId>cn.smallbun.screw</groupId>
             <artifactId>screw-core</artifactId>
diff --git a/dsBase/src/main/java/com/dsideal/Config/PropKit.java b/dsUtils/src/main/java/com/dsideal/Config/PropKit.java
similarity index 100%
rename from dsBase/src/main/java/com/dsideal/Config/PropKit.java
rename to dsUtils/src/main/java/com/dsideal/Config/PropKit.java
diff --git a/dsBase/src/main/java/com/dsideal/Config/YamlProp.java b/dsUtils/src/main/java/com/dsideal/Config/YamlProp.java
similarity index 100%
rename from dsBase/src/main/java/com/dsideal/Config/YamlProp.java
rename to dsUtils/src/main/java/com/dsideal/Config/YamlProp.java