Merge branch 'k8s-test' into 'master'

K8s test

See merge request !98

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-k8s-test.yml

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: client-admin-web

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-k8s-test.yml

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: client-job

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 192.168.216.81:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-adam

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-candy

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-chime

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/resources/bootstrap-k8s-test.yml

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-adam

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/resources/bootstrap-k8s-test.yml

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-dragon

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/resources/bootstrap-k8s-test.yml

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-kylin

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/resources/bootstrap-k8s-test.yml

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-consumer-sweet

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-dragon

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

@@ -6,7 +6,12 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001,172.17.121.158:7001,172.17.121.157:7001
+    #host: 172.17.207.177:7001,172.17.121.158:7001,172.17.121.157:7001
+    instance:
+      prefer-ip-address: true
+    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
+
+
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-k8s-test.yml

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-executor-main

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 192.168.216.81:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-spring:
-  profiles:
-    include: service-kylin

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-notify

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

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 192.168.216.81:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-order

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

-# begin-test-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-platform

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-k8s-test.yml

-# begin-dev-这里是配置信息基本值
-liquidnet:
-  cloudConfig:
-    profile: k8s-test
-  security:
-    username: user
-    password: user123
-  eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-
-# end-dev-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: service-sweet

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-k8s-test.yml

-# begin-test-这里是配置信息基本值
-liquidnet:
-  info:
-    port: 7002
-    context: /support-config
-    name: liquidnet-support-config
-  security:
-    username: user
-    password: user123
-  logfile:
-    path: /data/logs
-    name: support-config
-  eureka:
-    #host: 192.168.216.81:7001
-    instance:
-      prefer-ip-address: true
-    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    #serviceUrl:
-    #  defaultZone: http://eureka-test-0.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka,eureka-test-1.eureka-test-svc-zhengzai-test:7001${server.servlet.context-path}/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001${server.servlet.context-path}/eureka
-
-#  rabbitmq:
-#    host: 127.0.0.1
-#    port: 5672
-#    username: admin
-#    password: admin
-  config:
-    location: /data/config/support-config
-# end-test-这里是配置信息基本值
-
-spring:
-  profiles:
-    include: support-config