Merge branch 'baitiao_channel'

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

src/main/resources/config/dev/xyqb.properties

@@ -71,6 +71,7 @@ xyqb.auth.url=http://192.168.192.206:9001
 usersys.url=http://localhost:9001
 
 xyqb-user.ui=http://192.168.100.36:7043
+xyqb-user.ui-s=https://192.168.100.36:7043
 wechat.appid=wxcdf6077af8127559
 wechat.secret=16eaec16084d0d9c52d4114f359cc72c
 

src/main/resources/config/release01/xyqb.properties

@@ -36,6 +36,7 @@ jr58.notify.userinfo=http://dk.58.com/customer/quantgroup_user_info
 model.quantgroup.url=http://model.quantgroup.cn
 xyqb.auth.url=http://auth.xyqb.com
 xyqb-user.ui=http://passport.xyqb.com
+xyqb-user.ui-s=https://passport.xyqb.com
 #motan protocol
 protocol.name=motan
 protocol.contentLength=1048576