diff --git a/pom.xml b/pom.xml
index 123d737..cf3ea1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.daxiang
agent
- 0.7.9
+ 0.8.0
jar
diff --git a/src/main/java/com/daxiang/core/Device.java b/src/main/java/com/daxiang/core/Device.java
index 074385b..076b48e 100644
--- a/src/main/java/com/daxiang/core/Device.java
+++ b/src/main/java/com/daxiang/core/Device.java
@@ -139,9 +139,13 @@ public File screenshot() {
}
public UploadFile screenshotThenUploadToServer() {
+ return screenshotThenUploadToServer(FileType.IMG);
+ }
+
+ public UploadFile screenshotThenUploadToServer(Integer fileType) {
File screenshotFile = screenshot();
try {
- return ServerClient.getInstance().uploadFile(screenshotFile, FileType.IMG);
+ return ServerClient.getInstance().uploadFile(screenshotFile, fileType);
} finally {
FileUtils.deleteQuietly(screenshotFile);
}
diff --git a/src/main/java/com/daxiang/model/FileType.java b/src/main/java/com/daxiang/model/FileType.java
index 30b7ec2..751d042 100644
--- a/src/main/java/com/daxiang/model/FileType.java
+++ b/src/main/java/com/daxiang/model/FileType.java
@@ -4,6 +4,7 @@
* Created by jiangyitao.
*/
public interface FileType {
+ int TMP = -1;
int IMG = 1;
int VIDEO = 2;
int APP = 3;
diff --git a/src/main/java/com/daxiang/service/DeviceService.java b/src/main/java/com/daxiang/service/DeviceService.java
index 5071abb..fcf23fb 100644
--- a/src/main/java/com/daxiang/service/DeviceService.java
+++ b/src/main/java/com/daxiang/service/DeviceService.java
@@ -4,6 +4,7 @@
import com.daxiang.core.DeviceHolder;
import com.daxiang.core.mobile.MobileDevice;
import com.daxiang.exception.AgentException;
+import com.daxiang.model.FileType;
import com.daxiang.model.UploadFile;
import io.appium.java_client.AppiumDriver;
import lombok.extern.slf4j.Slf4j;
@@ -26,7 +27,7 @@ public Map screenshot(String deviceId) {
throw new AgentException(deviceId + "未连接");
}
- UploadFile uploadFile = device.screenshotThenUploadToServer();
+ UploadFile uploadFile = device.screenshotThenUploadToServer(FileType.TMP);
Map res = new HashMap<>();
res.put("imgUrl", uploadFile.getDownloadUrl());
diff --git a/src/main/java/com/daxiang/utils/UUIDUtil.java b/src/main/java/com/daxiang/utils/UUIDUtil.java
index f89bbf1..0c56453 100644
--- a/src/main/java/com/daxiang/utils/UUIDUtil.java
+++ b/src/main/java/com/daxiang/utils/UUIDUtil.java
@@ -1,5 +1,6 @@
package com.daxiang.utils;
+import org.apache.commons.io.FilenameUtils;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -16,6 +17,8 @@ public static String getUUID() {
public static String getUUIDFilename(String filename) {
Assert.hasText(filename, "filename不能为空");
- return filename.contains(".") ? getUUID() + "." + StringUtils.unqualify(filename) : getUUID();
+ String fileExtension = FilenameUtils.getExtension(filename);
+ String uuid = getUUID();
+ return StringUtils.isEmpty(fileExtension) ? uuid : uuid + "." + fileExtension;
}
}