diff --git a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
index 922cda62..afb55a14 100644
--- a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
+++ b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
@@ -109,7 +109,9 @@ public class BaseApplication extends JFinalConfig {
      */
     @Override
     public void configPlugin(Plugins me) {
-        HikariCpPlugin hp = new HikariCpPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"), PropKit.get("password").trim(), PropKit.get("driverClassName"));
+        HikariCpPlugin hp = new HikariCpPlugin(PropKit.get("postgresql.jdbcUrl"),
+                PropKit.get("postgresql.user"), PropKit.get("postgresql.password"),
+                PropKit.get("postgresql.driverClassName"));
         me.add(hp);
         ActiveRecordPlugin arp = new ActiveRecordPlugin(hp);
         arp.setDialect(new PostgreSqlDialect());
@@ -122,7 +124,8 @@ public class BaseApplication extends JFinalConfig {
         }
         me.add(arp);
         //加载Redis插件
-        RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10000);
+        RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis.ip"),
+                PropKit.getInt("redis.port"), 10000);
         me.add(redis);
     }
 
diff --git a/dsBase/src/main/resources/application.properties b/dsBase/src/main/resources/application.properties
deleted file mode 100644
index 4c068d97..00000000
--- a/dsBase/src/main/resources/application.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# 数据库信息
-driverClassName=org.postgresql.Driver
-user=postgres
-password=DsideaL147258369
-jdbcUrl=jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true
-
-# redis
-redis_ip=10.10.14.14
-redis_port=18890
-
-# JWT
-SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
-
-# 首页
-first_page=/login.html
-
-
-#  导出excel 的模板配置路径
-excelExportTemplatePathSuffix=/ExcelExportTemplate/
-#  导入excel 的模板配置路径
-ExcelImportTemplatePathSuffix=/ExcelImportTemplate/
-
-# 自定义日志文件的位置
-logPath=d:/Logs/dsBase.log
\ No newline at end of file
diff --git a/dsBase/src/main/resources/application_dev.yaml b/dsBase/src/main/resources/application_dev.yaml
new file mode 100644
index 00000000..6e9f2829
--- /dev/null
+++ b/dsBase/src/main/resources/application_dev.yaml
@@ -0,0 +1,24 @@
+# 数据库信息
+postgresql:
+  driverClassName: org.postgresql.Driver
+  user: postgres
+  password: DsideaL147258369
+  jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true
+
+# redis
+redis:
+  ip: 10.10.14.14
+  port: 18890
+
+# JWT
+jwt:
+  SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
+
+# 首页
+first_page: /login.html
+
+excel:
+  #  导出excel 的模板配置路径
+  excelExportTemplatePathSuffix: /ExcelExportTemplate/
+  #  导入excel 的模板配置路径
+  ExcelImportTemplatePathSuffix: /ExcelImportTemplate/
diff --git a/dsBase/src/main/resources/application_pro.yaml b/dsBase/src/main/resources/application_pro.yaml
new file mode 100644
index 00000000..6e9f2829
--- /dev/null
+++ b/dsBase/src/main/resources/application_pro.yaml
@@ -0,0 +1,24 @@
+# 数据库信息
+postgresql:
+  driverClassName: org.postgresql.Driver
+  user: postgres
+  password: DsideaL147258369
+  jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true
+
+# redis
+redis:
+  ip: 10.10.14.14
+  port: 18890
+
+# JWT
+jwt:
+  SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
+
+# 首页
+first_page: /login.html
+
+excel:
+  #  导出excel 的模板配置路径
+  excelExportTemplatePathSuffix: /ExcelExportTemplate/
+  #  导入excel 的模板配置路径
+  ExcelImportTemplatePathSuffix: /ExcelImportTemplate/