Merge branch 'test-merge-02' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

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;
@@ -2504,6 +2506,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					urlList.add(back);
 				}
 				String fileName = SnowFlakeUtil.getId().toString();
+                replaceNetworkUrl(urlList);
 				url = archiveAutoPdfService.MergePdfAndUpload(urlList, fileName, null, archivesAuto.getProjectId());
 			}
 		} catch (Exception e) {
@@ -2512,7 +2515,28 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		return url;
 	}
 
-	/**
+    /**
+     * 将外网url替换成内网url
+     * @param urlList
+     * @return
+     */
+    private List<String> replaceNetworkUrl(List<String> urlList) {
+        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;
+    }
+
+
+    /**
 	 * 拆卷
 	 *
 	 * @param ids

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialNumberRuleController.java

@@ -155,6 +155,11 @@ public class TrialNumberRuleController extends BladeController {
         }
         int i=1;
         for (TrialNumberRule rule : list) {
+            if(rule.getContractId()==null||rule.getContractId()==0L){
+                rule.setStatus(1);
+            }else {
+                rule.setStatus(2);
+            }
             rule.setSort(i++);
             if(rule.getRule()==6){
                 if(StringUtils.isEmpty(rule.getData())){

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialNumberRuleServiceImpl.java

@@ -116,6 +116,8 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                         }
                     });
                     trialNumber.append(result);
+                }else {
+                    trialNumber.append("参数掩码");
                 }
             } else if (rule.getRule()==4) {
                 String currentYearStr = String.valueOf(LocalDate.now().getYear());