'commit'

src/main/java/com/dsideal/QingLong/Start.java

@@ -30,6 +30,7 @@ import com.dsideal.QingLong.Zjcq.Controller.ZjcqController;
 import com.jfinal.config.*;
 import com.jfinal.kit.PathKit;
 import com.jfinal.kit.PropKit;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
@@ -50,18 +51,12 @@ public class Start extends JFinalConfig {
      */
     @Override
     public void configConstant(Constants me) {
-        //使用LogBack
         me.setLogFactory(new LogBackLogFactory());
-
+        PropKit.clear();
-//        //读取程序运行的目录
+        PropKit.use("undertow.properties");
-//        PropKit.clear();
+        CommonUtil.WebRoot = PropKit.get("undertow.resourcePath").split(",")[0];
-//        PropKit.use("undertow.properties");
+        PropKit.clear();
-//        CommonUtil.WebRoot = PropKit.get("undertow.resourcePath").split(",")[0];
-//        PropKit.clear();
-
-        // 加载少量必要配置，随后可用PropKit.get(...)获取值
         PropKit.use("application.properties");
-        //配置统一的错误页面
         me.setError404View("/html/common/404/index.html");
     }
 
@@ -132,36 +127,51 @@ public class Start extends JFinalConfig {
 
     @Override
     public void configPlugin(Plugins me) {
-        HikariCpPlugin hpPlugin = new HikariCpPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"),
+        HikariCpPlugin masterPlugin = new HikariCpPlugin(PropKit.get("jdbcUrl"), PropKit.get("user"), PropKit.get("password").trim(), PropKit.get("driverClassName"));
-                PropKit.get("password").trim(), PropKit.get("driverClassName"));
+        masterPlugin.setConnectionTestQuery(this.connectionTestQuery);
-        hpPlugin.setConnectionTestQuery(connectionTestQuery);
+        masterPlugin.setConnectionTimeout(this.connectionTimeoutMs);
-        hpPlugin.setConnectionTimeout(connectionTimeoutMs);
+        masterPlugin.setIdleTimeout(this.idleTimeoutMs);
-        hpPlugin.setIdleTimeout(idleTimeoutMs);
+        masterPlugin.setMaxLifetime(this.maxLifetimeMs);
-        hpPlugin.setMaxLifetime(maxLifetimeMs);
+        masterPlugin.setMaximumPoolSize(this.maxPoolSize);
-        hpPlugin.setMaximumPoolSize(maxPoolSize);
+        String jdbcUrlSlave = PropKit.get("jdbcUrlSlave");
-        me.add(hpPlugin);
+        if (StrKit.isBlank(jdbcUrlSlave)) {
-
+            jdbcUrlSlave = PropKit.get("jdbcUrl");
-        // 配置ActiveRecord插件
+        }
-        ActiveRecordPlugin arp = new ActiveRecordPlugin(hpPlugin);
+
-        arp.setDialect(new PostgreSqlDialect());
+        HikariCpPlugin slavePlugin = new HikariCpPlugin(jdbcUrlSlave, PropKit.get("user"), PropKit.get("password").trim(), PropKit.get("driverClassName"));
-
+        slavePlugin.setConnectionTestQuery(this.connectionTestQuery);
-        //遍历sql目录下所有的sql文件
+        slavePlugin.setConnectionTimeout(this.connectionTimeoutMs);
-        File sqlDir;
+        slavePlugin.setIdleTimeout(this.idleTimeoutMs);
-        String basePath = PathKit.getRootClassPath();
+        slavePlugin.setMaxLifetime(this.maxLifetimeMs);
-        sqlDir = new File(basePath + "/Sql");
+        slavePlugin.setMaximumPoolSize(this.maxPoolSize);
+        me.add(masterPlugin);
+        me.add(slavePlugin);
+        ActiveRecordPlugin masterArp = new ActiveRecordPlugin("master", masterPlugin);
+        masterArp.setDialect(new PostgreSqlDialect());
+        ActiveRecordPlugin slaveArp = new ActiveRecordPlugin("slave", slavePlugin);
+        slaveArp.setDialect(new PostgreSqlDialect());
+        String basePath = Start.class.getClassLoader().getResource(".").getPath();
+        File sqlDir = new File(basePath + "/Sql");
         File[] sqlFiles = sqlDir.listFiles();
-        for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {
+        File[] var10 = sqlFiles != null ? sqlFiles : new File[0];
-            //只加载.sql文件
+        int var11 = var10.length;
+
+        for(int i = 0; i < var11; ++i) {
+            File sqlFile = var10[i];
             if (sqlFile.getName().indexOf(".sql") > 0) {
-                arp.addSqlTemplate("/Sql/" + sqlFile.getName());
+                masterArp.addSqlTemplate("/Sql/" + sqlFile.getName());
+                slaveArp.addSqlTemplate("/Sql/" + sqlFile.getName());
             }
         }
-        //加载
+
-        me.add(arp);
+        me.add(masterArp);
-        // 用于缓存模块的redis服务
+        me.add(slaveArp);
-        RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10 * 1000);
+        RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis_ip"), PropKit.getInt("redis_port"), 10000);
-        //启动redis组件
         me.add(redis);
+        if (!StrKit.isBlank(PropKit.get("pika_ip")) && !StrKit.isBlank(PropKit.get("pika_port"))) {
+            RedisPlugin pika = new RedisPlugin("Pika", PropKit.get("pika_ip"), PropKit.getInt("pika_port"), 10000);
+            me.add(pika);
+        }
     }
 
     /**