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

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

diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 08c5c2f..472d30c 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -262,7 +262,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 +276,8 @@
 			ftpClient.connect(ip, port);
 			ftpClient.login(userName, userPwd);
 			ftpClient.changeWorkingDirectory(path);
-			//ftpClient.enterRemotePassiveMode();
-			ftpClient.enterLocalPassiveMode();
+			ftpClient.enterRemotePassiveMode();
+			//ftpClient.enterLocalPassiveMode();
 			InputStream ins = ftpClient.retrieveFileStream(fileName);
 			BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
 			String line;
@@ -456,7 +456,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