Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BYLAppRobot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuyang
BYLAppRobot
Commits
9f624a42
Commit
9f624a42
authored
Oct 17, 2018
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
APK图片抓取识别及轮播流地址抓取,修复ftp无法上传bug
#BYLSERVER-1438
parent
f463fcbd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
Task.kt
app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+3
-3
Config.kt
app/src/main/java/com/duolebo/blyrobot/util/Config.kt
+1
-1
FTPUploadTask.java
.../main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java
+2
-1
No files found.
app/src/main/java/com/duolebo/blyrobot/data/Task.kt
View file @
9f624a42
...
@@ -329,15 +329,15 @@ class Task : IAppBaseCallback {
...
@@ -329,15 +329,15 @@ class Task : IAppBaseCallback {
.
setUsernameAndPassword
(
Config
.
instance
.
getFtpUserName
(),
Config
.
instance
.
getFtpPassword
())
.
setUsernameAndPassword
(
Config
.
instance
.
getFtpUserName
(),
Config
.
instance
.
getFtpPassword
())
.
setNotificationConfig
(
UploadNotificationConfig
())
.
setNotificationConfig
(
UploadNotificationConfig
())
.
setCreatedDirectoriesPermissions
(
UnixPermissions
(
"777"
))
.
setCreatedDirectoriesPermissions
(
UnixPermissions
(
"777"
))
.
setSocketTimeout
(
5000
)
.
setSocketTimeout
(
1
5000
)
.
setConnectTimeout
(
5000
)
.
setConnectTimeout
(
1
5000
)
.
setDelegate
(
uploadImageCallback
())
.
setDelegate
(
uploadImageCallback
())
.
setMaxRetries
(
4
)
.
setMaxRetries
(
4
)
this
.
uploadImages
.
forEach
{
this
.
uploadImages
.
forEach
{
val
uploadFile
=
File
(
it
)
val
uploadFile
=
File
(
it
)
if
(
uploadFile
.
exists
())
{
if
(
uploadFile
.
exists
())
{
uploadRequest
.
addFileToUpload
(
it
,
Config
.
instance
.
getFtpRemotePath
()
+
"/"
+
uploadFile
.
name
)
uploadRequest
.
addFileToUpload
(
it
,
Config
.
instance
.
getFtpRemotePath
()
+
uploadFile
.
name
)
}
}
}
}
...
...
app/src/main/java/com/duolebo/blyrobot/util/Config.kt
View file @
9f624a42
...
@@ -51,7 +51,7 @@ class Config: IProtocolConfig {
...
@@ -51,7 +51,7 @@ class Config: IProtocolConfig {
fun
getFtpRemotePath
():
String
{
fun
getFtpRemotePath
():
String
{
if
(
isDebug
)
if
(
isDebug
)
return
"/upload"
return
"/upload"
return
"/
test
"
return
"/"
}
}
companion
object
{
companion
object
{
...
...
uploadservice-ftp/src/main/java/net/gotev/uploadservice/ftp/FTPUploadTask.java
View file @
9f624a42
...
@@ -97,7 +97,8 @@ public class FTPUploadTask extends UploadTask implements CopyStreamListener {
...
@@ -97,7 +97,8 @@ public class FTPUploadTask extends UploadTask implements CopyStreamListener {
Logger
.
debug
(
LOG_TAG
,
"Socket timeout set to "
+
ftpParams
.
socketTimeout
Logger
.
debug
(
LOG_TAG
,
"Socket timeout set to "
+
ftpParams
.
socketTimeout
+
"ms. Enabled control keep alive every "
+
controlKeepAliveTimeout
+
"s"
);
+
"ms. Enabled control keep alive every "
+
controlKeepAliveTimeout
+
"s"
);
ftpClient
.
enterLocalPassiveMode
();
// ftpClient.enterLocalPassiveMode();
ftpClient
.
enterLocalActiveMode
();
ftpClient
.
setFileType
(
FTP
.
BINARY_FILE_TYPE
);
ftpClient
.
setFileType
(
FTP
.
BINARY_FILE_TYPE
);
ftpClient
.
setFileTransferMode
(
ftpParams
.
compressedFileTransfer
?
ftpClient
.
setFileTransferMode
(
ftpParams
.
compressedFileTransfer
?
FTP
.
COMPRESSED_TRANSFER_MODE
:
FTP
.
STREAM_TRANSFER_MODE
);
FTP
.
COMPRESSED_TRANSFER_MODE
:
FTP
.
STREAM_TRANSFER_MODE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment