From 386e880bf18811b69216392251b90ab2270b1843 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Wed, 31 Jan 2018 08:28:01 +0800 Subject: [PATCH] updated --- src/main/java/com/moral/controller/UpgradeController.java | 64 +++++++++++++++---------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/moral/controller/UpgradeController.java b/src/main/java/com/moral/controller/UpgradeController.java index d7c969b..33bf09c 100644 --- a/src/main/java/com/moral/controller/UpgradeController.java +++ b/src/main/java/com/moral/controller/UpgradeController.java @@ -22,41 +22,19 @@ 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()); - - version.setVer("a"); - version.setFileName("b"); - version.setFileMD5Hash("c"); - - return version; - } - - public String readFile(FTPClient ftpClient) { - InputStream ins = null; - StringBuilder builder = null; + FTPClient ftpClient = new FTPClient(); try { - ins = ftpClient.retrieveFileStream(fileName); + ftpClient.connect(ip, port); + ftpClient.login(userName, userPwd); + ftpClient.changeWorkingDirectory(path); + //ftpClient.enterRemotePassiveMode(); + ftpClient.enterLocalPassiveMode(); + InputStream ins = ftpClient.retrieveFileStream(fileName); BufferedReader reader = new BufferedReader(new InputStreamReader(ins,"utf-8")); String line; - builder = new StringBuilder(150); + StringBuilder builder = new StringBuilder(); while ((line = reader.readLine()) != null) { builder.append(line); } @@ -65,9 +43,29 @@ ins.close(); } ftpClient.getReply(); - } catch (IOException e) { + String content = builder.toString(); + if(ftpClient.isConnected()) { + ftpClient.logout(); + ftpClient.disconnect(); + } + 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()); + version.setFileMD5Hash(root.element("FileMD5Hash").getText()); + } catch (Exception e) { e.printStackTrace(); } - return builder.toString(); +// version.setVer("a"); +// version.setFileName("b"); +// version.setFileMD5Hash("c"); + return version; + } + + public static void main(String[] args) { + UpgradeController a = new UpgradeController(); + Version v = a.index(); + System.out.println(v.getVer()); } } -- Gitblit v1.8.0