lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-04-05 17:37:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复 getContext 拼写错误

Browse Source
This commit is contained in:
click33 2021-08-16 02:18:59 +08:00
parent 35814bbb66
commit d8ad47193e
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/TestController.java
View File

@ -48,7 +48,7 @@ public class TestController {
public Mono<AjaxJson> isLogin3() {
System.out.println("当前会话是否登录：" + StpUtil.isLogin());
// 异步方式
return SaReactorHolder.getContent().map(e -> {
return SaReactorHolder.getContext().map(e -> {
System.out.println("当前会话是否登录2：" + StpUtil.isLogin());
return AjaxJson.getSuccessData(StpUtil.getTokenInfo());
});
@ -60,7 +60,7 @@ public class TestController {
System.out.println("当前会话是否登录：" + StpUtil.isLogin());
System.out.println("线程id-----" + Thread.currentThread().getId());
return Mono.delay(Duration.ofSeconds(1)).flatMap(r->{
return SaReactorHolder.getContent().map(rr->{
return SaReactorHolder.getContext().map(rr->{
System.out.println("线程id---内--" + Thread.currentThread().getId());
System.out.println("当前会话是否登录2：" + StpUtil.isLogin());
return AjaxJson.getSuccessData(StpUtil.getTokenInfo());

4
sa-token-doc/doc/more/common-action.md
View File

@ -86,12 +86,12 @@ SpringMVCUtil.getResponse(); // 获取当前会话的 response
Sa-Token集成Reactor时的 ServerWebExchange 工具类，位于包：`sa-token-reactor-spring-boot-starter`
``` java
// 异步方式获取 ServerWebExchange 对象
SaReactorHolder.getContent().map(e -> {
SaReactorHolder.getContext().map(e -> {
System.out.println(e);
});
// 同步方式获取 ServerWebExchange 对象
ServerWebExchange e = SaReactorSyncHolder.getContent();
ServerWebExchange e = SaReactorSyncHolder.getContext();
System.out.println(e);
```

8
sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
View File

@ -25,7 +25,7 @@ public class SaReactorHolder {
* 获取上下文对象
* @return see note
*/
public static Mono<ServerWebExchange> getContent() {
public static Mono<ServerWebExchange> getContext() {
// 从全局 Mono<Context> 获取
return Mono.subscriberContext().map(ctx -> ctx.get(CONTEXT_KEY));
}
@ -34,15 +34,15 @@ public class SaReactorHolder {
* 获取上下文对象, 并设置到同步上下文中
* @return see note
*/
public static Mono<ServerWebExchange> getContentAndSetSync() {
public static Mono<ServerWebExchange> getContextAndSetSync() {
// 从全局 Mono<Context> 获取
return Mono.subscriberContext().map(ctx -> {
// 设置到sync中
SaReactorSyncHolder.setContent(ctx.get(CONTEXT_KEY));
SaReactorSyncHolder.setContext(ctx.get(CONTEXT_KEY));
return ctx.get(CONTEXT_KEY);
}).doFinally(r->{
// 从sync中清除
SaReactorSyncHolder.clearContent();
SaReactorSyncHolder.clearContext();
});
}

12
sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
View File

@ -23,7 +23,7 @@ public class SaReactorSyncHolder {
* 写入上下文对象
* @param exchange see note
*/
public static void setContent(ServerWebExchange exchange) {
public static void setContext(ServerWebExchange exchange) {
SaRequest request = new SaRequestForReactor(exchange.getRequest());
SaResponse response = new SaResponseForReactor(exchange.getResponse());
SaStorage storage = new SaStorageForReactor(exchange);
@ -34,7 +34,7 @@ public class SaReactorSyncHolder {
* 获取上下文对象
* @return see note
*/
public static ServerWebExchange getContent() {
public static ServerWebExchange getContext() {
Box box = SaTokenContextForThreadLocalStorage.getBoxNotNull();
return (ServerWebExchange)box.getStorage().getSource();
}
@ -42,7 +42,7 @@ public class SaReactorSyncHolder {
/**
* 清除上下文对象
*/
public static void clearContent() {
public static void clearContext() {
SaTokenContextForThreadLocalStorage.clearBox();
}
@ -51,12 +51,12 @@ public class SaReactorSyncHolder {
* @param exchange see note
* @param fun see note
*/
public static void setContent(ServerWebExchange exchange, SaFunction fun) {
public static void setContext(ServerWebExchange exchange, SaFunction fun) {
try {
setContent(exchange);
setContext(exchange);
fun.run();
} finally {
clearContent();
clearContext();
}
}

8
sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
View File

@ -158,7 +158,7 @@ public class SaReactorFilter implements WebFilter {
// ---------- 全局认证处理
try {
// 写入全局上下文 (同步)
SaReactorSyncHolder.setContent(exchange);
SaReactorSyncHolder.setContext(exchange);
// 执行全局过滤器
SaRouter.match(includeList, excludeList, () -> {
@ -180,13 +180,13 @@ public class SaReactorFilter implements WebFilter {
} finally {
// 清除上下文
SaReactorSyncHolder.clearContent();
SaReactorSyncHolder.clearContext();
}
// ---------- 执行
// 写入全局上下文 (同步)
SaReactorSyncHolder.setContent(exchange);
SaReactorSyncHolder.setContext(exchange);
// 执行
return chain.filter(exchange).subscriberContext(ctx -> {
@ -195,7 +195,7 @@ public class SaReactorFilter implements WebFilter {
return ctx;
}).doFinally(r -> {
// 清除上下文
SaReactorSyncHolder.clearContent();
SaReactorSyncHolder.clearContext();
});
}

2
sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
View File

@ -95,7 +95,7 @@ public class SaRequestForReactor implements SaRequest {
*/
@Override
public Object forward(String path) {
ServerWebExchange exchange = SaReactorSyncHolder.getContent();
ServerWebExchange exchange = SaReactorSyncHolder.getContext();
WebFilterChain chain = exchange.getAttribute(SaReactorHolder.CHAIN_KEY);
ServerHttpRequest newRequest = request.mutate().path(path).build();