'commit'

dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java

@@ -23,7 +23,7 @@ import com.jfinal.kit.Prop;
 import com.dsideal.dsBase.Plugin.YamlProp;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
-import com.jfinal.plugin.hikaricp.HikariCpPlugin;
+import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.redis.RedisPlugin;
 import com.jfinal.server.undertow.UndertowServer;
 import com.jfinal.template.Engine;
@@ -112,11 +112,11 @@ public class BaseApplication extends JFinalConfig {
      */
     @Override
     public void configPlugin(Plugins me) {
-        HikariCpPlugin hp = new HikariCpPlugin(PropKit.get("postgresql.jdbcUrl"),
+        DruidPlugin druid = new DruidPlugin(PropKit.get("jdbcUrl"),
-                PropKit.get("postgresql.user"), PropKit.get("postgresql.password"),
+                PropKit.get("user"), PropKit.get("password"),
-                PropKit.get("postgresql.driverClassName"));
+                PropKit.get("driverClassName"));
-        me.add(hp);
+        me.add(druid);
-        ActiveRecordPlugin arp = new ActiveRecordPlugin(hp);
+        ActiveRecordPlugin arp = new ActiveRecordPlugin(druid);
         arp.setDialect(new PostgreSqlDialect());
         String basePath = Objects.requireNonNull(BaseApplication.class.getClassLoader().getResource(".")).getPath();
         File sqlDir = new File(basePath + "/Sql");

dsBase/src/main/resources/application_dev.yaml

@@ -1,5 +1,5 @@
 # 数据库信息
-postgresql:
+mysql:
   driverClassName: com.mysql.cj.jdbc.Driver
   user: ylt
   password: Ycharge666

dsRes/src/main/java/com/dsideal/resource/ResApplication.java

@@ -11,7 +11,7 @@ import com.jfinal.config.*;
 import com.jfinal.kit.Prop;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
-import com.jfinal.plugin.hikaricp.HikariCpPlugin;
+import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.plugin.redis.RedisPlugin;
 import com.jfinal.server.undertow.UndertowServer;
 import com.jfinal.template.Engine;
@@ -73,8 +73,8 @@ public class ResApplication extends JFinalConfig {
 
     @Override
     public void configPlugin(Plugins me) {
-        HikariCpPlugin plugin = new HikariCpPlugin(PropKit.get("postgresql.jdbcUrl"), PropKit.get("postgresql.user"),
+        DruidPlugin plugin = new DruidPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
-                PropKit.get("postgresql.password").trim(), PropKit.get("postgresql.driverClassName"));
+                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
         me.add(plugin);
 
         // 配置ActiveRecord插件

dsRes/src/main/resources/application_dev.yaml

@@ -4,11 +4,11 @@ uploadTempPath: c:/Windows/Temp
 CookieMd5SingPwd: DsideaL4r5t6y7u
 
 # 数据库信息
-postgresql:
+mysql:
-  driverClassName: org.postgresql.Driver
+  driverClassName: com.mysql.cj.jdbc.Driver
-  user: postgres
+  user: ylt
-  password: DsideaL147258369
+  password: Ycharge666
-  jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true
+  jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true
 
 # redis
 redis:

dsRes/src/main/resources/application_pro.yaml

@@ -4,11 +4,11 @@ uploadTempPath: /tmp
 CookieMd5SingPwd: DsideaL4r5t6y7u
 
 # 数据库信息
-postgresql:
+mysql:
-  driverClassName: org.postgresql.Driver
+  driverClassName: com.mysql.cj.jdbc.Driver
-  user: postgres
+  user: ylt
-  password: DsideaL147258369
+  password: Ycharge666
-  jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true
+  jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true
 
 # redis
 redis: