From 4b2a3f23e97b0e8605398ae229339851fb42ef0e Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 17:13:45 +0800
Subject: [PATCH] 修改ftp服务器

---
 src/main/java/com/moral/controller/ScreenController.java |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index df485cd..4459a16 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -279,36 +279,36 @@
 //		FTPClient ftpClient = new FTPClient();
 		try {
 //			ftpClient.connect(ip, port);
-//			ftpClient.login(userName, userPwd);
-//			ftpClient.changeWorkingDirectory(path);
-//			//ftpClient.enterRemotePassiveMode();
-//			//ftpClient.enterLocalPassiveMode();
-//			ftpClient.enterLocalActiveMode();
-//			//ftpClient.enterRemoteActiveMode(InetAddress.getByName(ip), port);
-//
-//			InputStream ins = ftpClient.retrieveFileStream(fileName);
-//			BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
-//			String line;
-//			StringBuilder builder = new StringBuilder();
-//			while ((line = reader.readLine()) != null) {
-//				builder.append(line);
-//			}
-//			reader.close();
-//			if (ins != null) {
-//				ins.close();
-//			}
-//			ftpClient.getReply();
-//			String content = builder.toString();
-//			if(ftpClient.isConnected()) {
-//				ftpClient.logout();
-//				ftpClient.disconnect();
-//			}
+////			ftpClient.login(userName, userPwd);
+////			ftpClient.changeWorkingDirectory(path);
+////			//ftpClient.enterRemotePassiveMode();
+////			//ftpClient.enterLocalPassiveMode();
+////			ftpClient.enterLocalActiveMode();
+////			//ftpClient.enterRemoteActiveMode(InetAddress.getByName(ip), port);
+////
+////			InputStream ins = ftpClient.retrieveFileStream(fileName);
+////			BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
+////			String line;
+////			StringBuilder builder = new StringBuilder();
+////			while ((line = reader.readLine()) != null) {
+////				builder.append(line);
+////			}
+////			reader.close();
+////			if (ins != null) {
+////				ins.close();
+////			}
+////			ftpClient.getReply();
+////			String content = builder.toString();
+////			if(ftpClient.isConnected()) {
+////				ftpClient.logout();
+////				ftpClient.disconnect();
+////			}
 
 			URL realUrl = new URL(urlStr);
 			URLConnection connection = realUrl.openConnection();
 			connection.connect();
 			StringBuffer result = new StringBuffer();
-			BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+			BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
 			String line;
 			while ((line = in.readLine()) != null) {
 				result.append(line);

--
Gitblit v1.8.0