|
@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
import com.yxt.portal.biz.sms.SmsFeign; |
|
|
import com.yxt.portal.biz.sms.SmsFeign; |
|
|
import com.yxt.portal.biz.sysmenu.SysMenu; |
|
|
import com.yxt.portal.biz.sysmenu.SysMenu; |
|
|
//import com.yxt.user.biz.sysmobilemenu.SysMobileMenu;
|
|
|
|
|
|
import com.yxt.portal.biz.sysorganization.SysOrganization; |
|
|
import com.yxt.portal.biz.sysorganization.SysOrganization; |
|
|
import com.yxt.portal.biz.sysrole.SysRoleVo; |
|
|
import com.yxt.portal.biz.sysrole.SysRoleVo; |
|
|
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo; |
|
|
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo; |
|
@ -21,12 +20,10 @@ import com.yxt.portal.biz.sysrole.SysRoleService; |
|
|
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; |
|
|
import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; |
|
|
import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; |
|
|
import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; |
|
|
import com.yxt.portal.biz.sysstaffpost.SysStaffPostService; |
|
|
import com.yxt.portal.biz.sysstaffpost.SysStaffPostService; |
|
|
//import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgService;
|
|
|
|
|
|
import com.yxt.portal.biz.sysuser.app.OrgList; |
|
|
import com.yxt.portal.biz.sysuser.app.OrgList; |
|
|
import com.yxt.portal.biz.sysuser.wx.WxHomePageVo; |
|
|
import com.yxt.portal.biz.sysuser.wx.WxHomePageVo; |
|
|
import com.yxt.portal.biz.sysuser.wx.WxMySysUserInfoVo; |
|
|
import com.yxt.portal.biz.sysuser.wx.WxMySysUserInfoVo; |
|
|
import com.yxt.portal.biz.sysuser.wx.WxSysUserVo; |
|
|
import com.yxt.portal.biz.sysuser.wx.WxSysUserVo; |
|
|
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrg; |
|
|
|
|
|
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgService; |
|
|
import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgService; |
|
|
import com.yxt.portal.biz.sysuserrole.SysUserRoleService; |
|
|
import com.yxt.portal.biz.sysuserrole.SysUserRoleService; |
|
|
import com.yxt.common.base.config.RedisUtil; |
|
|
import com.yxt.common.base.config.RedisUtil; |
|
@ -831,7 +828,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
int num = result; |
|
|
int num = result; |
|
|
verificationCode = verificationCode + num; |
|
|
verificationCode = verificationCode + num; |
|
|
} |
|
|
} |
|
|
String verificationCode1 = "注册验证码:" + verificationCode + ",有效期5分钟,如非本人操作,请忽略。"+"【商享通】"; |
|
|
String verificationCode1 = "注册验证码:" + verificationCode + ",有效期5分钟,如非本人操作,请忽略。"; |
|
|
try { |
|
|
try { |
|
|
//============
|
|
|
//============
|
|
|
//当前时间秒数
|
|
|
//当前时间秒数
|
|
@ -855,6 +852,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
if (!str) { |
|
|
if (!str) { |
|
|
redisUtil.set(mobile, (verificationCode + timemili)); |
|
|
redisUtil.set(mobile, (verificationCode + timemili)); |
|
|
String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); |
|
|
String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); |
|
|
|
|
|
log.error("发送短信验证码的结果:======"+result); |
|
|
if (!RESULT_CODE.equals(result)) { |
|
|
if (!RESULT_CODE.equals(result)) { |
|
|
return ResultBean.fireFail().setMsg("发送短信验证码失败"); |
|
|
return ResultBean.fireFail().setMsg("发送短信验证码失败"); |
|
|
} |
|
|
} |
|
@ -867,6 +865,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
//发送短信
|
|
|
//发送短信
|
|
|
redisUtil.set(mobile, (verificationCode + timemili)); |
|
|
redisUtil.set(mobile, (verificationCode + timemili)); |
|
|
String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); |
|
|
String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); |
|
|
|
|
|
log.error("发送短信验证码的结果:======"+result); |
|
|
if (!RESULT_CODE.equals(result)) { |
|
|
if (!RESULT_CODE.equals(result)) { |
|
|
return ResultBean.fireFail().setMsg("发送短信验证码失败"); |
|
|
return ResultBean.fireFail().setMsg("发送短信验证码失败"); |
|
|
} |
|
|
} |
|
|