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 | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 08c5c2f..5957588 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -7,6 +7,9 @@
import java.io.ByteArrayInputStream;
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;
@@ -262,7 +265,7 @@
* ������������������������������������
*********************************************/
private String fileName = "Version.xml";
- private String ip = "121.40.92.176";
+ private String ip = "47.96.19.115";
private String userName = "ftp_user";
private String userPwd = "qwer1234";
private int port = 21;
@@ -276,8 +279,9 @@
ftpClient.connect(ip, port);
ftpClient.login(userName, userPwd);
ftpClient.changeWorkingDirectory(path);
- //ftpClient.enterRemotePassiveMode();
ftpClient.enterLocalPassiveMode();
+ //ftpClient.enterLocalActiveMode();
+
InputStream ins = ftpClient.retrieveFileStream(fileName);
BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
String line;
@@ -295,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();
@@ -306,6 +323,13 @@
}
return version;
}
+
+ public static void main(String[] args) {
+ ScreenController sc = new ScreenController();
+ Version a = sc.index();
+ System.out.println(a.getVer());
+ }
+
/**
* ������������
* ������
@@ -456,7 +480,9 @@
Map<String, Object> parameters = getParametersStartingWith(request, null);
parameters.put("type", "month");
String sensorKey = "list";
- if (!ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+ if (ObjectUtils.isEmpty(parameters.get("sensorKey"))) {
+ parameters.put("description", "description");
+ } else {
sensorKey = parameters.remove("sensorKey").toString();
List<String> sensorKeys = new ArrayList<String>();
sensorKeys.add(sensorKey);
--
Gitblit v1.8.0