From 9f624a42b9f28e34db27cbb02503688f2358206b Mon Sep 17 00:00:00 2001
From: liuyang <yang.liu@zhilink.net>
Date: Thu, 18 Oct 2018 00:04:14 +0800
Subject: [PATCH] =?UTF-8?q?APK=E5=9B=BE=E7=89=87=E6=8A=93=E5=8F=96?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=8F=8A=E8=BD=AE=E6=92=AD=E6=B5=81=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=8A=93=E5=8F=96=EF=BC=8C=E4=BF=AE=E5=A4=8Dftp?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0bug=20#BYLSERVER-1438?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/duolebo/blyrobot/data/Task.kt         | 6 +++---
 app/src/main/java/com/duolebo/blyrobot/util/Config.kt       | 2 +-
 .../java/net/gotev/uploadservice/ftp/FTPUploadTask.java     | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
index 97be1ce..ab0f0d5 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -329,15 +329,15 @@ class Task : IAppBaseCallback {
                     .setUsernameAndPassword(Config.instance.getFtpUserName(), Config.instance.getFtpPassword())
                     .setNotificationConfig(UploadNotificationConfig())
                     .setCreatedDirectoriesPermissions(UnixPermissions("777"))
-                    .setSocketTimeout(5000)
-                    .setConnectTimeout(5000)
+                    .setSocketTimeout(15000)
+                    .setConnectTimeout(15000)
                     .setDelegate(uploadImageCallback())
                     .setMaxRetries(4)
 
             this.uploadImages.forEach {
                 val uploadFile = File(it)
                 if (uploadFile.exists()) {
-                    uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath() + "/" + uploadFile.name)
+                    uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath() + uploadFile.name)
                 }
             }
 
diff --git a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt
index 878bf10..140c4bd 100644
--- a/app/src/main/java/com/duolebo/blyrobot/util/Config.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/util/Config.kt
@@ -51,7 +51,7 @@ class Config: IProtocolConfig {
     fun getFtpRemotePath(): String {
         if (isDebug)
             return "/upload"
-        return "/test"
+        return "/"
     }
 
     companion object {
diff --git a/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java b/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java
index a91dd0c..d2fcc31 100644
--- a/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java
+++ b/uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java
@@ -97,7 +97,8 @@ public class FTPUploadTask extends UploadTask implements CopyStreamListener {
             Logger.debug(LOG_TAG, "Socket timeout set to " + ftpParams.socketTimeout
                          + "ms. Enabled control keep alive every " + controlKeepAliveTimeout + "s");
 
-            ftpClient.enterLocalPassiveMode();
+//            ftpClient.enterLocalPassiveMode();
+            ftpClient.enterLocalActiveMode();
             ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
             ftpClient.setFileTransferMode(ftpParams.compressedFileTransfer ?
                                           FTP.COMPRESSED_TRANSFER_MODE : FTP.STREAM_TRANSFER_MODE);
-- 
2.21.0