Merge branch 'develop' into dev/diagbotcloud20191024_pacs

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

@@ -122,6 +122,8 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+hystrix.command.AIServiceClient#createFile().execution.isolation.thread.timeoutInMilliseconds: 180000
+
 imageUrl:
   prefix: http://192.168.2.236:82
 

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

@@ -122,6 +122,8 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+hystrix.command.AIServiceClient#createFile().execution.isolation.thread.timeoutInMilliseconds: 180000
+
 imageUrl:
   prefix: http://192.168.2.236:82
 

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

@@ -122,6 +122,8 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+hystrix.command.AIServiceClient#createFile().execution.isolation.thread.timeoutInMilliseconds: 180000
+
 imageUrl:
   prefix: http://192.168.2.121:82
 

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

@@ -122,6 +122,8 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+hystrix.command.AIServiceClient#createFile().execution.isolation.thread.timeoutInMilliseconds: 180000
+
 imageUrl:
   prefix: http://192.168.2.122:82
 

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

@@ -122,6 +122,8 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
 
+hystrix.command.AIServiceClient#createFile().execution.isolation.thread.timeoutInMilliseconds: 180000
+
 imageUrl:
   prefix: http://192.168.2.241:82