Merge branch 'dev' into 'master'

修改配置

See merge request !7

proudkids-aom-dev.yml

@@ -6,19 +6,18 @@ redis:
     expiration: 3600
 
 # datasoure默认使用JDBC
-#spring:
-  #rabbitmq:
-    #host: 192.168.1.83
-    #port: 5672
-    #username: zzq223
-    #password: 222222
-  #zipkin:
-    #rabbitmq:
-      #queue: zipkin
-  #sleuth:
-    #sampler:
-      #percentage: 1.0
-
+spring:
+  rabbitmq:
+    host: 192.168.1.83
+    port: 5672
+    username: zzq223
+    password: 222222
+  zipkin:
+    rabbitmq:
+      queue: zipkin
+  sleuth:
+    sampler:
+      percentage: 1.0
 # 分库分表支持
 sharding:
   jdbc: