From 33063809e45b2e3d6fbcf12a4796731b3507d9f1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 22:33:24 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/controller/UpgradeController.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/moral/controller/UpgradeController.java b/src/main/java/com/moral/controller/UpgradeController.java
index 2377aaf..93e4ab8 100644
--- a/src/main/java/com/moral/controller/UpgradeController.java
+++ b/src/main/java/com/moral/controller/UpgradeController.java
@@ -22,26 +22,29 @@
private String path = "/";
@RequestMapping(value = "/index", method = RequestMethod.GET)
- public Version index() throws Exception {
- FTPClient ftpClient = new FTPClient();
- ftpClient.connect(ip, port);
- ftpClient.login(userName, userPwd);
- if (path != null && path.length() > 0) {
- ftpClient.changeWorkingDirectory(path);
- }
- String content = readFile(ftpClient);
- if(ftpClient.isConnected()) {
- ftpClient.logout();
- ftpClient.disconnect();
- }
- SAXReader reader = new SAXReader();
- Document document = reader.read(new InputSource(new ByteArrayInputStream(content.getBytes("utf-8"))));
- Element root = document.getRootElement();
+ public Version index() {
Version version = new Version();
- version.setVer(root.element("Ver").getText());
- version.setFileName(root.element("FileName").getText());
- version.setFileMD5Hash(root.element("FileMD5Hash").getText());
-
+ FTPClient ftpClient = new FTPClient();
+ try {
+ ftpClient.connect(ip, port);
+ ftpClient.login(userName, userPwd);
+ if (path != null && path.length() > 0) {
+ ftpClient.changeWorkingDirectory(path);
+ }
+ String content = readFile(ftpClient);
+ if(ftpClient.isConnected()) {
+ ftpClient.logout();
+ ftpClient.disconnect();
+ }
+ SAXReader reader = new SAXReader();
+ Document document = reader.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());
+ version.setFileMD5Hash(root.element("FileMD5Hash").getText());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
// version.setVer("a");
// version.setFileName("b");
// version.setFileMD5Hash("c");
--
Gitblit v1.8.0