|
@@ -188,7 +188,8 @@ public class DataSeqServiceImpl extends BaseServiceImpl<DataSeqMapper, DataSeq>
|
|
|
String resourcePath = localPath + StringUtils.substringAfter(filePath, Constants.RESOURCE_PREFIX);
|
|
|
String unzipPath = resourcePath.substring(0, resourcePath.lastIndexOf(".")) + BizConstant.UNZIP_SUFFIX;
|
|
|
|
|
|
- String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().indexOf(Constants.RESOURCE_PREFIX) + Constants.RESOURCE_PREFIX.length());
|
|
|
+// String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().indexOf(Constants.RESOURCE_PREFIX) + Constants.RESOURCE_PREFIX.length());
|
|
|
+ String urlPrefix = Constants.RESOURCE_PREFIX;
|
|
|
|
|
|
// 列出unzipPath下所有图片文件
|
|
|
File directory = new File(unzipPath);
|
|
@@ -251,14 +252,14 @@ public class DataSeqServiceImpl extends BaseServiceImpl<DataSeqMapper, DataSeq>
|
|
|
|
|
|
try {
|
|
|
if (isInput) {
|
|
|
- String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().lastIndexOf(".")) + BizConstant.UNZIP_SUFFIX + "/" + dir;
|
|
|
+ String urlPrefix = ossEntity.getFileName().lastIndexOf(".") + BizConstant.UNZIP_SUFFIX + "/" + dir;
|
|
|
// 列出unzipPath下所有图片文件
|
|
|
File directory = new File(unzipPath);
|
|
|
File[] files = directory.listFiles();
|
|
|
List<String> imageList = Arrays.asList(files).stream().filter(file -> isImageFile(file)).map(file -> urlPrefix + "/" + file.getName()).toList();
|
|
|
return imageList;
|
|
|
} else {
|
|
|
- String urlPrefix = ossEntity.getUrl().substring(0, ossEntity.getUrl().lastIndexOf(".")) + subsystem + "/" + dir;
|
|
|
+ String urlPrefix = ossEntity.getFileName().lastIndexOf(".") + subsystem + "/" + dir;
|
|
|
// 列出unzipPath下所有图片文件
|
|
|
File directory = new File(resultPath);
|
|
|
File[] files = directory.listFiles();
|