Merge remote-tracking branch 'origin/develop' into 122run

config-server/src/main/resources/shared/cdssman-service-dev.yml

@@ -125,6 +125,14 @@ hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.threa
 hystrix.command.CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 #远程调用开单合理性接口时间加长
 hystrix.command.CdssCoreClient#indication(IndicationPushVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配数据校验接口时间加长
+hystrix.command.CdssClient#dataVerify(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配接口时间加长
+hystrix.command.CdssClient#precDataMatch_remote(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入数据校验接口时间加长
+hystrix.command.CdssClient#importExcelDataVerify(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入接口时间加长
+hystrix.command.CdssClient#importExcel_remote(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

config-server/src/main/resources/shared/cdssman-service-local.yml

@@ -124,6 +124,14 @@ hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.threa
 hystrix.command.CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 #远程调用开单合理性接口时间加长
 hystrix.command.CdssCoreClient#indication(IndicationPushVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配数据校验接口时间加长
+hystrix.command.CdssClient#dataVerify(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配接口时间加长
+hystrix.command.CdssClient#precDataMatch_remote(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入数据校验接口时间加长
+hystrix.command.CdssClient#importExcelDataVerify(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入接口时间加长
+hystrix.command.CdssClient#importExcel_remote(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 
 io.github.lvyahui8.spring:

config-server/src/main/resources/shared/cdssman-service-pre.yml

@@ -125,6 +125,14 @@ hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.threa
 hystrix.command.CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 #远程调用开单合理性接口时间加长
 hystrix.command.CdssCoreClient#indication(IndicationPushVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配数据校验接口时间加长
+hystrix.command.CdssClient#dataVerify(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配接口时间加长
+hystrix.command.CdssClient#precDataMatch_remote(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入数据校验接口时间加长
+hystrix.command.CdssClient#importExcelDataVerify(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入接口时间加长
+hystrix.command.CdssClient#importExcel_remote(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

config-server/src/main/resources/shared/cdssman-service-pro.yml

@@ -125,6 +125,14 @@ hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.threa
 hystrix.command.CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 #远程调用开单合理性接口时间加长
 hystrix.command.CdssCoreClient#indication(IndicationPushVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配数据校验接口时间加长
+hystrix.command.CdssClient#dataVerify(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配接口时间加长
+hystrix.command.CdssClient#precDataMatch_remote(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入数据校验接口时间加长
+hystrix.command.CdssClient#importExcelDataVerify(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入接口时间加长
+hystrix.command.CdssClient#importExcel_remote(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

config-server/src/main/resources/shared/cdssman-service-test.yml

@@ -125,6 +125,14 @@ hystrix.command.CdssCoreClient#clearStandRuleDrugAll().execution.isolation.threa
 hystrix.command.CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
 #远程调用开单合理性接口时间加长
 hystrix.command.CdssCoreClient#indication(IndicationPushVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配数据校验接口时间加长
+hystrix.command.CdssClient#dataVerify(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用预匹配接口时间加长
+hystrix.command.CdssClient#precDataMatch_remote(MultipartFile,Integer).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入数据校验接口时间加长
+hystrix.command.CdssClient#importExcelDataVerify(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
+#远程调用导入接口时间加长
+hystrix.command.CdssClient#importExcel_remote(MultipartFile,Long,Integer,String).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

config-server/src/main/resources/shared/mrman-service-dev.yml

@@ -52,7 +52,7 @@ spring:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
           druid:
@@ -60,7 +60,7 @@ spring:
         slave:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
           druid:

config-server/src/main/resources/shared/mrman-service-local.yml

@@ -52,7 +52,7 @@ spring:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
           druid:
@@ -60,7 +60,7 @@ spring:
         slave:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
           druid: