From d9c030de697596cd1b4c7ca5b46d1bd0351e52bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= Date: Thu, 10 May 2018 22:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=96=87=E4=BB=B6=E6=93=8D=E4=BD=9C=E7=9A=84=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fjy/spring/controller/DownLoadController.java | 6 ++---- .../java/com/fjy/spring/controller/UpLoadController.java | 8 -------- .../java/com/fjy/spring/properties/FtpProperties.java | 2 +- .../fjy/spring/properties/RemoteExecuteProperties.java | 1 + src/main/java/com/fjy/spring/untils/FtpOperationUtil.java | 1 + .../com/fjy/spring/untils/RemoteExecuteCommandUtil.java | 6 ++++-- src/main/resources/application-dev.yml | 5 +++-- .../fjy/spring/untils/RemoteExecuteCommandUtilTest.java | 2 +- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/fjy/spring/controller/DownLoadController.java b/src/main/java/com/fjy/spring/controller/DownLoadController.java index 96d6857..866f37b 100644 --- a/src/main/java/com/fjy/spring/controller/DownLoadController.java +++ b/src/main/java/com/fjy/spring/controller/DownLoadController.java @@ -170,10 +170,8 @@ public class DownLoadController { try { FtpOperationUtil ftpUtil = new FtpOperationUtil(); - long fileLength = new File(downLoadPath).length(); response.setContentType("application/x-msdownload;"); response.setHeader("Content-disposition", "attachment; filename=" + new String(tbFile.getColfilename().getBytes("utf-8"), "ISO8859-1")); - response.setHeader("Content-Length", String.valueOf(fileLength)); ftpUtil.connectServer(); List list = ftpUtil.getFileList("/"); @@ -352,7 +350,8 @@ public class DownLoadController { RemoteExecuteCommandUtil rec = new RemoteExecuteCommandUtil( remoteExecuteProperties.getIp(), remoteExecuteProperties.getUser(), - remoteExecuteProperties.getPassword()); + remoteExecuteProperties.getPassword(), + remoteExecuteProperties.getPort()); rec.login(); //登录FTP FtpOperationUtil ftpOperationUtil = new FtpOperationUtil(); @@ -372,7 +371,6 @@ public class DownLoadController { response.setContentType("application/x-msdownload;"); response.setHeader("Content-disposition", "attachment; filename=" + new String(zipFileName.getBytes("utf-8"), "ISO8859-1")); - InputStream inputStream = ftpOperationUtil.downFile("/zip/",zipFileName); System.out.println("【available】" + inputStream.available()); //将打包好的文件输出到客户端 diff --git a/src/main/java/com/fjy/spring/controller/UpLoadController.java b/src/main/java/com/fjy/spring/controller/UpLoadController.java index a62ef9b..25fa9b8 100644 --- a/src/main/java/com/fjy/spring/controller/UpLoadController.java +++ b/src/main/java/com/fjy/spring/controller/UpLoadController.java @@ -269,14 +269,6 @@ public class UpLoadController { } catch (IOException e) { e.printStackTrace(); } - - if (!targetFile.exists()) { - try { - targetFile.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } } } diff --git a/src/main/java/com/fjy/spring/properties/FtpProperties.java b/src/main/java/com/fjy/spring/properties/FtpProperties.java index b89956a..741f377 100644 --- a/src/main/java/com/fjy/spring/properties/FtpProperties.java +++ b/src/main/java/com/fjy/spring/properties/FtpProperties.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; @Data public class FtpProperties { //服务器地址名称 - private String server = "192.168.79.138"; + private String server = "176.122.138.235"; //端口号 private int port = 21; //用户名称 diff --git a/src/main/java/com/fjy/spring/properties/RemoteExecuteProperties.java b/src/main/java/com/fjy/spring/properties/RemoteExecuteProperties.java index 8ce6f9c..ad7ed26 100644 --- a/src/main/java/com/fjy/spring/properties/RemoteExecuteProperties.java +++ b/src/main/java/com/fjy/spring/properties/RemoteExecuteProperties.java @@ -16,4 +16,5 @@ public class RemoteExecuteProperties { private String user; private String password; private String path; + private int port; } diff --git a/src/main/java/com/fjy/spring/untils/FtpOperationUtil.java b/src/main/java/com/fjy/spring/untils/FtpOperationUtil.java index 8f3b1d7..1e36652 100644 --- a/src/main/java/com/fjy/spring/untils/FtpOperationUtil.java +++ b/src/main/java/com/fjy/spring/untils/FtpOperationUtil.java @@ -330,6 +330,7 @@ public class FtpOperationUtil { public String[] list(String path) throws IOException { String[] dirs = path.split("/"); ftpClient.changeWorkingDirectory("/"); + ftpClient.enterLocalPassiveMode(); for (int i = 1; dirs != null && i < dirs.length; i++) { dirs[i] = new String(dirs[i].getBytes("UTF-8"), "iso-8859-1"); ftpClient.changeWorkingDirectory(dirs[i]); diff --git a/src/main/java/com/fjy/spring/untils/RemoteExecuteCommandUtil.java b/src/main/java/com/fjy/spring/untils/RemoteExecuteCommandUtil.java index 43b6eb7..fcfe927 100644 --- a/src/main/java/com/fjy/spring/untils/RemoteExecuteCommandUtil.java +++ b/src/main/java/com/fjy/spring/untils/RemoteExecuteCommandUtil.java @@ -20,11 +20,13 @@ public class RemoteExecuteCommandUtil { private String ip; private String userName; private String userPwd; + private int port; - public RemoteExecuteCommandUtil(String ip, String userName, String userPwd) { + public RemoteExecuteCommandUtil(String ip, String userName, String userPwd,int port) { this.ip = ip; this.userName = userName; this.userPwd = userPwd; + this.port = port; } @@ -42,7 +44,7 @@ public class RemoteExecuteCommandUtil { public Boolean login(){ boolean flg=false; try { - conn = new Connection(ip); + conn = new Connection(ip,port); conn.connect();//连接 flg=conn.authenticateWithPassword(userName, userPwd);//认证 } catch (IOException e) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 5d06ed7..bc7408e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,9 +9,10 @@ serverproperties: port_num: 8080 filePath: F:\JAVA Workspace\Temp\ remoteproperties: - ip: 192.168.79.138 + ip: 176.122.138.235 + port: 26460 user: root - password: 27894869 + password: B171b0GsMCD8 path: /home/ftp/cms/ spring: thymeleaf: diff --git a/src/test/java/com/fjy/spring/untils/RemoteExecuteCommandUtilTest.java b/src/test/java/com/fjy/spring/untils/RemoteExecuteCommandUtilTest.java index 76f750b..0fe74dd 100644 --- a/src/test/java/com/fjy/spring/untils/RemoteExecuteCommandUtilTest.java +++ b/src/test/java/com/fjy/spring/untils/RemoteExecuteCommandUtilTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.*; public class RemoteExecuteCommandUtilTest { - RemoteExecuteCommandUtil rec=new RemoteExecuteCommandUtil("192.168.79.138", "root","27894869"); + RemoteExecuteCommandUtil rec=new RemoteExecuteCommandUtil("176.122.138.235", "root","B171b0GsMCD8",26460); @Test public void login() {