Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2020-08-27 c49b95fc3576f9a5dad5bcaa6874157d5091f6e0

 kidgrow-config/src/main/resources/application.properties

@@ -37,7 +37,7 @@
# hystrix.command.default.execution.timeout.enabled: false
#\u8D85\u65F6\u65F6\u957F
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 10000

#\u9694\u79BB\u7EA7\u522B
hystrix.command.default.execution.isolation.strategy: SEMAPHORE

##### Redis\u914D\u7F6E