Merge branch 'develop' into dev/nurseRule20220329

pom.xml

@@ -34,8 +34,8 @@
         <easypoi.version>4.2.0</easypoi.version>
         <docker-maven-plugin.version>1.2.1</docker-maven-plugin.version>
         <aggregator.version>1.1.3</aggregator.version>
-        <docker.image.prefix>192.168.2.236:5000/diagbotcloud</docker.image.prefix>
-        <registryUrl>http://192.168.2.236:5000/repository/diagbotcloud/</registryUrl>
+        <docker.image.prefix>192.168.2.121:5000/diagbotcloud</docker.image.prefix>
+        <registryUrl>http://192.168.2.121:5000/repository/diagbotcloud/</registryUrl>
     </properties>
 
     <dependencyManagement>

src/main/resources/application-dev.yml

@@ -11,6 +11,7 @@ hystrix:
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:

src/main/resources/application-local.yml

@@ -11,6 +11,7 @@ hystrix:
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:

src/main/resources/application-pre.yml

@@ -11,6 +11,7 @@ hystrix:
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:

src/main/resources/application-pro.yml

@@ -11,6 +11,7 @@ hystrix:
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout:

src/main/resources/application-test.yml

@@ -11,6 +11,7 @@ hystrix:
   command:
     CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     CdssCoreClient#clearRuleAll().execution.isolation.thread.timeoutInMilliseconds: 3600000
+    CdssCoreClient#indexByApproval(IndexByApprovalVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
     default:
       execution:
         timeout: