记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit b45ecf51 authored by 张国柄's avatar 张国柄
Browse files
Options

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

parents 7fba3a34 27f2b596
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml
View file @ b45ecf51
...@@ -20,11 +20,11 @@ liquidnet: ...@@ -20,11 +20,11 @@ liquidnet:
mysql: mysql:
database-name: dev_ln_scene database-name: dev_ln_scene
url-pay: url-pay:
pay: "http://testpay.zhengzai.tv/" pay: http://testpay.zhengzai.tv/
check: "http://testpay.zhengzai.tv/order/verify" check: http://testpay.zhengzai.tv/order/verify
localUrl: "http://devzuul.zhengzai.tv/kylin/order/syncOrder" localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
url-service: url-service:
url: "http://testservice.zhengzai.tv/" url: http://testservice.zhengzai.tv/
#以下为spring各环境个性配置 #以下为spring各环境个性配置
spring: spring:
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml
View file @ b45ecf51
...@@ -20,11 +20,11 @@ liquidnet: ...@@ -20,11 +20,11 @@ liquidnet:
mysql: mysql:
database-name: test_ln_scene database-name: test_ln_scene
url-pay: url-pay:
pay: "http://testpay.zhengzai.tv/" pay: http://testpay.zhengzai.tv/
check: "http://testpay.zhengzai.tv/order/verify" check: http://testpay.zhengzai.tv/order/verify
localUrl: "http://devzuul.zhengzai.tv/kylin/order/syncOrder" localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
url-service: url-service:
url: "http://testservice.zhengzai.tv/" url: http://testservice.zhengzai.tv/
#以下为spring各环境个性配置 #以下为spring各环境个性配置
spring: spring:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment