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

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

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

@@ -2504,6 +2504,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 					urlList.add(back);
 				}
 				String fileName = SnowFlakeUtil.getId().toString();
+                urlList=replaceNetworkUrl(urlList);
 				url = archiveAutoPdfService.MergePdfAndUpload(urlList, fileName, null, archivesAuto.getProjectId());
 			}
 		} catch (Exception e) {
@@ -2512,7 +2513,20 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		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

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())){