Commit ccf762df authored by zhouxudong's avatar zhouxudong

七天过期

parent ad91f294
...@@ -38,16 +38,7 @@ public class CurrentUserInterceptor implements AsyncHandlerInterceptor { ...@@ -38,16 +38,7 @@ public class CurrentUserInterceptor implements AsyncHandlerInterceptor {
// 判断是否续期 // 判断是否续期
Long expire = RedisUtil.getExpire(RedisConstants.token + jwtUser.getPhone()); Long expire = RedisUtil.getExpire(RedisConstants.token + jwtUser.getPhone());
if (expire < Constants.addTime) { if (expire < Constants.addTime) {
Object result = RedisUtil.get(RedisConstants.seventoken + jwtUser.getPhone()); RedisUtil.set(RedisConstants.token + jwtUser.getPhone(), token, Constants.sevenTime, TimeUnit.SECONDS);
RedisUtil.set(
RedisConstants.token + jwtUser.getPhone(),
token,
(!ObjectUtils.isEmpty(result) && Boolean.parseBoolean(result.toString()))
? Constants.sevenTime
: Constants.expireTime,
TimeUnit.SECONDS);
} }
// 根据token信息,生成当前登录用户信息的设置,存放容器threadlocal // 根据token信息,生成当前登录用户信息的设置,存放容器threadlocal
BaseContextHandler.setCurrentUserInfo(jwtUser); BaseContextHandler.setCurrentUserInfo(jwtUser);
......
...@@ -10,8 +10,6 @@ public class RedisConstants { ...@@ -10,8 +10,6 @@ public class RedisConstants {
//------------------redis key-------------------------- //------------------redis key--------------------------
public static final String token="Token:"; public static final String token="Token:";
//是否7天免登录
public static final String seventoken="Seven_Token:";
//手机验证码 规则: 手机验证码:验证码类型:手机号 //手机验证码 规则: 手机验证码:验证码类型:手机号
public static final String MSG_KEY="phone:message:"; public static final String MSG_KEY="phone:message:";
//用户查看数据详情 使用额度 map存储: 格式: key phone + ":" + type value //用户查看数据详情 使用额度 map存储: 格式: key phone + ":" + type value
......
...@@ -106,20 +106,9 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs ...@@ -106,20 +106,9 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
String token = JwtTokenUtil.createToken(sysUserInfo, null); String token = JwtTokenUtil.createToken(sysUserInfo, null);
RedisUtil.set( RedisUtil.set(
RedisConstants.token + sysUserInfo.getPhonenumber(), RedisConstants.token + sysUserInfo.getPhonenumber(),
token, token, Constants.sevenTime,
(!ObjectUtils.isEmpty(loginVo.getStatus()) && loginVo.getStatus())
? Constants.sevenTime
: Constants.expireTime,
TimeUnit.SECONDS); TimeUnit.SECONDS);
//是否开启7天免登录
RedisUtil.set(
RedisConstants.seventoken + sysUserInfo.getPhonenumber(),
!ObjectUtils.isEmpty(loginVo.getStatus()) && loginVo.getStatus(),
(!ObjectUtils.isEmpty(loginVo.getStatus()) && loginVo.getStatus())
? Constants.sevenTime
: Constants.expireTime,
TimeUnit.SECONDS);
// 将用户基本信息一起返回 // 将用户基本信息一起返回
UserInfoVo userInfoVo = UserInfoVo userInfoVo =
new UserInfoVo() new UserInfoVo()
...@@ -157,19 +146,7 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs ...@@ -157,19 +146,7 @@ public class SysUserInfoServiceImpl extends ServiceImpl<SysUserInfoMapper, SysUs
RedisUtil.set( RedisUtil.set(
RedisConstants.token + sysUserInfo.getPhonenumber(), RedisConstants.token + sysUserInfo.getPhonenumber(),
token, token, Constants.sevenTime,
(!ObjectUtils.isEmpty(phoneLoginVo.getStatus()) && phoneLoginVo.getStatus())
? Constants.sevenTime
: Constants.expireTime,
TimeUnit.SECONDS);
//是否开启7天免登录
RedisUtil.set(
RedisConstants.seventoken + sysUserInfo.getPhonenumber(),
!ObjectUtils.isEmpty(phoneLoginVo.getStatus()) && phoneLoginVo.getStatus(),
(!ObjectUtils.isEmpty(phoneLoginVo.getStatus()) && phoneLoginVo.getStatus())
? Constants.sevenTime
: Constants.expireTime,
TimeUnit.SECONDS); TimeUnit.SECONDS);
// 将用户基本信息一起返回 // 将用户基本信息一起返回
......
...@@ -38,6 +38,4 @@ public class LoginVo { ...@@ -38,6 +38,4 @@ public class LoginVo {
// @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*\\\\d)(?=.*[@$!%*#?&])[A-Za-z\\\\d@$!%*#?&]{6,20}$", message = "密码长度必须大于等于6位,小于等于20") // @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*\\\\d)(?=.*[@$!%*#?&])[A-Za-z\\\\d@$!%*#?&]{6,20}$", message = "密码长度必须大于等于6位,小于等于20")
@ApiModelProperty(value = "密码",required = true) @ApiModelProperty(value = "密码",required = true)
private String password; private String password;
@ApiModelProperty(value = "是否开启7天免登录")
private Boolean status;
} }
...@@ -30,6 +30,4 @@ public class PhoneLoginVo { ...@@ -30,6 +30,4 @@ public class PhoneLoginVo {
@NotEmpty(message ="验证码不能为空") @NotEmpty(message ="验证码不能为空")
@ApiModelProperty(value = "验证码",required = true) @ApiModelProperty(value = "验证码",required = true)
private String code; private String code;
@ApiModelProperty(value = "是否开启7天免登录")
private Boolean status;
} }
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