Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/EDI/XiahuozhiHelpler.cs

@@ -427,6 +427,8 @@ namespace Myshipping.Application.EDI
                 par.Add("username", ftpset.USERNAME);
                 par.Add("pwd", ftpset.PASSWORD);
                 par.Add("path", ftpset.FOLDERNAME);
+                par.Add("pasv", (!ftpset.FtpModeActive).ToString());
+
 
                 Log.Information($"准备请求发送ftp：{ftpSpiderUrl} ，参数：{par.ToJsonString()}，文件：{ediFileName}");
                 var res = FTPHelper.TransmitFtpFile(ftpSpiderUrl, par, new
@@ -531,6 +533,7 @@ namespace Myshipping.Application.EDI
                     par.Add("username", ftpset.USERNAME);
                     par.Add("pwd", ftpset.PASSWORD);
                     par.Add("path", ftpset.FOLDERNAME);
+                    par.Add("pasv", (!ftpset.FtpModeActive).ToString());
 
                     Log.Information($"准备请求发送ftp：{ftpSpiderUrl} ，参数：{par.ToJsonString()}，文件：{ediFileName}");
                     var res = FTPHelper.TransmitFtpFile(ftpSpiderUrl, par, new