Merge branch 'consumer_unite' of...

Merge branch 'consumer_unite' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into consumer_unite

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: client-admin-web
\ No newline at end of file

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: client-job
\ No newline at end of file

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-adam

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-candy

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-chime

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-adam
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-base/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-base
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-candy/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-candy
\ No newline at end of file

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-dragon
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-goblin
\ No newline at end of file

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-kylin
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-nft/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-nft
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-order
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-slowly
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-stone/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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-stone
\ No newline at end of file

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-consumer-sweet
\ No newline at end of file

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-dragon

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-executor-main
\ No newline at end of file

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-goblin

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-kylin

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-notify

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-order

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-platform
\ No newline at end of file

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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-slime

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

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-smile

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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-stone

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

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  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
+    #host: 192.168.193.41:7001
+
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-sweet

liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/bootstrap-yace.yml

+# begin-test-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: yace
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.177:7001
+# end-test-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: support-zuul
\ No newline at end of file