From 094f8eb3aeda3e2359327c6f5e6c7edfb131abdb Mon Sep 17 00:00:00 2001
From: shengzhang <2393584716@qq.com>
Date: Mon, 12 Apr 2021 11:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djwt=E9=9B=86=E6=88=90?=
=?UTF-8?q?=E7=A4=BA=E4=BE=8BAPI=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/pj/satoken/jwt/SaTokenJwtUtil.java | 14 +++++++-------
sa-token-doc/index.html | 6 ++++++
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/sa-token-demo-jwt/src/main/java/com/pj/satoken/jwt/SaTokenJwtUtil.java b/sa-token-demo-jwt/src/main/java/com/pj/satoken/jwt/SaTokenJwtUtil.java
index 1f6c8075..4a3a2025 100644
--- a/sa-token-demo-jwt/src/main/java/com/pj/satoken/jwt/SaTokenJwtUtil.java
+++ b/sa-token-demo-jwt/src/main/java/com/pj/satoken/jwt/SaTokenJwtUtil.java
@@ -2,16 +2,16 @@ package com.pj.satoken.jwt;
import java.util.Date;
-import javax.servlet.http.HttpServletRequest;
-
import org.springframework.stereotype.Component;
import cn.dev33.satoken.SaTokenManager;
import cn.dev33.satoken.config.SaTokenConfig;
+import cn.dev33.satoken.context.model.SaStorage;
import cn.dev33.satoken.dao.SaTokenDao;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.exception.SaTokenException;
import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.SaTokenInfo;
import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
@@ -122,15 +122,15 @@ public class SaTokenJwtUtil {
// 重写 (在当前会话上登录id )
@Override
- public void setLoginId(Object loginId, String device) {
+ public void setLoginId(Object loginId, SaLoginModel loginModel) {
// ------ 1、获取相应对象
- HttpServletRequest request = SaTokenManager.getSaTokenServlet().getRequest();
+ SaStorage storage = SaTokenManager.getSaTokenContext().getStorage();
SaTokenConfig config = getConfig();
// ------ 2、生成一个token
String tokenValue = createTokenValue(loginId);
- request.setAttribute(splicingKeyJustCreatedSave(), tokenValue); // 将token保存到本次request里
+ storage.set(splicingKeyJustCreatedSave(), tokenValue); // 将token保存到本次request里
if(config.getIsReadCookie() == true){ // cookie注入
- SaTokenManager.getSaTokenCookie().addCookie(SaTokenManager.getSaTokenServlet().getResponse(), getTokenName(), tokenValue, "/", config.getCookieDomain(), (int)config.getTimeout());
+ SaTokenManager.getSaTokenContext().getResponse().addCookie(getTokenName(), tokenValue, "/", config.getCookieDomain(), (int)config.getTimeout());
}
}
@@ -154,7 +154,7 @@ public class SaTokenJwtUtil {
}
// 如果打开了cookie模式，把cookie清除掉
if(getConfig().getIsReadCookie() == true){
- SaTokenManager.getSaTokenCookie().delCookie(SaTokenManager.getSaTokenServlet().getRequest(), SaTokenManager.getSaTokenServlet().getResponse(), getTokenName());
+ SaTokenManager.getSaTokenContext().getResponse().deleteCookie(getTokenName());
}
}
diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index dd86877a..55d96642 100644
--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@@ -188,6 +188,12 @@
+
+ 
+
+
+ 
+