diff --git a/dsBase/src/main/java/com/dsideal/base/BaseApplication.java b/dsBase/src/main/java/com/dsideal/base/BaseApplication.java index 65100e57..cb8e05f8 100644 --- a/dsBase/src/main/java/com/dsideal/base/BaseApplication.java +++ b/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"), - PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName")); - masterPlugin.setConnectionTestQuery(connectionTestQuery); - masterPlugin.setConnectionTimeout(connectionTimeoutMs); - masterPlugin.setIdleTimeout(idleTimeoutMs); - masterPlugin.setMaxLifetime(maxLifetimeMs); - masterPlugin.setMaximumPoolSize(maxPoolSize); - - String jdbcUrlSlave = PropKit.get("mysql.jdbcUrlSlave"); - if (StrKit.isBlank(jdbcUrlSlave)) jdbcUrlSlave = PropKit.get("mysql.jdbcUrl"); - HikariCpPlugin slavePlugin = new HikariCpPlugin(jdbcUrlSlave, PropKit.get("mysql.user"), - PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName")); - slavePlugin.setConnectionTestQuery(connectionTestQuery); - slavePlugin.setConnectionTimeout(connectionTimeoutMs); - slavePlugin.setIdleTimeout(idleTimeoutMs); - slavePlugin.setMaxLifetime(maxLifetimeMs); - slavePlugin.setMaximumPoolSize(maxPoolSize); - me.add(masterPlugin); - me.add(slavePlugin); + String jdbcUrl = PropKit.get("mysql.jdbcUrl"); + String user = PropKit.get("mysql.user"); + String password = PropKit.get("mysql.password"); + String driverClassName = PropKit.get("mysql.driverClassName"); + HikariCpPlugin dsDbPlugin = new HikariCpPlugin(jdbcUrl, user, password, driverClassName); + dsDbPlugin.setConnectionTestQuery(connectionTestQuery); + dsDbPlugin.setConnectionTimeout(connectionTimeoutMs); + dsDbPlugin.setIdleTimeout(idleTimeoutMs); + dsDbPlugin.setMaxLifetime(maxLifetimeMs); + dsDbPlugin.setMaximumPoolSize(maxPoolSize); + me.add(dsDbPlugin); + HikariCpPlugin yltPlugin = new HikariCpPlugin(jdbcUrl.replace("/ds_db?", "/yltcharge?"), user, password, driverClassName); + me.add(yltPlugin); // 配置ActiveRecord插件 - ActiveRecordPlugin masterArp = new ActiveRecordPlugin("master", masterPlugin); - masterArp.setDialect(new MysqlDialect()); - ActiveRecordPlugin slaveArp = new ActiveRecordPlugin("slave", slavePlugin); - slaveArp.setDialect(new MysqlDialect()); + ActiveRecordPlugin arp = new ActiveRecordPlugin(dsDbPlugin); + arp.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()); - slaveArp.addSqlTemplate("/Sql/" + sqlFile.getName()); + arp.addSqlTemplate("/Sql/" + sqlFile.getName()); + yltArp.addSqlTemplate("/Sql/" + sqlFile.getName()); } } //加载 - me.add(masterArp); - me.add(slaveArp); + me.add(arp); + me.add(yltArp); // 用于缓存模块的redis服务 RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis.ip"), PropKit.getInt("redis.port"), 10 * 1000, PropKit.get("redis.password")); //启动redis组件 diff --git a/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java b/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java index 1f39f2b5..cbefcb48 100644 --- a/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java +++ b/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java @@ -34,8 +34,9 @@ public class DataAuthorityModel { * @param resource_type_code */ public List getResourceListByTypeCode(String resource_type_code) { - String sql = "select * from t_sys_resource where resource_type_code=?"; - return Db.find(sql, 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); + 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 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; } /**