diff --git a/src/main/java/com/dsideal/base/Tools/ChangUrlLink.java b/src/main/java/com/dsideal/base/Tools/ChangUrlLink.java index 216041c6..462c24fe 100644 --- a/src/main/java/com/dsideal/base/Tools/ChangUrlLink.java +++ b/src/main/java/com/dsideal/base/Tools/ChangUrlLink.java @@ -15,7 +15,7 @@ public class ChangUrlLink { public static DataEaseModel dm = new DataEaseModel(); public static void main(String[] args) throws IOException, JSchException { - LocalMysqlConnectUtil.Init(); + LocalMysqlConnectUtil.Init(null); //原地址 String sourceHost = "http://10.10.21.20:9000/dsBase/"; //目标地址 diff --git a/src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java b/src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java index de683dc8..f71769bb 100644 --- a/src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java +++ b/src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java @@ -16,7 +16,7 @@ public class DataSetAddXzqh { public static DataEaseModel dm = new DataEaseModel(); public static void main(String[] args) throws IOException, JSchException { - LocalMysqlConnectUtil.Init(); + LocalMysqlConnectUtil.Init(null); //遍历所有以excel_开头的表,找出这些表中是不是存在行政区划,上级行政区划的列名 for (int identity_id : new int[]{1, 2, 3}) { diff --git a/src/main/java/com/dsideal/base/Tools/DataSetFakeData.java b/src/main/java/com/dsideal/base/Tools/DataSetFakeData.java index 77c4b64b..60738ff8 100644 --- a/src/main/java/com/dsideal/base/Tools/DataSetFakeData.java +++ b/src/main/java/com/dsideal/base/Tools/DataSetFakeData.java @@ -28,7 +28,7 @@ public class DataSetFakeData { } public static void main(String[] args) throws IOException { - LocalMysqlConnectUtil.Init(); + LocalMysqlConnectUtil.Init("dataease_huanghai"); DataEaseModel dm = new DataEaseModel(); //这几个是要保留的地名 diff --git a/src/main/java/com/dsideal/base/Tools/DataSetInit.java b/src/main/java/com/dsideal/base/Tools/DataSetInit.java index 17c91ec4..7759cc85 100644 --- a/src/main/java/com/dsideal/base/Tools/DataSetInit.java +++ b/src/main/java/com/dsideal/base/Tools/DataSetInit.java @@ -9,7 +9,7 @@ public class DataSetInit { public static DataEaseModel dm = new DataEaseModel(); public static void main(String[] args) throws IOException { - LocalMysqlConnectUtil.Init(); + LocalMysqlConnectUtil.Init(null); //1、添加到数据集表中 dm.collectDataSet(); //2、加上主键 diff --git a/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java b/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java index 3be54839..f9450ede 100644 --- a/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java +++ b/src/main/java/com/dsideal/base/Tools/InitOrgPerson.java @@ -24,7 +24,7 @@ public class InitOrgPerson { public static Prop PropKit; public static void main(String[] args) throws Exception { - LocalMysqlConnectUtil.Init(); + LocalMysqlConnectUtil.Init(null); // 用于缓存模块的redis服务 RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis.ip"), PropKit.getInt("redis.port"), 10 * 1000); diff --git a/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java b/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java index 0679517b..daf23d1f 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java +++ b/src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java @@ -14,7 +14,7 @@ public class ExportExcel { public static DataEaseModel dm = new DataEaseModel(); public static void main(String[] args) throws IOException, JSchException { - LocalMysqlConnectUtil.Init(); + LocalMysqlConnectUtil.Init(null); //Excel的保存目录 String exportPath = "D:/360Downloads/Excel"; diff --git a/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java b/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java index 319be0f5..6de3c912 100644 --- a/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java +++ b/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java @@ -4,6 +4,7 @@ import com.dsideal.base.DataEase.Model.DataEaseModel; import com.dsideal.base.Plugin.YamlProp; import com.dsideal.base.Tools.DataSetInit; import com.jfinal.kit.Prop; +import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.plugin.hikaricp.HikariCpPlugin; @@ -13,14 +14,15 @@ import java.io.File; public class LocalMysqlConnectUtil { public static Prop PropKit; - public static void Init() { + public static void Init(String database_dbName) { //加载配置文件 String configFile = "application.yaml"; PropKit = new YamlProp(configFile); + if (StrKit.isBlank(database_dbName)) database_dbName = "dataease"; HikariCpPlugin masterPlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"), PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName")); - HikariCpPlugin dataEasePlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl").replace("ds_db", "dataease"), PropKit.get("mysql.user"), + HikariCpPlugin dataEasePlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl").replace("ds_db", database_dbName), PropKit.get("mysql.user"), PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName")); masterPlugin.start();