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

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 472d30c..8977d39 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -7,6 +7,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -276,8 +277,10 @@
 			ftpClient.connect(ip, port);
 			ftpClient.login(userName, userPwd);
 			ftpClient.changeWorkingDirectory(path);
-			ftpClient.enterRemotePassiveMode();
+			//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;
@@ -295,6 +298,9 @@
 				ftpClient.logout();
 				ftpClient.disconnect();
 			}
+			System.out.println("==================================================");
+			System.out.println(content);
+
 			SAXReader saxReader = new SAXReader();
 			Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
 			Element root = document.getRootElement();
@@ -306,6 +312,13 @@
 		}
 		return version;
 	}
+
+	public static void main(String[] args) {
+		ScreenController sc = new ScreenController();
+		Version a = sc.index();
+		System.out.println(a.getVer());
+	}
+
 	/**
 	 * ������������
 	 * ������

--
Gitblit v1.8.0