From f7d1181267e4643534370cf67ddd1b013599f03f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 15:29:25 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/controller/ScreenController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 7adfbde..4403fbb 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;
@@ -277,7 +277,8 @@
ftpClient.login(userName, userPwd);
ftpClient.changeWorkingDirectory(path);
//ftpClient.enterRemotePassiveMode();
- ftpClient.enterLocalPassiveMode();
+ //ftpClient.enterLocalPassiveMode();
+ ftpClient.enterLocalActiveMode();
InputStream ins = ftpClient.retrieveFileStream(fileName);
BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
String line;
@@ -306,6 +307,12 @@
}
return version;
}
+
+ public static void main(String[] args) {
+ ScreenController sc = new ScreenController();
+ sc.index();
+ }
+
/**
* ������������
* ������
@@ -342,7 +349,7 @@
msg.append(" param[0] accountId:");
msg.append(accountId);
log.warn(msg);
- model.setViewName("401");
+ model.setViewName("403");
return model;
}
}
@@ -456,7 +463,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);
@@ -468,9 +477,7 @@
}
}
Map pieData = alarmService.getPieData(parameters);
-
List<Map<String, Object>> list = (List<Map<String, Object>>) pieData.get(sensorKey);
-
return new ResultBean<List<Map<String, Object>>>(list);
}
}
--
Gitblit v1.8.0