Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

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

@@ -5,7 +5,7 @@ import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 
 import java.io.IOException;
 
-public class Step2_DataSetInit {
+public class Step1_DataSetInit {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException {

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

@@ -8,7 +8,7 @@ import com.jfinal.plugin.activerecord.Record;
 import java.io.IOException;
 import java.util.List;
 
-public class Step1_DataSetAddXzqh {
+public class Step2_DataSetAddXzqh {
 
     public static DataEaseModel dm = new DataEaseModel();
 

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.Step2_DataSetInit;
+import com.dsideal.base.Tools.Step1_DataSetInit;
 import com.jfinal.kit.Prop;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
@@ -36,7 +36,7 @@ public class LocalMysqlConnectUtil {
 
         //遍历sql目录下所有的sql文件
         File sqlDir;
-        String basePath = Step2_DataSetInit.class.getResource("/").getPath();
+        String basePath = Step1_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.Step2_DataSetInit;
+import com.dsideal.base.Tools.Step1_DataSetInit;
 import com.dsideal.base.Util.SSHConnector;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
@@ -45,7 +45,7 @@ public class SshMysqlConnectUtil {
 
             //遍历sql目录下所有的sql文件
             File sqlDir;
-            String basePath = Step2_DataSetInit.class.getResource("/").getPath();
+            String basePath = Step1_DataSetInit.class.getResource("/").getPath();
             sqlDir = new File(basePath + "/Sql");
             File[] sqlFiles = sqlDir.listFiles();
             for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {