From 4686914dd93138d69e9280a88f24a51a711f52be Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 27 Apr 2018 09:01:57 +0800
Subject: [PATCH] 优化 报警数据查询
---
src/main/java/com/moral/controller/ScreenController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8ea576f..5957588 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -8,6 +8,8 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.InetAddress;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -277,10 +279,9 @@
ftpClient.connect(ip, port);
ftpClient.login(userName, userPwd);
ftpClient.changeWorkingDirectory(path);
- //ftpClient.enterRemotePassiveMode();
- //ftpClient.enterLocalPassiveMode();
+ 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;
@@ -298,6 +299,19 @@
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"))));
Element root = document.getRootElement();
@@ -312,7 +326,8 @@
public static void main(String[] args) {
ScreenController sc = new ScreenController();
- sc.index();
+ Version a = sc.index();
+ System.out.println(a.getVer());
}
/**
--
Gitblit v1.8.0