From 0b41cffa071b82e96c53f9f0fc394259442e24d1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Jun 2020 16:40:39 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
index 0e5624d..8b98b0b 100644
--- a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
+++ b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
@@ -4,6 +4,7 @@
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject;
+import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.system.bean.LoginUserBean;
import com.xcong.excoin.configurations.properties.ApplicationProperties;
@@ -43,12 +44,20 @@
HttpServletRequest request = (HttpServletRequest) servletRequest;
String token = resolveToken(request);
if (StrUtil.isNotBlank(token)) {
- String loginStr = (String) redisUtils.get(AppContants.APP_LOGIN_PREFIX + token);
+ String redisKey = "";
+ // 根据user-agent判断pc端还是app端
+ if (LoginUserUtils.isBrowser(request)) {
+ redisKey = AppContants.PC_LOGIN_PREFIX + token;
+ } else {
+ redisKey = AppContants.APP_LOGIN_PREFIX + token;
+ }
+
+ String loginStr = (String) redisUtils.get(redisKey);
if (StrUtil.isNotBlank(loginStr)) {
LoginUserBean loginUser = JSONObject.parseObject(loginStr, LoginUserBean.class);
Authentication authentication = new UsernamePasswordAuthenticationToken(loginUser.getMemberEntity(), token, new ArrayList<>());
SecurityContextHolder.getContext().setAuthentication(authentication);
- redisUtils.expire(AppContants.APP_LOGIN_PREFIX + token, 300000);
+ redisUtils.expire(redisKey, 300000);
} else {
SecurityContextHolder.clearContext();
}
@@ -68,12 +77,12 @@
private String resolveToken(HttpServletRequest request) {
try {
// TODO debug模式下写死用户
- String bearerToken = "";
- if (applicationProperties.isDebug()) {
- bearerToken = "Bearer JSEre1ZUKEu2Ga5ORM+juxXv6yBwmt+FgLhxaeHf1EEJfIb3oRir4pXqe5JDhS6sXfLYOXRIAyBpq+SYBwAtGigxwzGVPn+k4Pt6vNxZ4h8Pk4IeG4+FqbFD0guzvu3WN2eRnnzYqCepl429v9Ju7n4jSG0Hj5ViM3MHQZs3qHo=";
- } else {
- bearerToken = request.getHeader(AppContants.TOKEN_HEADER);
- }
+ String bearerToken = request.getHeader(AppContants.TOKEN_HEADER);
+// if (applicationProperties.isDebug()) {
+// bearerToken = "Bearer JSEre1ZUKEu2Ga5ORM+juxXv6yBwmt+FgLhxaeHf1EEJfIb3oRir4pXqe5JDhS6sXfLYOXRIAyBpq+SYBwAtGigxwzGVPn+k4Pt6vNxZ4h8Pk4IeG4+FqbFD0guzvu3WN2eRnnzYqCepl429v9Ju7n4jSG0Hj5ViM3MHQZs3qHo=";
+// } else {
+// bearerToken = request.getHeader(AppContants.TOKEN_HEADER);
+// }
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(AppContants.TOKEN_START_WITH)) {
// 去掉令牌前缀
String rsaToken = bearerToken.replace(AppContants.TOKEN_START_WITH, "");
--
Gitblit v1.9.1