Merge branch 'dev-tengxun-150' into 'release'

fix--迁移腾讯修改

See merge request !7

server/pom.xml

@@ -131,10 +131,10 @@
             <version>5.1.39</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.pica.cloud.online.exam</groupId>
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-redis</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jedis</artifactId>

server/src/main/resources/bootstrap-dev.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=dev
-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.120:7891/eureka/,http://192.168.110.121: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
-
-#rabbitmq 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.124:7895
-#spring.sleuth.sampler.percentage=1.0
-
-logging.config=classpath:log4j2-dev.xml
+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=dev
+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.120:7891/eureka/,http://192.168.110.121: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
+
+#rabbitmq 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.124:7895
+#spring.sleuth.sampler.percentage=1.0
+
+logging.config=classpath:log4j2-dev.xml

server/src/main/resources/bootstrap-prod.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=prod
-spring.cloud.config.label=publish
-spring.cloud.config.discovery.enabled=true
-spring.cloud.config.discovery.service-id=prd-config-server
-
-#eureka settings
-eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
-eureka.client.service-url.defaultZone=http://pica-ms-prd:~!QAZ2wsx3331805prd@172.19.137.14:7891/eureka,http://pica-ms-prd:~!QAZ2wsx3331805prd@172.19.137.15:7891/eureka,http://pica-ms-prd:~!QAZ2wsx3331805prd@172.19.137.16: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
-
-#rabbitmq settings
-spring.rabbitmq.host=172.19.137.0
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=appuser
-spring.rabbitmq.password=AqLfvyWOvLQEUzdI
-
-#local settings
-#feign.hystrix.enabled=true
-management.security.enabled=true
-
-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://172.19.137.19: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=prod
+spring.cloud.config.label=publish
+spring.cloud.config.discovery.enabled=true
+spring.cloud.config.discovery.service-id=prd-config-server
+
+#eureka settings
+eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
+eureka.client.service-url.defaultZone=http://pica-ms-prd:~!QAZ2wsx3331805prd@172.19.137.14:7891/eureka,http://pica-ms-prd:~!QAZ2wsx3331805prd@172.19.137.15:7891/eureka,http://pica-ms-prd:~!QAZ2wsx3331805prd@172.19.137.16: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
+
+#rabbitmq settings
+#spring.rabbitmq.host=172.19.137.0
+#spring.rabbitmq.port=5672
+#spring.rabbitmq.username=appuser
+#spring.rabbitmq.password=AqLfvyWOvLQEUzdI
+
+#local settings
+#feign.hystrix.enabled=true
+management.security.enabled=true
+
+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://172.19.137.19:7895
+#spring.sleuth.sampler.percentage=1.0
+
 logging.config=classpath:log4j2-prod.xml
\ No newline at end of file

server/src/main/resources/bootstrap-test1.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=test1
-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=test1
+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
+
 logging.config=classpath:log4j2-test1.xml
\ No newline at end of file

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

@@ -19,10 +19,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
+#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

server/src/main/resources/bootstrap-uat.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=uat
-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://pica-ms:~!QAZ2wsx3331805@192.168.110.137:7891/eureka,http://pica-ms:~!QAZ2wsx3331805@192.168.110.138: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.174
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=picacloud
-spring.rabbitmq.password=123456
-
-#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.141: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=uat
+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://pica-ms:~!QAZ2wsx3331805@192.168.110.137:7891/eureka,http://pica-ms:~!QAZ2wsx3331805@192.168.110.138: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.174
+#spring.rabbitmq.port=5672
+#spring.rabbitmq.username=picacloud
+#spring.rabbitmq.password=123456
+
+#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.141:7895
+#spring.sleuth.sampler.percentage=1.0
+
 logging.config=classpath:log4j2-uat.xml
\ No newline at end of file