'commit'

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

@@ -120,31 +120,26 @@ public class BaseApplication extends JFinalConfig {
 
     @Override
     public void configPlugin(Plugins me) {
-        HikariCpPlugin masterPlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
+        String jdbcUrl = PropKit.get("mysql.jdbcUrl");
-                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
+        String user = PropKit.get("mysql.user");
-        masterPlugin.setConnectionTestQuery(connectionTestQuery);
+        String password = PropKit.get("mysql.password");
-        masterPlugin.setConnectionTimeout(connectionTimeoutMs);
+        String driverClassName = PropKit.get("mysql.driverClassName");
-        masterPlugin.setIdleTimeout(idleTimeoutMs);
+        HikariCpPlugin dsDbPlugin = new HikariCpPlugin(jdbcUrl, user, password, driverClassName);
-        masterPlugin.setMaxLifetime(maxLifetimeMs);
+        dsDbPlugin.setConnectionTestQuery(connectionTestQuery);
-        masterPlugin.setMaximumPoolSize(maxPoolSize);
+        dsDbPlugin.setConnectionTimeout(connectionTimeoutMs);
-
+        dsDbPlugin.setIdleTimeout(idleTimeoutMs);
-        String jdbcUrlSlave = PropKit.get("mysql.jdbcUrlSlave");
+        dsDbPlugin.setMaxLifetime(maxLifetimeMs);
-        if (StrKit.isBlank(jdbcUrlSlave)) jdbcUrlSlave = PropKit.get("mysql.jdbcUrl");
+        dsDbPlugin.setMaximumPoolSize(maxPoolSize);
-        HikariCpPlugin slavePlugin = new HikariCpPlugin(jdbcUrlSlave, PropKit.get("mysql.user"),
+        me.add(dsDbPlugin);
-                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
+        HikariCpPlugin yltPlugin = new HikariCpPlugin(jdbcUrl.replace("/ds_db?", "/yltcharge?"), user, password, driverClassName);
-        slavePlugin.setConnectionTestQuery(connectionTestQuery);
+        me.add(yltPlugin);
-        slavePlugin.setConnectionTimeout(connectionTimeoutMs);
-        slavePlugin.setIdleTimeout(idleTimeoutMs);
-        slavePlugin.setMaxLifetime(maxLifetimeMs);
-        slavePlugin.setMaximumPoolSize(maxPoolSize);
-        me.add(masterPlugin);
-        me.add(slavePlugin);
 
         // 配置ActiveRecord插件
-        ActiveRecordPlugin masterArp = new ActiveRecordPlugin("master", masterPlugin);
+        ActiveRecordPlugin arp = new ActiveRecordPlugin(dsDbPlugin);
-        masterArp.setDialect(new MysqlDialect());
+        arp.setDialect(new MysqlDialect());
-        ActiveRecordPlugin slaveArp = new ActiveRecordPlugin("slave", slavePlugin);
+
-        slaveArp.setDialect(new MysqlDialect());
+        ActiveRecordPlugin yltArp = new ActiveRecordPlugin("ylt", yltPlugin);
+        yltArp.setDialect(new MysqlDialect());
 
         //遍历sql目录下所有的sql文件
         File sqlDir;
@@ -154,13 +149,13 @@ public class BaseApplication extends JFinalConfig {
         for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {
             //只加载.sql文件
             if (sqlFile.getName().indexOf(".sql") > 0) {
-                masterArp.addSqlTemplate("/Sql/" + sqlFile.getName());
+                arp.addSqlTemplate("/Sql/" + sqlFile.getName());
-                slaveArp.addSqlTemplate("/Sql/" + sqlFile.getName());
+                yltArp.addSqlTemplate("/Sql/" + sqlFile.getName());
             }
         }
         //加载
-        me.add(masterArp);
+        me.add(arp);
-        me.add(slaveArp);
+        me.add(yltArp);
         // 用于缓存模块的redis服务
         RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis.ip"), PropKit.getInt("redis.port"), 10 * 1000, PropKit.get("redis.password"));
         //启动redis组件

dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java

@@ -34,8 +34,9 @@ public class DataAuthorityModel {
      * @param resource_type_code
      */
     public List<Record> getResourceListByTypeCode(String resource_type_code) {
-        String sql = "select * from t_sys_resource where resource_type_code=?";
+        String sql = "select sync_sql from ds_db.t_sys_resource_type  where resource_type_code=?";
-        return Db.find(sql, resource_type_code);
+        String sync_sql = Db.queryStr(sql, resource_type_code);
+        return Db.use("ylt").find(sync_sql);
     }
 
     /**
@@ -52,7 +53,7 @@ public class DataAuthorityModel {
             delPersonDutyResource(person_id, resource_type_code, duties_id, resource_id);
             //插入
             String sql = "insert into t_person_duty_charge_resource(duties_id,resource_type_code,resource_id,resource_name,person_id) values(?,?,?,?,?)";
-            Db.update(sql, duties_id, resource_type_code, resource_id, getSysResource(Integer.parseInt(resource_id),resource_type_code).getStr("resource_name"), person_id);
+            Db.update(sql, duties_id, resource_type_code, resource_id, getSysResource(Integer.parseInt(resource_id), resource_type_code).getStr("resource_name"), person_id);
         }
     }
 
@@ -63,8 +64,23 @@ public class DataAuthorityModel {
         }
     }
 
+    /**
+     * 获取资源对象
+     * @param resource_id
+     * @param resource_type_code
+     * @return
+     */
     public Record getSysResource(int resource_id, String resource_type_code) {
-        return Db.findFirst("select * from t_sys_resource where resource_id=? and resource_type_code=?", resource_id, resource_type_code);
+        String sql = "select sync_sql from ds_db.t_sys_resource_type  where resource_type_code=?";
+        String sync_sql = Db.queryStr(sql, resource_type_code);
+        List<Record> list = Db.use("ylt").find(sync_sql);
+        for (Record record : list) {
+            int id = record.getInt("resource_id");
+            if (id == resource_id) {
+                return record;
+            }
+        }
+        return null;
     }
 
     /**