From 8116db5008b9091e0698234c01a2b20fdf134e27 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 15:54:33 +0800
Subject: [PATCH] 修改ftp服务器
---
src/main/java/com/moral/controller/ScreenController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index a27864c..d273e98 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -7,6 +7,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.net.InetAddress;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -262,7 +263,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 +278,12 @@
ftpClient.login(userName, userPwd);
ftpClient.changeWorkingDirectory(path);
//ftpClient.enterRemotePassiveMode();
- ftpClient.enterLocalPassiveMode();
+ //ftpClient.enterLocalPassiveMode();
+ //ftpClient.enterLocalActiveMode();
+ //ftpClient.enterRemoteActiveMode(InetAddress.getByName(ip), port);
+
+
+ System.out.println("==================================================1");
InputStream ins = ftpClient.retrieveFileStream(fileName);
BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
String line;
@@ -295,6 +301,9 @@
ftpClient.logout();
ftpClient.disconnect();
}
+ System.out.println("==================================================2");
+ System.out.println(content);
+
SAXReader saxReader = new SAXReader();
Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
Element root = document.getRootElement();
@@ -306,6 +315,13 @@
}
return version;
}
+
+ public static void main(String[] args) {
+ ScreenController sc = new ScreenController();
+ Version a = sc.index();
+ System.out.println(a.getVer());
+ }
+
/**
* ������������
* ������
@@ -342,7 +358,7 @@
msg.append(" param[0] accountId:");
msg.append(accountId);
log.warn(msg);
- model.setViewName("401");
+ model.setViewName("403");
return model;
}
}
--
Gitblit v1.8.0