|
@ -81,7 +81,46 @@ public class AppSysUserRest implements AppSysUserFeign { |
|
|
if (StringUtils.isBlank(verifyCode)) return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空"); |
|
|
if (StringUtils.isBlank(verifyCode)) return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空"); |
|
|
// 访问后清理key
|
|
|
// 访问后清理key
|
|
|
} |
|
|
} |
|
|
|
|
|
boolean isTest = userQuery.isTest(); |
|
|
|
|
|
if (isTest) {//添加测试版
|
|
|
|
|
|
SysUser sysUser = sysUserService.selectByUserNameApp(userName); |
|
|
|
|
|
if (sysUser == null) { |
|
|
|
|
|
sysUser = sysUserService.selectByMobile(userName); |
|
|
|
|
|
if (sysUser == null) { |
|
|
|
|
|
return rb.setMsg("账号不存在"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
if (type.equals("1")) { |
|
|
|
|
|
String md5 = Encodes.md5(password); |
|
|
|
|
|
if (md5.equals(sysUser.getPassword())) { |
|
|
|
|
|
sysUserService.updateAppId(sysUser.getSid(), appId); |
|
|
|
|
|
SysUserVo sysUserVo = sysUserService.selectUser(sysUser); |
|
|
|
|
|
if (sysUserVo == null) { |
|
|
|
|
|
return rb.setMsg("该用户不是公司员工"); |
|
|
|
|
|
} |
|
|
|
|
|
insertLoginLog(sysUser); |
|
|
|
|
|
return new ResultBean<SysUserVo>().success().setData(sysUserVo); |
|
|
|
|
|
} else { |
|
|
|
|
|
return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误"); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
String codeFromRedis = redisUtil.get("loginCode" + userName); |
|
|
|
|
|
if (StringUtils.isBlank(codeFromRedis)) |
|
|
|
|
|
return new ResultBean<SysUserVo>().fail().setMsg("短信验证码已失效,请重新发送"); |
|
|
|
|
|
if (verifyCode.equals(codeFromRedis.substring(0, 4))) { |
|
|
|
|
|
sysUserService.updateAppId(sysUser.getSid(), appId); |
|
|
|
|
|
SysUserVo sysUserVo = sysUserService.selectUser(sysUser); |
|
|
|
|
|
if (sysUserVo == null) { |
|
|
|
|
|
return rb.setMsg("该用户不是公司员工"); |
|
|
|
|
|
} |
|
|
|
|
|
redisUtil.remove("loginCode" + userName); |
|
|
|
|
|
insertLoginLog(sysUser); |
|
|
|
|
|
return new ResultBean<SysUserVo>().success().setData(sysUserVo); |
|
|
|
|
|
} else { |
|
|
|
|
|
return new ResultBean<SysUserVo>().fail().setMsg("短信验证码错误或已失效,请重新获取"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
SysUser sysUser = sysUserService.selectByAppId(appId); |
|
|
SysUser sysUser = sysUserService.selectByAppId(appId); |
|
|
if (null == sysUser) { // 未查询到绑定的账号
|
|
|
if (null == sysUser) { // 未查询到绑定的账号
|
|
|
sysUser = sysUserService.selectByUserNameApp(userName); |
|
|
sysUser = sysUserService.selectByUserNameApp(userName); |
|
@ -163,6 +202,7 @@ public class AppSysUserRest implements AppSysUserFeign { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 插入登录日志 |
|
|
* 插入登录日志 |
|
|