|
@@ -2370,6 +2370,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
urlList.add(back);
|
|
urlList.add(back);
|
|
}
|
|
}
|
|
String fileName = SnowFlakeUtil.getId().toString();
|
|
String fileName = SnowFlakeUtil.getId().toString();
|
|
|
|
+ urlList=replaceNetworkUrl(urlList);
|
|
url = archiveAutoPdfService.MergePdfAndUpload(urlList, fileName, null, archivesAuto.getProjectId());
|
|
url = archiveAutoPdfService.MergePdfAndUpload(urlList, fileName, null, archivesAuto.getProjectId());
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -2378,7 +2379,20 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
return url;
|
|
return url;
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 将外网url替换成内网url
|
|
|
|
+ * @param urlList
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ private List<String> replaceNetworkUrl(List<String> urlList) {
|
|
|
|
+ for (String url : urlList) {
|
|
|
|
+ url.replace("https://xinan1.zos.ctyun.cn","http://100.86.2.1");
|
|
|
|
+ }
|
|
|
|
+ return urlList;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ /**
|
|
* 拆卷
|
|
* 拆卷
|
|
*
|
|
*
|
|
* @param ids
|
|
* @param ids
|