From affe4139290946f97f6ac2852ddae5d6dcecb9ed Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 17:31:32 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/controller/UpgradeController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/controller/UpgradeController.java b/src/main/java/com/moral/controller/UpgradeController.java
index 64b3b52..f590f8c 100644
--- a/src/main/java/com/moral/controller/UpgradeController.java
+++ b/src/main/java/com/moral/controller/UpgradeController.java
@@ -1,6 +1,7 @@
package com.moral.controller;
import org.apache.commons.net.ftp.FTPClient;
+import org.springframework.security.access.method.P;
import org.springframework.web.bind.annotation.*;
import java.io.BufferedReader;
@@ -13,7 +14,6 @@
@CrossOrigin(origins = "*", maxAge = 3600)
public class UpgradeController {
- private FTPClient ftpClient;
private String fileName = "Version.xml";
private String ip = "121.40.92.176";
private String userName = "ftp_user";
@@ -23,7 +23,7 @@
@RequestMapping(value = "/index", method = RequestMethod.GET)
public String index() throws IOException {
- ftpClient = new FTPClient();
+ FTPClient ftpClient = new FTPClient();
try {
ftpClient.connect(ip, port);
ftpClient.login(userName, userPwd);
@@ -32,14 +32,16 @@
}
} catch (Exception e) {
e.printStackTrace();
- } finally {
+ }
+ String content = readFile(ftpClient);
+ if(ftpClient.isConnected()) {
ftpClient.logout();
ftpClient.disconnect();
}
- return readFile();
+ return content;
}
- public String readFile() {
+ public String readFile(FTPClient ftpClient) {
InputStream ins = null;
StringBuilder builder = null;
try {
--
Gitblit v1.8.0