From a20095a98a3b968b10b390ba7b9ba99c2ddbd4d0 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 31 Jan 2018 09:01:55 +0800
Subject: [PATCH] updated
---
/dev/null | 71 -----------------------
src/main/java/com/moral/controller/ScreenController.java | 64 ++++++++++++++++++--
2 files changed, 56 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8765b4d..6a1e617 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -5,8 +5,7 @@
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -14,14 +13,14 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.moral.common.xml.Version;
+import org.apache.commons.net.ftp.FTPClient;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONReader;
@@ -33,6 +32,7 @@
import com.moral.service.DeviceService;
import com.moral.service.HistoryService;
import com.moral.service.MachineActivateService;
+import org.xml.sax.InputSource;
/**
* The Class ScreenController.������������
@@ -213,4 +213,52 @@
return new ResultBean<Integer>(result);
}
+ /*********************************************
+ * ������������������������������������
+ *********************************************/
+ private String fileName = "Version.xml";
+ private String ip = "121.40.92.176";
+ private String userName = "ftp_user";
+ private String userPwd = "qwer1234";
+ private int port = 21;
+ private String path = "/";
+
+ @RequestMapping(value = "/upgrade", method = RequestMethod.GET)
+ public Version index() {
+ Version version = new Version();
+ FTPClient ftpClient = new FTPClient();
+ try {
+ 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;
+ StringBuilder builder = new StringBuilder();
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
+ }
+ reader.close();
+ if (ins != null) {
+ ins.close();
+ }
+ ftpClient.getReply();
+ 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 version;
+ }
}
diff --git a/src/main/java/com/moral/controller/UpgradeController.java b/src/main/java/com/moral/controller/UpgradeController.java
deleted file mode 100644
index 33bf09c..0000000
--- a/src/main/java/com/moral/controller/UpgradeController.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.moral.controller;
-
-import com.moral.common.xml.Version;
-import org.apache.commons.net.ftp.FTPClient;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.springframework.web.bind.annotation.*;
-import org.xml.sax.InputSource;
-import java.io.*;
-
-@RestController
-@RequestMapping("upgrade")
-@CrossOrigin(origins = "*", maxAge = 3600)
-public class UpgradeController {
-
- private String fileName = "Version.xml";
- private String ip = "121.40.92.176";
- private String userName = "ftp_user";
- private String userPwd = "qwer1234";
- private int port = 21;
- private String path = "/";
-
- @RequestMapping(value = "/index", method = RequestMethod.GET)
- public Version index() {
- Version version = new Version();
- FTPClient ftpClient = new FTPClient();
- try {
- 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;
- StringBuilder builder = new StringBuilder();
- while ((line = reader.readLine()) != null) {
- builder.append(line);
- }
- reader.close();
- if (ins != null) {
- ins.close();
- }
- ftpClient.getReply();
- 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();
- }
-// 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