Răsfoiți Sursa

档案预览优化

chenr 3 luni în urmă
părinte
comite
46f2d921a7

+ 13 - 3
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -51,6 +51,7 @@ import org.springblade.business.entity.TaskParallel;
 import org.springblade.business.feign.ArchiveFileClient;
 import org.springblade.business.feign.MetadataClassificationClient;
 import org.springblade.business.feign.TaskClient;
+import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -71,6 +72,7 @@ import org.springblade.manager.feign.ProjectClient;
 import org.springblade.manager.vo.ArchiveTreeContractVO2;
 import org.springblade.resource.feign.CommonFileClient;
 import org.springblade.resource.feign.NewIOSSClient;
+import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.user.entity.User;
@@ -2370,7 +2372,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					urlList.add(back);
 				}
 				String fileName = SnowFlakeUtil.getId().toString();
-                urlList=replaceNetworkUrl(urlList);
+                replaceNetworkUrl(urlList);
 				url = archiveAutoPdfService.MergePdfAndUpload(urlList, fileName, null, archivesAuto.getProjectId());
 			}
 		} catch (Exception e) {
@@ -2385,9 +2387,17 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
      * @return
      */
     private List<String> replaceNetworkUrl(List<String> urlList) {
-        for (String url : urlList) {
-            url.replace("https://xinan1.zos.ctyun.cn","http://100.86.2.1");
+        String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
+        if (!sys_isonline.equals("20")) {
+            for (String url : urlList) {
+                url.replace("https://xinan1.zos.ctyun.cn","http://100.86.2.1");
+            }
         }
+//        else {
+//            for (String url : urlList) {
+//                url.replace("http://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com","http://152.168.2.15");
+//            }
+//        }
         return urlList;
     }