Commit debec3a1 authored by Java-刘 彧阳's avatar Java-刘 彧阳

新增重置密码接口,供内容部运营人员使用

parent cc838690
...@@ -61,6 +61,8 @@ public class WeChatController implements IBaseController { ...@@ -61,6 +61,8 @@ public class WeChatController implements IBaseController {
@Value("${xyqb-user.ui}") @Value("${xyqb-user.ui}")
private String userUIAddr; private String userUIAddr;
@Value("${xyqb.user.domain}")
private String userDomainStr;
/** /**
* 开发者资质认证,有必要吗? * 开发者资质认证,有必要吗?
...@@ -377,10 +379,10 @@ public class WeChatController implements IBaseController { ...@@ -377,10 +379,10 @@ public class WeChatController implements IBaseController {
} }
private String createUserSession(User user, Merchant merchant, String redirect, String schema, Long registerFrom) { private String createUserSession(User user, Merchant merchant, String redirect, String schema, Long registerFrom) {
//TODO 临时紧急上线修改的.下次上线的时候修复一下,不能这样写. //String url = "http://passport.xyqb.com";
String url = "http://passport.xyqb.com"; String url = "http://"+userDomainStr;
if ("https:".equals(schema)) { if ("https:".equals(schema)) {
url = "https://passport.xyqb.com"; url = "https://"+userDomainStr;
} }
if (StringUtils.isEmpty(redirect) || "redirect".equals(redirect)) { if (StringUtils.isEmpty(redirect) || "redirect".equals(redirect)) {
LOGGER.info("微信登录:redirect为null,走正常流程."); LOGGER.info("微信登录:redirect为null,走正常流程.");
......
...@@ -60,4 +60,7 @@ registry.address=192.168.4.164:2181 ...@@ -60,4 +60,7 @@ registry.address=192.168.4.164:2181
motan.port=8082 motan.port=8082
motan.user.group=userGroup motan.user.group=userGroup
motan.user.module=user-motan-rpc motan.user.module=user-motan-rpc
motan.application=xyqbUserMotan motan.application=xyqbUserMotan
\ No newline at end of file
#xyqb-user-域名
xyqb.user.domain=passport.xyqb.com
\ No newline at end of file
...@@ -48,3 +48,5 @@ motan.user.group=userGroup ...@@ -48,3 +48,5 @@ motan.user.group=userGroup
motan.user.module=user-motan-rpc motan.user.module=user-motan-rpc
motan.application=xyqbUserMotan motan.application=xyqbUserMotan
#xyqb-user-域名
xyqb.user.domain=passport.xyqb.com
\ No newline at end of file
...@@ -48,4 +48,7 @@ xyqb.auth.url=http://192.168.192.206:9001 ...@@ -48,4 +48,7 @@ xyqb.auth.url=http://192.168.192.206:9001
usersys.url=http://localhost:9001 usersys.url=http://localhost:9001
xyqb-user.ui=http://192.168.12.40:8080 xyqb-user.ui=http://192.168.12.40:8080
wechat.appid=wxcdf6077af8127559 wechat.appid=wxcdf6077af8127559
wechat.secret=16eaec16084d0d9c52d4114f359cc72c wechat.secret=16eaec16084d0d9c52d4114f359cc72c
\ No newline at end of file
#xyqb-user-域名
xyqb.user.domain=passport.xyqb.com
\ No newline at end of file
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