修改kyliin配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -19,56 +19,12 @@ liquidnet:
     connection-timeout: 5000
   mysql:
     database-name: dev_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: dev_ln_scene
   url-pay:
     pay: http://testpay.zhengzai.tv/
     check: http://testpay.zhengzai.tv/order/verify
     localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
   url-service:
-    url: http://testservice.zhengzai.tv/
-
-#以下为spring各环境个性配置
-spring:
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-  redis:
-    database: 15
-    port: ${liquidnet.redis.port}
-    host: ${liquidnet.redis.host}
-    password: ${liquidnet.redis.password}
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-    redisson:
-      singleServerConfig:
-        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
-        password: ${liquidnet.redis.password}
-        clientName: null
-        database: 7 #选择使用哪个数据库0~15
-        idleConnectionTimeout: 10000
-        connectTimeout: 10000
-        timeout: 3000
-        retryAttempts: 3
-        retryInterval: 1500
-        subscriptionsPerConnection: 5
-        subscriptionConnectionMinimumIdleSize: 1
-        subscriptionConnectionPoolSize: 50
-        connectionMinimumIdleSize: 32
-        connectionPoolSize: 64
-        dnsMonitoringInterval: 5000
-      threads: 16
-      nettyThreads: 32
-      codec:
-        class: "org.redisson.codec.JsonJacksonCodec"
-      transportMode: "NIO"
-  data:
-    mongodb:
-      sslEnabled: false
-      database: dev_ln_scene
-      trustStore:
-      trustStorePassword:
+    url: http://testservice.zhengzai.tv/
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -19,56 +19,12 @@ liquidnet:
     connection-timeout: 3000
   mysql:
     database-name: test_ln_scene
+  mongodb:
+    sslEnabled: false
+    database: test_ln_scene
   url-pay:
     pay: http://testpay.zhengzai.tv/
     check: http://testpay.zhengzai.tv/order/verify
     localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
   url-service:
     url: http://testservice.zhengzai.tv/
-
-#以下为spring各环境个性配置
-spring:
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-  redis:
-    database: 15
-    port: ${liquidnet.redis.port}
-    host: ${liquidnet.redis.host}
-    password: ${liquidnet.redis.password}
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-    redisson:
-      singleServerConfig:
-        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
-        password: ${liquidnet.redis.password}
-        clientName: null
-        database: 7 #选择使用哪个数据库0~15
-        idleConnectionTimeout: 10000
-        connectTimeout: 10000
-        timeout: 3000
-        retryAttempts: 3
-        retryInterval: 1500
-        subscriptionsPerConnection: 5
-        subscriptionConnectionMinimumIdleSize: 1
-        subscriptionConnectionPoolSize: 50
-        connectionMinimumIdleSize: 32
-        connectionPoolSize: 64
-        dnsMonitoringInterval: 5000
-      threads: 16
-      nettyThreads: 32
-      codec:
-        class: "org.redisson.codec.JsonJacksonCodec"
-      transportMode: "NIO"
-  data:
-    mongodb:
-      sslEnabled: false
-      database: test_ln_scene
-      trustStore:
-      trustStorePassword:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -73,11 +73,46 @@ spring:
     port: ${liquidnet.rabbitmq.port}
     username: ${liquidnet.rabbitmq.username}
     password: ${liquidnet.rabbitmq.password}
+    virtual-host: ${liquidnet.rabbitmq.virtual-host}
+    connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
+  redis:
+    database: 15
+    port: ${liquidnet.redis.port}
+    host: ${liquidnet.redis.host}
+    password: ${liquidnet.redis.password}
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+    redisson:
+      singleServerConfig:
+        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
+        password: ${liquidnet.redis.password}
+        clientName: null
+        database: 7 #选择使用哪个数据库0~15
+        idleConnectionTimeout: 10000
+        connectTimeout: 10000
+        timeout: 3000
+        retryAttempts: 3
+        retryInterval: 1500
+        subscriptionsPerConnection: 5
+        subscriptionConnectionMinimumIdleSize: 1
+        subscriptionConnectionPoolSize: 50
+        connectionMinimumIdleSize: 32
+        connectionPoolSize: 64
+        dnsMonitoringInterval: 5000
+      threads: 16
+      nettyThreads: 32
+      codec:
+        class: "org.redisson.codec.JsonJacksonCodec"
+      transportMode: "NIO"
   data:
     mongodb:
       uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=4000&waitQueueMultiple=100
-      sslEnabled: false
-      database: ${spring.data.mongodb.database}
+      sslEnabled: ${liquidnet.mongodb.sslEnabled}
+      database: ${liquidnet.mongodb.database}
   datasource:
     name: ${liquidnet.mysql.database-name}
     url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false