Commit 646b66c4 by pye52

Merge branch 'develop' into rel-1.3.6

parents 81ee49d8 71ca66c6
...@@ -36,12 +36,12 @@ android { ...@@ -36,12 +36,12 @@ android {
dev { dev {
dimension "smart_canteen" dimension "smart_canteen"
buildConfigField "String", "MainWebSocketServerUrl", '"ws://10.187.43.221:9001/websocket/%s/V%s"' buildConfigField "String", "MainWebSocketServerUrl", '"ws://10.187.43.221:9001/websocket/%s/V%s"'
buildConfigField "String", "MainHttpServerHost", '"http://diningbackdev.bgy.com.cn"' buildConfigField "String", "MainHttpServerHost", '"https://diningbackdev.bgy.com.cn"'
} }
tes { tes {
dimension "smart_canteen" dimension "smart_canteen"
buildConfigField "String", "MainWebSocketServerUrl", '"wss://diningservicetest.bgy.com.cn/websocket/%s/V%s"' buildConfigField "String", "MainWebSocketServerUrl", '"wss://diningservicetest.bgy.com.cn/websocket/%s/V%s"'
buildConfigField "String", "MainHttpServerHost", '"http://diningbacktest.bgy.com.cn:9000"' buildConfigField "String", "MainHttpServerHost", '"https://diningbacktest.bgy.com.cn"'
} }
uat { uat {
dimension "smart_canteen" dimension "smart_canteen"
......
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 sign in to comment