Merge branch 'mergeuat' into 'master'

群二维码链接 See merge request rays/pcloud-common-parent!8

Merge branch 'mergeuat' into 'master'
群二维码链接 See merge request rays/pcloud-common-parent!8
53481fb6 · 高鹏 · 45b743cb · 66a3bda8 · 53481fb6 · 53481fb6
Commit 53481fb6 authored Feb 14, 2019 by 高鹏
Showing with 2 additions and 0 deletions

public_system.properties ...n-config/src/main/resources.prod/public_system.properties +1 -0

public_system.properties ...on-config/src/main/resources.uat/public_system.properties +1 -0

No files found.
--- a/pcloud-common-config/src/main/resources.prod/public_system.properties
+++ b/pcloud-common-config/src/main/resources.prod/public_system.properties
@@ -82,6 +82,7 @@ sms.signName=\u73B0\u4EE3\u7EB8\u4E66
 liveRunEnvironment = prod_

 uedThirdPartyOrderUrl=https://rayscloud.chubanyun.net 
+group.qr.domain = https://weixin23.5rs.me/W23/C3/other/

 ## \u7CFB\u7EDF\u73AF\u5883
 system.env = pro

--- a/pcloud-common-config/src/main/resources.uat/public_system.properties
+++ b/pcloud-common-config/src/main/resources.uat/public_system.properties
@@ -84,6 +84,7 @@ sms.signName=\u73B0\u4EE3\u7EB8\u4E66
 liveRunEnvironment = uat_

 uedThirdPartyOrderUrl=http://deveapi.chubanyun.net
+group.qr.domain = https://weixin35515.raysyun.com/W35515/C35515/other/

 ## \u7CFB\u7EDF\u73AF\u5883
 system.env = uat