Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java

@@ -68,11 +68,11 @@ public class FileController {
         String path = request.getParameter("Path");
         try {
             //服务器发布
-            String coderPath = new String(path.getBytes("ISO8859_1"));
-            String newPath = new String(coderPath.getBytes("GBK"), FTPClient.DEFAULT_CONTROL_ENCODING);
-            in = ftpClient.getFtp(newPath);
+            //String coderPath = new String(path.getBytes("ISO8859_1"));
+            //String newPath = new String(coderPath.getBytes("GBK"), FTPClient.DEFAULT_CONTROL_ENCODING);
+            in = ftpClient.getFtp(path);
             if(null == in){
-                in = ftpClient.getFtp(new String(coderPath.getBytes("UTF-8"), FTPClient.DEFAULT_CONTROL_ENCODING));
+                in = ftpClient.getFtp(new String(path.getBytes("UTF-8"), FTPClient.DEFAULT_CONTROL_ENCODING));
             }
 
             //本地测试

common/src/main/java/com/foreverwin/mesnac/common/ftp/CappFtpClient.java

@@ -311,7 +311,7 @@ public class CappFtpClient {
      * @throws Exception
      */
     public InputStream getFtp(String path) throws Exception {
-        connect();
+        login();
         InputStream in = ftp.retrieveFileStream(path);
         return in;
     }

common/src/main/java/com/foreverwin/mesnac/common/service/impl/FileServiceImpl.java

@@ -12,7 +12,6 @@ import com.foreverwin.modular.core.util.CommonMethods;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -21,8 +20,6 @@ import java.util.Map;
 
 @Service
 public class FileServiceImpl implements FileService {
-    @Value("${cappftp.server}")
-    private String address;
     @Autowired
     private SfcService sfcService;
     @Autowired
@@ -47,7 +44,7 @@ public class FileServiceImpl implements FileService {
                 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,path+filename);
                     }
                 }
             }