From 69b69b4c90b66a4b82dee7da6c63f835c10caef3 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 21:40:45 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/controller/ScreenController.java | 69 ++++++++++++++++------------------
1 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 4459a16..5957588 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -271,49 +271,46 @@
private int port = 21;
private String path = "/";
- private String urlStr = "http://www.7drlb.com/apps/Version.xml";
-
@RequestMapping(value = "/upgrade", method = RequestMethod.GET)
public Version index() {
Version version = new Version();
-// FTPClient ftpClient = new FTPClient();
+ 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.connect(ip, port);
+ ftpClient.login(userName, userPwd);
+ ftpClient.changeWorkingDirectory(path);
+ ftpClient.enterLocalPassiveMode();
+ //ftpClient.enterLocalActiveMode();
- URL realUrl = new URL(urlStr);
- URLConnection connection = realUrl.openConnection();
- connection.connect();
- StringBuffer result = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
+ InputStream ins = ftpClient.retrieveFileStream(fileName);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
String line;
- while ((line = in.readLine()) != null) {
- result.append(line);
+ StringBuilder builder = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
}
- String content = result.toString();
+ reader.close();
+ if (ins != null) {
+ ins.close();
+ }
+ ftpClient.getReply();
+ String content = builder.toString();
+ if(ftpClient.isConnected()) {
+ ftpClient.logout();
+ ftpClient.disconnect();
+ }
+
+// String urlStr = "http://www.7drlb.com/apps/Version.xml";
+// URL realUrl = new URL(urlStr);
+// URLConnection connection = realUrl.openConnection();
+// connection.connect();
+// StringBuffer result = new StringBuffer();
+// BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
+// String line;
+// while ((line = in.readLine()) != null) {
+// result.append(line);
+// }
+// String content = result.toString();
SAXReader saxReader = new SAXReader();
Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
--
Gitblit v1.8.0