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

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

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

server/src/main/resources/bootstrap-test1.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-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

@@ -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.174
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=picacloud
-spring.rabbitmq.password=123456
+#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