updates
This commit is contained in:
parent
ad87873dc3
commit
718d773648
|
|
@ -70,6 +70,7 @@ public class WebUserController {
|
||||||
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
||||||
user.setOrgCode(null);
|
user.setOrgCode(null);
|
||||||
user.setIp(ipAddr);
|
user.setIp(ipAddr);
|
||||||
|
user.setProgramType("艺体志愿宝");
|
||||||
sysUserService.saveUser(user, null, null, null);
|
sysUserService.saveUser(user, null, null, null);
|
||||||
//注册成功后,直接登录
|
//注册成功后,直接登录
|
||||||
sysLoginModel.setUsername(sysLoginModel.getPhone());
|
sysLoginModel.setUsername(sysLoginModel.getPhone());
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,10 @@ public class WebUserService {
|
||||||
String syspassword = sysUser.getPassword();
|
String syspassword = sysUser.getPassword();
|
||||||
AssertUtils.isTrue(syspassword.equals(userpassword), "手机号或密码错误");
|
AssertUtils.isTrue(syspassword.equals(userpassword), "手机号或密码错误");
|
||||||
//用户登录信息
|
//用户登录信息
|
||||||
|
//获取vip信息
|
||||||
|
VipDTO vipDTO = miniUserService.getUserVip(sysUser.getId());
|
||||||
|
AssertUtils.notNull(vipDTO, "当前为非会员账号,请移步到小程序使用");
|
||||||
|
AssertUtils.notTrue(vipDTO.getVipLevel() == 0, "当前为非会员账号,请移步到小程序使用");
|
||||||
//生成token
|
//生成token
|
||||||
String token = JwtUtil.sign(sysUser.getUsername(), syspassword);
|
String token = JwtUtil.sign(sysUser.getUsername(), syspassword);
|
||||||
// 设置token缓存有效时间
|
// 设置token缓存有效时间
|
||||||
|
|
@ -70,7 +74,6 @@ public class WebUserService {
|
||||||
//添加日志
|
//添加日志
|
||||||
baseCommonService.addLog("前台用户登录:用户名: " + sysUser.getUsername() + ",登录成功!", CommonConstant.LOG_TYPE_1, null);
|
baseCommonService.addLog("前台用户登录:用户名: " + sysUser.getUsername() + ",登录成功!", CommonConstant.LOG_TYPE_1, null);
|
||||||
//获取vip信息
|
//获取vip信息
|
||||||
VipDTO vipDTO = miniUserService.getUserVip(sysUser.getId());
|
|
||||||
if (vipDTO != null) {
|
if (vipDTO != null) {
|
||||||
obj.put("vipInfo", vipDTO);
|
obj.put("vipInfo", vipDTO);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue