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

server/src/main/resources/bootstrap-test2.properties

-server.port=10902
-server.context-path=/analysis
-spring.application.name=${server.port}-pica-cloud-analysis
-
-#config server settings
-spring.cloud.config.name=com.pica.cloud.online.exam
-spring.cloud.config.profile=test2
-spring.cloud.config.label=publish
-spring.cloud.config.discovery.enabled=true
-spring.cloud.config.discovery.service-id=config-server
-
-#eureka settings
-eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
-eureka.client.service-url.defaultZone=http://192.168.110.128:7891/eureka,http://192.168.110.129:7891/eureka
-eureka.instance.status-page-url=http://${spring.cloud.client.ipAddress}:${server.port}/swagger-ui.html
-eureka.instance.lease-renewal-interval-in-seconds=10
-eureka.instance.lease-expiration-duration-in-seconds=10
-eureka.instance.hostname=${spring.cloud.client.ipAddress}
-eureka.instance.prefer-ip-address=true
-
-#rabbigmq settings
-spring.rabbitmq.host=192.168.110.206
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=appuser
-spring.rabbitmq.password=AqLfvyWOvLQEUzdI
-
-#local settings
-#feign.hystrix.enabled=true
-management.security.enabled=false
-
-ribbon.ReadTimeout=300000
-ribbon.SocketTimeout=300000
-#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
-ribbon.ConnectTimeout=30000
-
-#spring.zipkin.base-url=http://192.168.110.133:7895
-#spring.sleuth.sampler.percentage=1.0
-
+server.port=10902
+server.context-path=/analysis
+spring.application.name=${server.port}-pica-cloud-analysis
+
+#config server settings
+spring.cloud.config.name=com.pica.cloud.online.exam
+spring.cloud.config.profile=test2
+spring.cloud.config.label=publish
+spring.cloud.config.discovery.enabled=true
+spring.cloud.config.discovery.service-id=config-server
+
+#eureka settings
+eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
+eureka.client.service-url.defaultZone=http://10.98.0.3:7891/eureka,http://10.98.0.4:7891/eureka,http://10.98.0.5:7891/eureka
+eureka.instance.status-page-url=http://${spring.cloud.client.ipAddress}:${server.port}/swagger-ui.html
+eureka.instance.lease-renewal-interval-in-seconds=10
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.hostname=${spring.cloud.client.ipAddress}
+eureka.instance.prefer-ip-address=true
+
+#rabbigmq settings
+spring.rabbitmq.host=192.168.110.206
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=appuser
+spring.rabbitmq.password=AqLfvyWOvLQEUzdI
+
+#local settings
+#feign.hystrix.enabled=true
+management.security.enabled=false
+
+ribbon.ReadTimeout=300000
+ribbon.SocketTimeout=300000
+#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
+ribbon.ConnectTimeout=30000
+
+#spring.zipkin.base-url=http://192.168.110.133:7895
+#spring.sleuth.sampler.percentage=1.0
+
 logging.config=classpath:log4j2-test1.xml
\ No newline at end of file