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

Commit 741b8c4a authored by 胡佳晨's avatar 胡佳晨

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

parents 381e48da afc6ca63
......@@ -63,7 +63,7 @@ liquidnet:
phpMallUrl: https://testmall.zhengzai.tv
phpMerchantApiUrl: https://testmerchantapi.zhengzai.tv
phpPassportUrl: https://testpassport.zhengzai.tv
platformUrl: https://devplatform.zhengzai.tv
platformUrl: https://testplatform.zhengzai.tv
shunfeng:
url: "https://butler-dev-ms.sf-express.com"
sk: 21e9a70f677a2bf29dfa2b3bead4f018
......
......@@ -3,7 +3,7 @@ liquidnet:
updating:
switch: false
info:
port: 9001
port: 9003
context: /platform
name: liquidnet-service-platform
logfile:
......@@ -11,7 +11,7 @@ liquidnet:
name: service-platform
config: classpath:logback-spring.xml
file-max-size: 200MB
level: info
level: debug
rabbitmq:
connection-timeout: 5000
mysql:
......
......@@ -3,7 +3,7 @@ liquidnet:
updating:
switch: false
info:
port: 9001
port: 9003
context: /platform
name: liquidnet-service-platform
logfile:
......@@ -11,7 +11,7 @@ liquidnet:
name: service-platform
config: classpath:logback-spring.xml
file-max-size: 200MB
level: info
level: debug
rabbitmq:
connection-timeout: 5000
mysql:
......
......@@ -135,6 +135,8 @@ global-auth:
- ${liquidnet.info.context}/webjars/**
- ${liquidnet.info.context}/swagger-resources/**
- ${liquidnet.info.context}/v2/api-docs*
# 退款回掉
- ${liquidnet.info.context}/refund/callback
# -----------------------------------------------------------
......
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