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

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/Dockerfile.adam

+FROM registry.cn-beijing.aliyuncs.com/zhengzai-base/jdk:8u302
+COPY target/liquidnet-service-adam-impl.jar /
+EXPOSE 9001
+ENTRYPOINT ["java", "-Dspring.profiles.active=test", "-jar", "/liquidnet-service-adam-impl.jar"]
+

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

@@ -10,9 +10,9 @@ spring:
   cloud:
     config:
 #      uri: http://127.0.0.1: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
+      uri: 'http://47.95.156.91: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

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

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    host: 47.95.156.91:7001
 # end-test-这里是配置信息基本值
 
 spring:

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

@@ -2,4 +2,4 @@ spring:
   application:
     name: liquidnet-service-adam
   profiles:
-    active: dev
+    active: test
\ No newline at end of file