'commit'

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

@@ -1,13 +1,10 @@
 package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Util.SSHConnector;
+import com.dsideal.base.Tools.Util.SshConnectUtil;
-import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+import com.jcraft.jsch.JSchException;
 import com.jfinal.plugin.activerecord.Record;
-import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
-import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
@@ -15,51 +12,8 @@ import com.jcraft.jsch.Session;
 
 public class AddXzqh {
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws IOException, JSchException {
-        //远程主机的SSH登录信息
+        Session session = SshConnectUtil.Init();
-        String sshHost = "117.78.60.214";
-        int sshPort = 52025;
-        String sshUser = "root";
-        String sshPassword = "DsIdeal@123";
-        String mysqlHost = "127.0.0.1"; // MySQL server host
-        int mysqlPort = 3306; // MySQL server port
-        Session session = SSHConnector.createSSHSession(sshHost, sshPort, sshUser, sshPassword);
-        try {
-            int localPort = 33306; // Local port to forward to MySQL server
-            session.setPortForwardingL(localPort, mysqlHost, mysqlPort);
-            String jdbcUrl = "jdbc:mysql://localhost:" + localPort + "/ds_db";
-
-            String user = "root";
-            String password = "Password123@mysql";
-            String driverClassName = "com.mysql.cj.jdbc.Driver";
-
-            HikariCpPlugin masterPlugin = new HikariCpPlugin(jdbcUrl, user, password, driverClassName);
-            masterPlugin.start();
-
-            HikariCpPlugin dataEasePlugin = new HikariCpPlugin(jdbcUrl.replace("ds_db", DataEaseModel.DB_NAME), user, password, driverClassName);
-            dataEasePlugin.start();
-
-            // 配置ActiveRecord插件
-            ActiveRecordPlugin arp = new ActiveRecordPlugin(masterPlugin);
-            arp.setDialect(new MysqlDialect());
-
-            ActiveRecordPlugin arpDataEase = new ActiveRecordPlugin(DataEaseModel.DB_NAME, dataEasePlugin);
-            arpDataEase.setDialect(new MysqlDialect());
-
-            //遍历sql目录下所有的sql文件
-            File sqlDir;
-            String basePath = AddXzqh.class.getResource("/").getPath();
-            sqlDir = new File(basePath + "/Sql");
-            File[] sqlFiles = sqlDir.listFiles();
-            for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {
-                //只加载.sql文件
-                if (sqlFile.getName().indexOf(".sql") > 0) {
-                    arp.addSqlTemplate("/Sql/" + sqlFile.getName());
-                    arpDataEase.addSqlTemplate("/Sql/" + sqlFile.getName());
-                }
-            }
-            arp.start();
-            arpDataEase.start();
 
         DataEaseModel dm = new DataEaseModel();
 
@@ -84,10 +38,6 @@ public class AddXzqh {
             }
         }
         System.out.println("恭喜，所有数据处理完毕。");
-
         session.disconnect();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 }

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

@@ -17,7 +17,7 @@ public class ChangeDataEaseCity {
      */
     public static void main(String[] args) {
         //加载配置文件
-        String configFile = "application_dev.yaml";
+        String configFile = "application.yaml";
         Prop PropKit = new YamlProp(configFile);
 
         HikariCpPlugin dataEasePlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),

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

@@ -1,64 +1,19 @@
 package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Util.SSHConnector;
+import com.dsideal.base.Tools.Util.SshConnectUtil;
+import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
-import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
-import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 
-import java.io.File;
 import java.io.IOException;
 
-public class InitDataEaseDataSet2 {
+public class ExportExcel {
 
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) throws IOException, JSchException {
 
-        //远程主机的SSH登录信息
+        //通过ssh链接到Mysql数据库
-        String sshHost = "117.78.60.214";
+        Session session = SshConnectUtil.Init();
-        int sshPort = 52025;
-        String sshUser = "root";
-        String sshPassword = "DsIdeal@123";
-        String mysqlHost = "127.0.0.1"; // MySQL server host
-        int mysqlPort = 3306; // MySQL server port
-        Session session = SSHConnector.createSSHSession(sshHost, sshPort, sshUser, sshPassword);
-        try {
-            int localPort = 33306; // Local port to forward to MySQL server
-            session.setPortForwardingL(localPort, mysqlHost, mysqlPort);
-            String jdbcUrl = "jdbc:mysql://localhost:" + localPort + "/ds_db";
-
-            String user = "root";
-            String password = "Password123@mysql";
-            String driverClassName = "com.mysql.cj.jdbc.Driver";
-
-            HikariCpPlugin masterPlugin = new HikariCpPlugin(jdbcUrl, user, password, driverClassName);
-            masterPlugin.start();
-
-            HikariCpPlugin dataEasePlugin = new HikariCpPlugin(jdbcUrl.replace("ds_db", DataEaseModel.DB_NAME), user, password, driverClassName);
-            dataEasePlugin.start();
-
-            // 配置ActiveRecord插件
-            ActiveRecordPlugin arp = new ActiveRecordPlugin(masterPlugin);
-            arp.setDialect(new MysqlDialect());
-
-            ActiveRecordPlugin arpDataEase = new ActiveRecordPlugin(DataEaseModel.DB_NAME, dataEasePlugin);
-            arpDataEase.setDialect(new MysqlDialect());
-
-            //遍历sql目录下所有的sql文件
-            File sqlDir;
-            String basePath = InitDataEaseDataSet2.class.getResource("/").getPath();
-            sqlDir = new File(basePath + "/Sql");
-            File[] sqlFiles = sqlDir.listFiles();
-            for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {
-                //只加载.sql文件
-                if (sqlFile.getName().indexOf(".sql") > 0) {
-                    arp.addSqlTemplate("/Sql/" + sqlFile.getName());
-                    arpDataEase.addSqlTemplate("/Sql/" + sqlFile.getName());
-                }
-            }
-            arp.start();
-            arpDataEase.start();
 
         DataEaseModel dm = new DataEaseModel();
 
@@ -135,11 +90,7 @@ public class InitDataEaseDataSet2 {
 //                }
 //            }
 //            System.out.println("恭喜，所有数据处理完毕，共生成数据集数量=" + total + "个。");
-        }catch (Exception e){
+
-            System.out.println(e.toString());
-        }
-        finally {
         session.disconnect();
     }
 }
-}