'commit'

src/main/java/com/dsideal/base/Tools/ChangUrlLink.java

@@ -1,8 +1,7 @@
 package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Res.Model.ResourceModel;
+import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.dsideal.base.Tools.Util.DevMysqlUtil;
 import com.jcraft.jsch.JSchException;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
@@ -16,7 +15,7 @@ public class ChangUrlLink {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException, JSchException {
-        DevMysqlUtil.Init();
+        LocalMysqlConnectUtil.Init();
         //原地址
         String sourceHost = "http://10.10.21.20:9000/dsBase/";
         //目标地址

src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java

@@ -1,7 +1,7 @@
 package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.SshConnectUtil;
+import com.dsideal.base.Tools.Util.SshMysqlConnectUtil;
 import com.jcraft.jsch.JSchException;
 import com.jfinal.plugin.activerecord.Record;
 
@@ -10,12 +10,12 @@ import java.util.List;
 
 import com.jcraft.jsch.Session;
 
-public class AddXzqh {
+public class DataSetAddXzqh {
 
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException, JSchException {
-        Session session = SshConnectUtil.Init();
+        Session session = SshMysqlConnectUtil.Init();
         //遍历所有以excel_开头的表，找出这些表中是不是存在行政区划,上级行政区划的列名
         for (int identity_id : new int[]{1, 2, 3}) {
             List<Record> list = dm.getDataSetByIdentityId(identity_id);

src/main/java/com/dsideal/base/Tools/DataSetInit.java

@@ -1,27 +1,23 @@
 package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.SshConnectUtil;
+import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Tools.Util.SshMysqlConnectUtil;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
 import java.io.IOException;
 
-public class InitDataEaseDataSet {
+public class DataSetInit {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException, JSchException {
-        //通过ssh链接到Mysql数据库
+        LocalMysqlConnectUtil.Init();
-        Session session = SshConnectUtil.Init();
-
         //1、添加到数据集表中
         dm.collectDataSet();
         //2、加上主键
         dm.addPrimaryKey();
         //3、将所有非空列去掉不允许为空的限制
         dm.updateNotNullColumns();
-
-        //关闭数据库
-        session.disconnect();
     }
 }

src/main/java/com/dsideal/base/Tools/InitOrgPerson.java

@@ -1,5 +1,6 @@
 package com.dsideal.base.Tools;
 
+import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.dsideal.base.Util.CommonUtil;
 import com.dsideal.base.Util.PkUtil;
 import com.dsideal.base.Plugin.YamlProp;
@@ -23,20 +24,7 @@ public class InitOrgPerson {
     public static Prop PropKit;
 
     public static void main(String[] args) throws Exception {
-        //告之配置文件位置
+        LocalMysqlConnectUtil.Init();
-        String configFile = "application.yaml";
-        PropKit = new YamlProp(configFile);
-
-        HikariCpPlugin druid = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
-                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
-        druid.start();
-        // 配置ActiveRecord插件
-        ActiveRecordPlugin arp = new ActiveRecordPlugin(druid);
-        //应用系统
-        String basePath = "/Sql/";
-        arp.addSqlTemplate(basePath + "organization.sql");
-        arp.addSqlTemplate(basePath + "loginPerson.sql");
-        arp.start();
 
         // 用于缓存模块的redis服务
         RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis.ip"), PropKit.getInt("redis.port"), 10 * 1000);
@@ -98,8 +86,7 @@ public class InitOrgPerson {
      * 作者：黄海
      * 时间：2018-12-21
      */
-    public static void generateUser(int identity_id, String person_name, String city_id, String area_id, int sort_id, String operator, String org_id)
+    public static void generateUser(int identity_id, String person_name, String city_id, String area_id, int sort_id, String operator, String org_id) {
-            throws Exception {
         Record record = new Record();
         String person_id = UUID.randomUUID().toString().toUpperCase();
         record.set("person_id", person_id);

src/main/java/com/dsideal/base/Tools/Test/ChangeDataEaseCity.java

@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools;
+package com.dsideal.base.Tools.Test;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Plugin.YamlProp;

src/main/java/com/dsideal/base/Tools/Test/ConvertExcel.java

@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools;
+package com.dsideal.base.Tools.Test;
 
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
@@ -8,8 +8,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
-import com.jfinal.plugin.activerecord.Record;
-
 public class ConvertExcel {
     // 获取系统的临时文件目录
     private static final String tempDir = System.getProperty("java.io.tmpdir");

src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java

@@ -1,25 +1,20 @@
-package com.dsideal.base.Tools;
+package com.dsideal.base.Tools.Test;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.Util.DevMysqlUtil;
+import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.dsideal.base.Tools.Util.SshConnectUtil;
-import com.dsideal.base.Util.ExcelCommonUtil;
 import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
-import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 
 public class ExportExcel {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException, JSchException {
-        DevMysqlUtil.Init();
+        LocalMysqlConnectUtil.Init();
 
         //Excel的保存目录
         String exportPath = "D:/360Downloads/Excel";

src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java

@@ -2,7 +2,7 @@ package com.dsideal.base.Tools.Util;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Plugin.YamlProp;
-import com.dsideal.base.Tools.InitDataEaseDataSet;
+import com.dsideal.base.Tools.DataSetInit;
 import com.jfinal.kit.Prop;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
@@ -10,7 +10,7 @@ import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 
 import java.io.File;
 
-public class DevMysqlUtil {
+public class LocalMysqlConnectUtil {
     public static Prop PropKit;
 
     public static void Init() {
@@ -36,7 +36,7 @@ public class DevMysqlUtil {
 
         //遍历sql目录下所有的sql文件
         File sqlDir;
-        String basePath = InitDataEaseDataSet.class.getResource("/").getPath();
+        String basePath = DataSetInit.class.getResource("/").getPath();
         sqlDir = new File(basePath + "/Sql");
         File[] sqlFiles = sqlDir.listFiles();
         for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {

src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java

@@ -1,7 +1,7 @@
 package com.dsideal.base.Tools.Util;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.InitDataEaseDataSet;
+import com.dsideal.base.Tools.DataSetInit;
 import com.dsideal.base.Util.SSHConnector;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
@@ -11,7 +11,7 @@ import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 
 import java.io.File;
 
-public class SshConnectUtil {
+public class SshMysqlConnectUtil {
     public static Session Init() throws JSchException {
         //远程主机的SSH登录信息
         String sshHost = "117.78.60.214";
@@ -45,7 +45,7 @@ public class SshConnectUtil {
 
             //遍历sql目录下所有的sql文件
             File sqlDir;
-            String basePath = InitDataEaseDataSet.class.getResource("/").getPath();
+            String basePath = DataSetInit.class.getResource("/").getPath();
             sqlDir = new File(basePath + "/Sql");
             File[] sqlFiles = sqlDir.listFiles();
             for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {