wangli/axzo-lib-box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 优化context

Browse Source
This commit is contained in:
zengxiaobo 2024-05-27 18:23:13 +08:00
parent 15854e5f63
commit 21487eadf6
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
web-support-lib/src/main/java/cn/axzo/foundation/web/support/context/AxContextInterceptor.java
View File

@ -49,19 +49,8 @@ public class AxContextInterceptor implements HandlerInterceptor {
String authorization = request.getHeader("Authorization"); String authorization = request.getHeader("Authorization");
if (!Strings.isNullOrEmpty(authorization) && appRuntime.getEnv() == AppEnvEnum.local) { if (!Strings.isNullOrEmpty(authorization) && appRuntime.getEnv() == AppEnvEnum.local) {
AxContext authContext = tryGetContextAuthorization(authorization, request); AxContext localContext = tryGetContextAuthorization(authorization, request);
if (authContext.getAxUser() != null) { merge(context, localContext);
context.setAxUser(authContext.getAxUser());
}
if (authContext.getOuId() != null) {
context.setOuId(authContext.getOuId());
}
if (authContext.getWorkspaceId() != null) {
context.setWorkspaceId(authContext.getWorkspaceId());
}
if (authContext.getTerminal() != null) {
context.setTerminal(authContext.getTerminal());
}
} }
AxContext.set(context); AxContext.set(context);
return true; return true;
@ -73,6 +62,24 @@ public class AxContextInterceptor implements HandlerInterceptor {
AxContext.clear(); AxContext.clear();
} }
private void merge(AxContext headerContext, AxContext localContext) {
if (localContext == null) {
return;
}
if (localContext.getAxUser() != null) {
headerContext.setAxUser(localContext.getAxUser());
}
if (localContext.getOuId() != null) {
headerContext.setOuId(localContext.getOuId());
}
if (localContext.getWorkspaceId() != null) {
headerContext.setWorkspaceId(localContext.getWorkspaceId());
}
if (localContext.getTerminal() != null) {
headerContext.setTerminal(localContext.getTerminal());
}
}
/** /**
* 支持传入明文的authentication 或者通过puge接口支持 * 支持传入明文的authentication 或者通过puge接口支持
* 明文格式: authentication: Raw {ouid:xxx, axUser:{personId:xxx}} * 明文格式: authentication: Raw {ouid:xxx, axUser:{personId:xxx}}