From 187893818ceee84b81e40a2354e33154080c0631 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Thu, 16 Sep 2021 13:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=BA=B8=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/service/impl/FileServiceImpl.java       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java
index 5c054925..0518032c 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java
@@ -35,19 +35,20 @@ public class FileServiceImpl implements FileService {
             throw new BaseException("未找到产品条码"+sfc);
         }
         String itemBo = sfcServiceById.getItemBo();
-        String path="/"+ StringUtil.trimHandle(itemBo)+"_"+StringUtil.trimRevision(itemBo);
+        String path="/"+ StringUtil.trimHandle(itemBo)+"_"+StringUtil.trimRevision(itemBo)+"/";
         FTPClient connect = null;
         Map<String,String> pathMap = new HashMap<>();
         try {
             connect = cappFtpClient.connect();
             //更换目录到当前目录
+            connect.enterLocalPassiveMode();
             connect.changeWorkingDirectory(path);
             FTPFile[] files = connect.listFiles();
             if(files!=null){
                 for (int i = 0; i < files.length; i++) {
                     if(files[i].isFile()){
                         String filename=files[i].getName();
-                        pathMap.put(filename,address+path+"/"+filename);
+                        pathMap.put(filename,address+path+filename);
                     }
                 }
             }
@@ -55,7 +56,8 @@ public class FileServiceImpl implements FileService {
         }catch (Exception e){
             ExceptionUtil.throwException(e);
         }finally {
-            if (connect!=null){
+            if (connect!=null&&connect.isConnected()){
+                connect.logout();
                 connect.disconnect();
             }
         }