Commit 15f5e953 authored by xuepeng.chang's avatar xuepeng.chang

金融token 在电商的续期问题

parent 224c9c6e
......@@ -224,6 +224,7 @@ public interface Constants {
String USER_SESSION_ID_CACHE = "userid-sessionvalue:cache:";
String USER_SESSION_KEY_SET = "userid-keys:set:";
Long SESSION_VALID_TIME = 15 * 24 * 60 * 60L;
Long SESSION_EXCHANGE_VALID_TIME = 380L;
}
interface UserAvatar {
......
......@@ -69,7 +69,8 @@ public class UserQueryLogController {
* @yapi http://yapi.quantgroups.com/project/17/interface/api/259
*/
@RequestMapping("/queryLog")
public JsonResult queryLog(HttpServletRequest request, @RequestParam(required = false) String beginDate, @RequestParam(required = false) String endDate, Integer pageId, Integer pageSize) {
public JsonResult queryLog(HttpServletRequest request, @RequestParam(required = false) String beginDate,
@RequestParam(required = false) String endDate, Integer pageId, Integer pageSize) {
log.info("查询日期:beginDate{},endDate{}", beginDate, endDate);
String token = request.getHeader(Constants.X_AUTH_TOKEN);
checkUserToken(token);
......
......@@ -16,6 +16,7 @@ import cn.quantgroup.xyqb.util.ValidationUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
......@@ -39,6 +40,8 @@ public class UserApiController implements IBaseController {
private RedisTemplate<String, String> stringRedisTemplate;
@Resource
private ISmsService smsService;
@Value("${token.prefix}")
private String prefix;
@RequestMapping("/user/is_passwd_set")
public JsonResult isPasswordSet(String phoneNo , @RequestHeader(value = Constants.X_AUTH_TENANT,defaultValue = UserConstant.defaultTenantIdString) Integer tenantId) {
......@@ -72,6 +75,11 @@ public class UserApiController implements IBaseController {
if (Objects.isNull(token) || !ValidationUtil.validateToken(token)) {
return JsonResult.buildErrorStateResult("token regular invalid ", token);
}
// 金融token 在电商不续期
if(!token.contains(prefix)){
log.info("jr token在电商侧不做续期:[{}],", token);
return JsonResult.buildErrorStateResult("jr token regular invalid ", token);
}
Long registeredFrom = getRegisteredFrom();
String tokenKey = Constants.SESSION_PREFIX + token;
......
......@@ -389,11 +389,12 @@ public class SessionServiceImpl implements ISessionService {
} else {
tokenKey2 = Constants.Session.USER_SESSION_CACHE + tenantId + ":" + token;
}
stringRedisTemplate.opsForValue().set(tokenKey2, json,
Constants.Session.SESSION_VALID_TIME, TimeUnit.SECONDS);
// 单用户单次访问的最大的平均访问时间 SESSION_EXCHANGE_VALID_TIME
// 获取下expire和SESSION_EXCHANGE_VALID_TIME的最小值
long expireTime = Math.min(expire, Constants.Session.SESSION_EXCHANGE_VALID_TIME);
stringRedisTemplate.opsForValue().set(tokenKey2, json,expireTime, TimeUnit.SECONDS);
String key = generateLoginPropertiesKey(sessionValue.getUser().getId(), sessionValue.getLoginProperties(), tenantId);
stringRedisTemplate.opsForValue().set(key, token, expire, TimeUnit.SECONDS);
stringRedisTemplate.opsForValue().set(key, token, expireTime, TimeUnit.SECONDS);
setUserIdTokenKeys(sessionValue.getUser().getId(), key, tenantId);
}
......
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