From 568025796c345fe0fdb7daf90b0d0f01f73ab9fc Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 21 Aug 2021 09:19:30 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/information/controller/InformationController.java |   51 +++++++++------------------------------------------
 1 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index a55c9ec..2d14353 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -18,15 +18,12 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.google.gson.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import com.alibaba.fastjson.JSON;
 import org.springblade.common.cache.DictCache;
 import org.springblade.common.enums.DictEnum;
-import org.springblade.common.utils.FtpUtil;
-import org.springblade.common.utils.OutJson;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -34,6 +31,8 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
+import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.FTP.OutJson;
 import org.springblade.modules.information.entity.Information;
 import org.springblade.modules.information.excel.InforExcel;
 import org.springblade.modules.information.excel.InforImporter;
@@ -346,49 +345,17 @@
 		//ftp服务器密码
 		String ftpPassword = "Yly@123";
 		//ftp服务器路径
-		String ftpPath = "";
+		String ftpPath = "anbao/sql.json";
 		//本地路径
 		String localPath = "D:\\anbao";
 		//文件名
 		String fileName = "sql.json";
-		FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
-		String s = TestJson();
-		System.out.println(s);
-	}
-
-
-	public static String TestJson(){
-		File file = new File("D:\\anbao\\sql.json");
-		StringBuilder localStrBulider = new StringBuilder();
-		if(file.isFile() && file.exists()) {
-			try {
-				InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(file), "utf-8");
-				BufferedReader bufferReader = new BufferedReader(inputStreamReader);
-				String lineStr = null;
-				try {
-					while((lineStr = bufferReader.readLine()) != null) {
-						localStrBulider.append(lineStr);
-					}
-					bufferReader.close();
-					inputStreamReader.close();
-				} catch (IOException e) {
-					// TODO Auto-generated catch block
-					System.out.println("file read error!");
-					e.printStackTrace();
-				}
-			} catch (UnsupportedEncodingException e) {
-				// TODO Auto-generated catch block
-				System.out.println("file catch unsupported encoding!");
-				e.printStackTrace();
-			} catch (FileNotFoundException e) {
-				// TODO Auto-generated catch block
-				System.out.println("file not found!");
-				e.printStackTrace();
-			}
-		}else {
-			System.out.println("file is not a file or file is not existing!");
-		}
-		return  localStrBulider.toString();
+//		FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+		String s = OutJson.TestJson();
+		String sql = OutJson.stringReplace(s);
+		System.out.println(sql);
+		//boolean ftpFileExist = FtpUtil.isFTPFileExist(ftpPath, ftpUserName, ftpPassword, ftpHost, ftpPort);
+		//System.out.println(ftpFileExist);
 	}
 
 

--
Gitblit v1.9.3