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

src/main/resources/application-zhyf.yml

@@ -11,20 +11,20 @@ service:
 spring:
   datasource:
     username: dbsoiladmin
-    password: ptoil!%&wzhj768
-    url: jdbc:postgresql://127.0.0.1:5432/pc_lims_soil
+    password: ptoilwzhj768
+    url: jdbc:postgresql://db:5432/pc_lims_soil
     driver-class-name: org.postgresql.Driver
     dynamic:
       enabled: false
   # 注册中心配置
   cloud:
     consul:
-      host: 127.0.0.1
+      host: consul
   rabbitmq:
-    host: 127.0.0.1
+    host: rabbitmq
     port: 5672
     username: patznsomq
-    password: mqsoil456#@$5
+    password: mqsoil456!
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg
@@ -34,12 +34,12 @@ spring:
       report-make-msg: pro.topic.report.make.msg
       soil-work-msg: pro.topic.soil.work.msg
   redis:
-    host: 127.0.0.1
+    host: redis
     password: ptsoil476TMa
   # Mongodb GridFS
   data:
     mongodb:
-      uri: mongodb://mgluser:soild574ld@127.0.0.1:27017/lims
+      uri: mongodb://mgluser:soild574ld@mongodb:27017/lims
       grid-fs-database: lims
 
 # Mongodb GridFS 存储