'commit'

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();
     }

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"),
+        DruidPlugin plugin = new DruidPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
-                BaseApplication.PropKit.get("mysql.password").trim(), BaseApplication.PropKit.get("mysql.driverClassName"));
+                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
         plugin.start();
         // 配置ActiveRecord插件
         ActiveRecordPlugin arp = new ActiveRecordPlugin("master", plugin);

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));

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"),
+        DruidPlugin plugin = new DruidPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
-                BaseApplication.PropKit.get("mysql.password").trim(), BaseApplication.PropKit.get("mysql.driverClassName"));
+                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
         plugin.start();
         return plugin.getDataSource();
     }

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);
+    }
+}

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;

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;

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;

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;