Merge branch 'k8s-test' into 'master'

K8s test

See merge request !94

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

@@ -11,7 +11,6 @@ liquidnet:
       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-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap.yml

@@ -2,5 +2,5 @@ spring:
     application:
         name: liquidnet-client-admin-web
     profiles:
-        active: test
+        active: dev
 

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

@@ -6,7 +6,12 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    #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:

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -50,7 +50,7 @@ liquidnet:
     user: admin
     pwd: S&y$6d*JwJ
     chime:
-      host: s-2ze04ffc16a54af4-pub.mongodb.rds.aliyuncs.com:3717
+      host: s-2ze04ffc16a54af4.mongodb.rds.aliyuncs.com:3717,s-2zed407acd469104.mongodb.rds.aliyuncs.com
       port: 3717
       user: admin
       pwd: S&y$6d*JwJ
@@ -87,7 +87,8 @@ liquidnet:
     executor-main:
       xxl:
         admin:
-          addresses: 172.17.121.166:8090
+          #addresses: 172.17.121.166:8090
+          addresses: 192.168.96.147:8090
   client:
     admin:
       phpPayUrl: http://testdragon.zhengzai.tv

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

@@ -6,7 +6,12 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    #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:

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

@@ -11,7 +11,12 @@ liquidnet:
     path: /data/logs
     name: support-config
   eureka:
-    host: 172.17.207.177:7001
+    #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
+
+
   rabbitmq:
     host: 127.0.0.1
     port: 5672