zhba/zhba_management_w.git

parent: e9ae6c66 | patch | commit | ignore whitespace

Administrator

2022-05-16 9869430984ab7bf8920cdb33dc77adcf03748f06

ftp path 路径修改

3 files modified

	src/main/java/org/springblade/modules/FTP/Monitor.java	38 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/system/controller/UserController.java	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-test.yml	24 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/org/springblade/modules/FTP/Monitor.java

@@ -12,7 +12,6 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.SocketException;
import java.net.URLEncoder;
import java.util.List;

import static org.springblade.common.config.FtpConfig.*;
@@ -24,8 +23,6 @@
 */
@Component
public class Monitor {



    /**
     * 读取文件（用户对象）单用户新增
@@ -55,10 +52,9 @@

            // 设置编码格式
            ftp.setControlEncoding("GBK");
            System.out.println("ftpPathIn = " + ftpPathIn);
            //转移到FTP服务器目录，检验文件是否存在
//            boolean ftpFile = ftp.changeWorkingDirectory(ftpPathIn);
//            System.out.println("检验文件是否存在 = " + ftpFile);
            // 检验文件是否存在
            boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
            System.out.println("检验文件是否存在 = " + ftpFile);
            FTPFile[] files = ftp.listFiles();
            System.out.println("files = " + files);
            System.out.println("开始读取内网回传消息");
@@ -76,14 +72,14 @@
                    if (substring1.equals("n")){
                        System.out.println("-------接收到内网回传的文件： " + substring1);
                        //把文件下载到本地
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
                        // 解析数据
                        String s = OutJson.TestJson(fileName);
                        //数据处理
                        Result result = DataHandler.handler(s,uuid);
                        //删除本地文件
                        MysqlCenlint.deletess(fileName);
                        FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
                        FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
                        is.close();
                        ftp.completePendingCommand();
                        if (result.getCode()==200) {
@@ -151,7 +147,7 @@
            ftp.setControlEncoding("GBK");

            // 检验文件是否存在
            ftp.changeWorkingDirectory(ftpPathIn);
            ftp.changeWorkingDirectory(ftpPath);
            FTPFile[] files = ftp.listFiles();
            if (files.length==0){
                return new Result(400,null,"未读取到文件",null);
@@ -162,7 +158,7 @@
                    String substring1 = fileName.substring(0, 2);
                    if (substring1.equals("nl")){
                        //把文件下载到本地
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
                        // 解析数据
                        String s = OutJson.TestJson(fileName);
                        //数据处理
@@ -172,7 +168,7 @@
                            //删除本地文件
                            MysqlCenlint.deletess(fileName);
                            //删除 ftp 文件
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
                            //返回
                            return result;
                        }
@@ -226,7 +222,7 @@
            ftp.setControlEncoding("GBK");

            // 检验文件是否存在
            ftp.changeWorkingDirectory(ftpPathIn);
            ftp.changeWorkingDirectory(ftpPath);
            FTPFile[] files = ftp.listFiles();
            if (files.length==0){
                return new Result(400,null,"未读取到文件",null);
@@ -237,7 +233,7 @@
                    String substring1 = fileName.substring(0, 2);
                    if (substring1.equals("nt")){
                        //把文件下载到本地
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
                        // 解析数据
                        String s = OutJson.TestJson(fileName);
                        //数据处理
@@ -247,7 +243,7 @@
                            //删除本地文件
                            MysqlCenlint.deletess(fileName);
                            //删除 ftp 文件
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
                            //返回
                            return result;
                        }
@@ -299,7 +295,7 @@
            ftp.setControlEncoding("GBK");

            // 检验文件是否存在
            ftp.changeWorkingDirectory(ftpPathIn);
            ftp.changeWorkingDirectory(ftpPath);
            FTPFile[] files = ftp.listFiles();
            if (files.length==0){
                return false;
@@ -314,7 +310,7 @@
                        String substring1 = fileName.substring(0, 4);
                        if (substring1.equals("nsql")) {
                            //把文件下载到本地
                            FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
                            FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
                            //
                            String s = OutJson.TestJson(fileName);
                            //sql语句
@@ -340,7 +336,7 @@
                            //删除本地服务器文件
                            MysqlCenlint.deletess(fileName);
                            //删除 ftp 服务器文件
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
                        }
                        //关闭流
                        is.close();
@@ -393,7 +389,7 @@
            ftp.setControlEncoding("GBK");

            // 检验文件是否存在
            ftp.changeWorkingDirectory(ftpPathIn);
            ftp.changeWorkingDirectory(ftpPath);
            FTPFile[] files = ftp.listFiles();
            if (files.length==0){
                return new Result(400,null,"未读取到文件",null);
@@ -404,7 +400,7 @@
                    String substring1 = fileName.substring(0, 2);
                    if (substring1.equals("ns")){
                        //把文件下载到本地
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
                        FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
                        // 解析数据
                        String s = OutJson.TestJson(fileName);
                        //数据处理
@@ -414,7 +410,7 @@
                            //删除本地文件
                            MysqlCenlint.deletess(fileName);
                            //删除 ftp 文件
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
                            //返回
                            return result;
                        }

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -1624,7 +1624,7 @@
        //调用ftp获取返回数据
        while (true){
            System.out.println("用户新增开始接收消息......................");
            Thread.sleep(1000);
            Thread.sleep(30000);
            //调用ftp获取返回数据
            result = Monitor.isFTPFileExist(uuid);
            //如果返回true,就退处
@@ -1644,7 +1644,7 @@
                //计数
                count++;
                //如果超过10s 没有读取到，则退出
                if (count == 30) {
                if (count == 10) {
                    break;
                }
            }

 src/main/resources/application-test.yml

@@ -13,9 +13,9 @@
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: jdbc:mysql://36.134.81.48:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: jfpt123
    password: ZHba@0112
    # rabbitmq 设置
#  rabbitmq:
#    host: 192.168.0.191
@@ -55,22 +55,20 @@

#ftp 设置
ftp:
  sqlConnect: jdbc:mysql://36.134.81.48:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 192.168.0.198
  sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 117.40.91.118
  ftpPort: 21
  ftpUserName: arsn
  ftpPassword: 123456
  ftpUserNameIn: arsn
  ftpPasswordIn: 123456
  ftpUserName: zhbain
  ftpPassword: zhbain@123
  ftpUserNameIn: baftpout
  ftpPasswordIn: baftpout
  ftpPath: anbao/
  ftpPathIn: anbao/
#  localPath: E:\\anbao\\
  localPath: /home/zhongsong/anbao/
  localPath: E:\\anbao\\
  ip: http://61.131.136.25:2081
#  jsonUrl: E:\\anbao\\
  jsonUrl: /home/zhongsong/anbao/
  jsonUrl: E:\\anbao\\
  username: root
  password: jfpt123
  password: ZHba@0112
  qfqkBaseApiUrl: http://localhost:83
#  qfqkBaseApiUrl : http://61.131.136.25:2082/api

			@@ -12,7 +12,6 @@
			import java.io.InputStream;
			import java.io.UnsupportedEncodingException;
			import java.net.SocketException;
			import java.net.URLEncoder;
			import java.util.List;

			import static org.springblade.common.config.FtpConfig.*;
			@@ -24,8 +23,6 @@
			*/
			@Component
			public class Monitor {



