Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

# Conflicts:
#	applications/device/device-client/src/main/resources/application.yml

applications/wechat/wechat-server/src/main/resources/config/application-docker-cloud.yml

@@ -22,7 +22,7 @@ spring:
         max-lifetime: 1800000
         connection-timeout: 30000
   rabbitmq:
-      host: 127.0.0.1
+      host: 132.232.174.14
       port: 5672
       virtual-host: school
       username: saas

applications/wechat/wechat-server/src/main/resources/config/application-docker-test.yml

@@ -1,12 +1,31 @@
 eureka:
   instance:
-    hostname: saas-sale-server-test
+    hostname: smartschool-wechat-server
     prefer-ip-address: false
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server-test:8515/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
 spring:
+  redis:
+    host: 172.27.0.13
+    port: 6379
+    password: select111***
+  datasource:
+      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://172.27.0.15:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: select111***
+      hikari:
+        minimum-idle: 5
+        maximum-pool-size: 50
+        idle-timeout: 30000
+        max-lifetime: 1800000
+        connection-timeout: 30000
   rabbitmq:
-    virtual-host: test
-server:
-  port: 8835
+      host: 127.0.0.1
+      port: 5672
+      virtual-host: school
+      username: saas
+      password: select123***
+      publisher-returns: true
+      publisher-confirms: true