From 1a68e172ec40964b34ad41991305400a61923450 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 22:41:51 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/controller/UpgradeController.java | 44 ++++++++++++++++----------------------------
1 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/moral/controller/UpgradeController.java b/src/main/java/com/moral/controller/UpgradeController.java
index 93e4ab8..97e1c1f 100644
--- a/src/main/java/com/moral/controller/UpgradeController.java
+++ b/src/main/java/com/moral/controller/UpgradeController.java
@@ -28,16 +28,27 @@
try {
ftpClient.connect(ip, port);
ftpClient.login(userName, userPwd);
- if (path != null && path.length() > 0) {
- ftpClient.changeWorkingDirectory(path);
+ ftpClient.changeWorkingDirectory(path);
+ ftpClient.enterRemotePassiveMode();
+ InputStream ins = ftpClient.retrieveFileStream(fileName);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
+ String line;
+ StringBuilder builder = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
}
- String content = readFile(ftpClient);
+ reader.close();
+ if (ins != null) {
+ ins.close();
+ }
+ ftpClient.getReply();
+ String content = builder.toString();
if(ftpClient.isConnected()) {
ftpClient.logout();
ftpClient.disconnect();
}
- SAXReader reader = new SAXReader();
- Document document = reader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
+ SAXReader saxReader = new SAXReader();
+ Document document = saxReader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
Element root = document.getRootElement();
version.setVer(root.element("Ver").getText());
version.setFileName(root.element("FileName").getText());
@@ -48,29 +59,6 @@
// version.setVer("a");
// version.setFileName("b");
// version.setFileMD5Hash("c");
-
return version;
- }
-
- public String readFile(FTPClient ftpClient) {
- InputStream ins = null;
- StringBuilder builder = null;
- try {
- ins = ftpClient.retrieveFileStream(fileName);
- BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8"));
- String line;
- builder = new StringBuilder(150);
- while ((line = reader.readLine()) != null) {
- builder.append(line);
- }
- reader.close();
- if (ins != null) {
- ins.close();
- }
- ftpClient.getReply();
- } catch (IOException e) {
- e.printStackTrace();
- }
- return builder.toString();
}
}
--
Gitblit v1.8.0