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

Commit b45ecf51 authored by 张国柄's avatar 张国柄

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

parents 7fba3a34 27f2b596
......@@ -20,11 +20,11 @@ liquidnet:
mysql:
database-name: 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"
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/"
url: http://testservice.zhengzai.tv/
#以下为spring各环境个性配置
spring:
......
......@@ -20,11 +20,11 @@ liquidnet:
mysql:
database-name: 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"
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/"
url: http://testservice.zhengzai.tv/
#以下为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