			/**
			* 读取文件（用户对象）单用户新增
			@@ -55,10 +52,9 @@

			// 设置编码格式
			ftp.setControlEncoding("GBK");
			System.out.println("ftpPathIn = " + ftpPathIn);
			//转移到FTP服务器目录，检验文件是否存在
			// boolean ftpFile = ftp.changeWorkingDirectory(ftpPathIn);
			// System.out.println("检验文件是否存在 = " + ftpFile);
			// 检验文件是否存在
			boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
			System.out.println("检验文件是否存在 = " + ftpFile);
			FTPFile[] files = ftp.listFiles();
			System.out.println("files = " + files);
			System.out.println("开始读取内网回传消息");
			@@ -76,14 +72,14 @@
			if (substring1.equals("n")){
			System.out.println("-------接收到内网回传的文件： " + substring1);
			//把文件下载到本地
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
			// 解析数据
			String s = OutJson.TestJson(fileName);
			//数据处理
			Result result = DataHandler.handler(s,uuid);
			//删除本地文件
			MysqlCenlint.deletess(fileName);
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
			is.close();
			ftp.completePendingCommand();
			if (result.getCode()==200) {
			@@ -151,7 +147,7 @@
			ftp.setControlEncoding("GBK");

			// 检验文件是否存在
			ftp.changeWorkingDirectory(ftpPathIn);
			ftp.changeWorkingDirectory(ftpPath);
			FTPFile[] files = ftp.listFiles();
			if (files.length==0){
			return new Result(400,null,"未读取到文件",null);
			@@ -162,7 +158,7 @@
			String substring1 = fileName.substring(0, 2);
			if (substring1.equals("nl")){
			//把文件下载到本地
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
			// 解析数据
			String s = OutJson.TestJson(fileName);
			//数据处理
			@@ -172,7 +168,7 @@
			//删除本地文件
			MysqlCenlint.deletess(fileName);
			//删除 ftp 文件
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
			//返回
			return result;
			}
			@@ -226,7 +222,7 @@
			ftp.setControlEncoding("GBK");

			// 检验文件是否存在
			ftp.changeWorkingDirectory(ftpPathIn);
			ftp.changeWorkingDirectory(ftpPath);
			FTPFile[] files = ftp.listFiles();
			if (files.length==0){
			return new Result(400,null,"未读取到文件",null);
			@@ -237,7 +233,7 @@
			String substring1 = fileName.substring(0, 2);
			if (substring1.equals("nt")){
			//把文件下载到本地
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
			// 解析数据
			String s = OutJson.TestJson(fileName);
			//数据处理
			@@ -247,7 +243,7 @@
			//删除本地文件
			MysqlCenlint.deletess(fileName);
			//删除 ftp 文件
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
			//返回
			return result;
			}
			@@ -299,7 +295,7 @@
			ftp.setControlEncoding("GBK");

			// 检验文件是否存在
			ftp.changeWorkingDirectory(ftpPathIn);
			ftp.changeWorkingDirectory(ftpPath);
			FTPFile[] files = ftp.listFiles();
			if (files.length==0){
			return false;
			@@ -314,7 +310,7 @@
			String substring1 = fileName.substring(0, 4);
			if (substring1.equals("nsql")) {
			//把文件下载到本地
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
			//
			String s = OutJson.TestJson(fileName);
			//sql语句
			@@ -340,7 +336,7 @@
			//删除本地服务器文件
			MysqlCenlint.deletess(fileName);
			//删除 ftp 服务器文件
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
			}
			//关闭流
			is.close();
			@@ -393,7 +389,7 @@
			ftp.setControlEncoding("GBK");

			// 检验文件是否存在
			ftp.changeWorkingDirectory(ftpPathIn);
			ftp.changeWorkingDirectory(ftpPath);
			FTPFile[] files = ftp.listFiles();
			if (files.length==0){
			return new Result(400,null,"未读取到文件",null);
			@@ -404,7 +400,7 @@
			String substring1 = fileName.substring(0, 2);
			if (substring1.equals("ns")){
			//把文件下载到本地
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
			FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
			// 解析数据
			String s = OutJson.TestJson(fileName);
			//数据处理
			@@ -414,7 +410,7 @@
			//删除本地文件
			MysqlCenlint.deletess(fileName);
			//删除 ftp 文件
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
			//返回
			return result;
			}

			@@ -1624,7 +1624,7 @@
			//调用ftp获取返回数据
			while (true){
			System.out.println("用户新增开始接收消息......................");
			Thread.sleep(1000);
			Thread.sleep(30000);
			//调用ftp获取返回数据
			result = Monitor.isFTPFileExist(uuid);
			//如果返回true,就退处
			@@ -1644,7 +1644,7 @@
			//计数
			count++;
			//如果超过10s 没有读取到，则退出
			if (count == 30) {
			if (count == 10) {
			break;
			}
			}

			@@ -13,9 +13,9 @@
			# commandTimeout: 5000
			datasource:
			# MySql
			url: jdbc:mysql://36.134.81.48:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			url: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			username: root
			password: jfpt123
			password: ZHba@0112
			# rabbitmq 设置
			# rabbitmq:
			# host: 192.168.0.191
			@@ -55,22 +55,20 @@

			#ftp 设置
			ftp:
			sqlConnect: jdbc:mysql://36.134.81.48:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			ftpHost: 192.168.0.198
			sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
			ftpHost: 117.40.91.118
			ftpPort: 21
			ftpUserName: arsn
			ftpPassword: 123456
			ftpUserNameIn: arsn
			ftpPasswordIn: 123456
			ftpUserName: zhbain
			ftpPassword: zhbain@123
			ftpUserNameIn: baftpout
			ftpPasswordIn: baftpout
			ftpPath: anbao/
			ftpPathIn: anbao/
			# localPath: E:\\anbao\\
			localPath: /home/zhongsong/anbao/
			localPath: E:\\anbao\\
			ip: http://61.131.136.25:2081
			# jsonUrl: E:\\anbao\\
			jsonUrl: /home/zhongsong/anbao/
			jsonUrl: E:\\anbao\\
			username: root
			password: jfpt123
			password: ZHba@0112
			qfqkBaseApiUrl: http://localhost:83
			# qfqkBaseApiUrl : http://61.131.136.25:2082/api