2.0 from 处理 不支持字段中包含from

mainFactory/src/main/java/org/bfkj/protocol/FtpHandler.java

@@ -44,11 +44,11 @@ public class FtpHandler {
 
     /**
      *
-     * @param filePathName 组装好的文件名称
+     * @param fileList 组装好的文件名称
      * @param connectConfig 连接fpt的连接信息
      * @return
      */
-    public Map<String, Object> readData(String  filePathName, String connectConfig) {
+    public Map<String, Object> readData(List<String>  fileList, String connectConfig) {
         Map<String, Object> connectConfigMaps = (Map<String, Object>) MapTools.strToObj(connectConfig);
         FTPClient ftp = null;
         try {
@@ -63,21 +63,23 @@ public class FtpHandler {
                 ftp.changeWorkingDirectory(basePath);
             }
             String rootPath = ftp.printWorkingDirectory(); //ftp根目录
-            FTPFile[] ftpFiles = ftp.listFiles(rootPath + filePathName);
+            FTPFile[] ftpFiles = ftp.listFiles(rootPath );
             if (ftpFiles.length == 0) {
                 ftp.logout();
-                return MapTools.processFail("没有找到文件".concat(filePathName));
+                return MapTools.processFail("没有找到文件");
             }
             List<File> files = new ArrayList<>();
             for (FTPFile ftpFile : ftpFiles) {
-                String path = System.getProperty("user.dir") + File.separator + "ftp" + File.separator + ftpFile.getName();
-                File targetFile = new File(path);
-                files.add(targetFile);
-                FileOutputStream fileOutputStream = new FileOutputStream(targetFile);
-                ftp.retrieveFile(ftpFile.getName(), fileOutputStream);
-                fileOutputStream.close();
+                if (fileList.contains(ftpFile.getName())){
+                    String path = System.getProperty("user.dir") + File.separator + "ftp" + File.separator + ftpFile.getName();
+                    File targetFile = new File(path);
+                    files.add(targetFile);
+                    FileOutputStream fileOutputStream = new FileOutputStream(targetFile);
+                    ftp.retrieveFile(ftpFile.getName(), fileOutputStream);
+                    fileOutputStream.close();
+                }
             }
-
+            ftp.logout();//退出ftp
             List<String> fileContent = new ArrayList<>();
             for (File ftpFile : files) {
                 String path = System.getProperty("user.dir") + File.separator + "ftp" + File.separator + ftpFile.getName();
@@ -93,7 +95,6 @@ public class FtpHandler {
                     fileContent.add(baos.toString(StandardCharsets.UTF_8));
                 }
             }
-            ftp.logout();//退出ftp
             return MapTools.processSuccess(fileContent);
         } catch (Exception e) {
             return MapTools.processFail("fpt读取文件异常".concat(LogUtils.getException(e)));

mainFactory/src/main/java/org/bfkj/utils/MyDbHelper.java

@@ -366,8 +366,12 @@ public class MyDbHelper {//目前只差主键的条件优化
                 int beginIndex = 6;//默认从第一个select后开始进行查找
                 String tempSQLStr = sqlStr.toLowerCase();//初始化一个中间变量，不影响原SQL语句，因为中间会把子查询的select替换掉
                 String allColumnStr = "";//初始化一个完整字段列表字符串
+                String fromStr =" from ";
                 while (true) {//循环查找select后的from     //  select (select a as b from x) as t  from tx  id = select * from tx2
-                    beginIndex = tempSQLStr.indexOf(" from ", beginIndex); //从上一次找到的from后面开始查找下一个from，beginIndex的目的是为避免重复查找一个
+                    if (!tempSQLStr.contains(fromStr)){
+                        fromStr = "from";
+                    }
+                    beginIndex = tempSQLStr.indexOf(fromStr, beginIndex); //从上一次找到的from后面开始查找下一个from，beginIndex的目的是为避免重复查找一个
                     allColumnStr = tempSQLStr.substring(6, beginIndex); //取出查找到的内容
                     int findOne = allColumnStr.indexOf(" select "); //判断是否存在子查询
                     int findTwo = allColumnStr.indexOf("(select "); //判断是否存在子查询

mainFactory/src/main/resources/application-prod.yml

@@ -34,7 +34,7 @@ mydb:
   title: ${MYDB_USER:root}
   cipher: ${MYDB_PASSWD:QtrmuqDw^bJu$}
   type: ${MYDB_DRIVER:com.mysql.cj.jdbc.Driver}
-  serviceURL: ${MY_SERVICE_URL:10.211.66.23:380}
+  serviceURL: ${MY_SERVICE_URL:10.211.66.23:500}
 
 #isEs:
 #  open: true

mainFactory/src/main/resources/start.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+ 
+source /etc/profile
+sleep 5
+ 
+pid=$(ps -ef | grep  端口号 | grep -v grep | awk '{print $2}')
+ 
+kill -15 $pid
+sleep 5
+ 
+nohup java  -Dserver.port=端口号 -Ddatahandler.mydb.serviceURL=机器表中对应的服务地址 -Dspring.profiles.active=prod   -Dspring.application.name=服务名称  -Dspring.config.additional-location=/app/workspace/quz/application-prod.yml -jar /app/workspace/quz/mainFactory-0.0.1-SNAPSHOT.jar > nohup.out 2>&1 &