Merge branch 'pre' into 'master'

修改

See merge request !269

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/bootstrap-service-goblin.yml

@@ -9,10 +9,10 @@ eureka:
 spring:
   cloud:
     config:
-      uri: http://182.92.70.253:7002/support-config
+#      uri: http://182.92.70.253:7002/support-config
 #      uri: http://39.107.71.112:7002/support-config
-#      profile: ${liquidnet.cloudConfig.profile}
-#      name: ${spring.application.name} #默认为spring.application.name
-#      discovery:
-#        enabled: true
-#        service-id: liquidnet-support-config
\ No newline at end of file
+      profile: ${liquidnet.cloudConfig.profile}
+      name: ${spring.application.name} #默认为spring.application.name
+      discovery:
+        enabled: true
+        service-id: liquidnet-support-config
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-service-order.yml

@@ -9,10 +9,10 @@ eureka:
 spring:
   cloud:
     config:
-      uri: http://182.92.70.253:7002/support-config
+#      uri: http://182.92.70.253:7002/support-config
 #      uri: http://39.107.71.112:7002/support-config
-#      profile: ${liquidnet.cloudConfig.profile}
-#      name: ${spring.application.name} #默认为spring.application.name
-#      discovery:
-#        enabled: true
-#        service-id: liquidnet-support-config
+      profile: ${liquidnet.cloudConfig.profile}
+      name: ${spring.application.name} #默认为spring.application.name
+      discovery:
+        enabled: true
+        service-id: liquidnet-support-config