diff --git a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java index 2b1015ff..284ab924 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java +++ b/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"), - PropKit.get("postgresql.user"), PropKit.get("postgresql.password"), - PropKit.get("postgresql.driverClassName")); - me.add(hp); - ActiveRecordPlugin arp = new ActiveRecordPlugin(hp); + DruidPlugin druid = new DruidPlugin(PropKit.get("jdbcUrl"), + PropKit.get("user"), PropKit.get("password"), + PropKit.get("driverClassName")); + me.add(druid); + ActiveRecordPlugin arp = new ActiveRecordPlugin(druid); arp.setDialect(new PostgreSqlDialect()); String basePath = Objects.requireNonNull(BaseApplication.class.getClassLoader().getResource(".")).getPath(); File sqlDir = new File(basePath + "/Sql"); diff --git a/dsBase/src/main/resources/application_dev.yaml b/dsBase/src/main/resources/application_dev.yaml index 9e7e39c1..db0f9e59 100644 --- a/dsBase/src/main/resources/application_dev.yaml +++ b/dsBase/src/main/resources/application_dev.yaml @@ -1,5 +1,5 @@ # 数据库信息 -postgresql: +mysql: driverClassName: com.mysql.cj.jdbc.Driver user: ylt password: Ycharge666 diff --git a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java index 929e58cb..53c42049 100644 --- a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java +++ b/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"), - PropKit.get("postgresql.password").trim(), PropKit.get("postgresql.driverClassName")); + DruidPlugin plugin = new DruidPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"), + PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName")); me.add(plugin); // 配置ActiveRecord插件 diff --git a/dsRes/src/main/resources/application_dev.yaml b/dsRes/src/main/resources/application_dev.yaml index 04631291..00768f55 100644 --- a/dsRes/src/main/resources/application_dev.yaml +++ b/dsRes/src/main/resources/application_dev.yaml @@ -4,11 +4,11 @@ uploadTempPath: c:/Windows/Temp CookieMd5SingPwd: DsideaL4r5t6y7u # 数据库信息 -postgresql: - driverClassName: org.postgresql.Driver - user: postgres - password: DsideaL147258369 - jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true +mysql: + driverClassName: com.mysql.cj.jdbc.Driver + user: ylt + password: Ycharge666 + jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true # redis redis: diff --git a/dsRes/src/main/resources/application_pro.yaml b/dsRes/src/main/resources/application_pro.yaml index 011f3f0b..36bb2edf 100644 --- a/dsRes/src/main/resources/application_pro.yaml +++ b/dsRes/src/main/resources/application_pro.yaml @@ -4,11 +4,11 @@ uploadTempPath: /tmp CookieMd5SingPwd: DsideaL4r5t6y7u # 数据库信息 -postgresql: - driverClassName: org.postgresql.Driver - user: postgres - password: DsideaL147258369 - jdbcUrl: jdbc:postgresql://10.10.14.71:5432/dsBase_db?reWriteBatchedInserts=true +mysql: + driverClassName: com.mysql.cj.jdbc.Driver + user: ylt + password: Ycharge666 + jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true # redis redis: