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

少传一些Header

Browse Source
This commit is contained in:
Gao Wei 2022-06-10 12:37:38 +08:00
parent 702432e8ed
commit 6f4666947a
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AuthConstants.java
View File

@ -19,12 +19,6 @@ public class AuthConstants {
public static final String HEADER_DEVICE_NO = "deviceNo";
public static final String HEADER_APP_VERSION = "appVersion";
/**
* 这个Header用在各个服务在调用pudge的/user获取用户信息的时候。
*/
public static final String HEADER_ORIGINAL_URI = "originalUrl";
public static final String USER_INFO = "userinfo";

4
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java
View File

@ -44,6 +44,10 @@ public class ContextInfo {
private String visitTo;
/**
*
* @param userInfoMap pudge /user 这个auth api返回的所有的KV内容
*/
public void buildCustomInfoByUserInfo(UserInfoMap userInfoMap){
}

4
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/LegacyGuessMissedReq.java
View File

@ -9,6 +9,8 @@ public class LegacyGuessMissedReq {
private String requestParamProjectId;
private String originalUrl;
private Long headerTenantId;
private Long headerSaasTenantId;
@ -17,6 +19,4 @@ public class LegacyGuessMissedReq {
private Long headerOuId;
}

14
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
View File

@ -129,13 +129,18 @@ public class ContextInfoBuilderAspect {
try {
HttpRequest request = HttpRequest.get(url).header(AuthConstants.HEADER_AUTH, contextInfo.getToken())
.header(AuthConstants.HEADER_DEVICE_NO, contextInfo.getSystemAndDeviceInfo().getDeviceNo())
.header(AuthConstants.HEADER_TERMINAL, contextInfo.getTerminalInfo().getRawTerminalString())
.header(AuthConstants.HEADER_SAAS_TENANT_ID, contextInfo.getSaasTenantId().toString())
.header(AuthConstants.HEADER_ORIGINAL_URI, originalRequest.getRequestURI());
.header(AuthConstants.HEADER_TERMINAL, contextInfo.getTerminalInfo().getRawTerminalString()) //传
.header(AuthConstants.HEADER_SAAS_TENANT_ID, contextInfo.getSaasTenantId().toString());
//传 requestCode
//期待未来前端补齐header之后，删掉这一行，以及相关代码
request = request.header(LegacyGuessMissedReq.HEADER_LEGACY_GUESS, buildLegacyGuessMissedReqString(contextInfo, originalRequest));
//为什么会用HEADER_ORIGINAL_URI？
//现在有一些项目级、企业级，我不确定，是否能通过现有的terminal header能做清晰界定
//有的URI，是归属于企业级的、有的归属于项目级，guess=newTerminalString
//有的URI，缺少部分header是正常的，我就没必要guess，有的有必要。
String response = request.execute().body();
// 使用token获取用户信息
@ -156,6 +161,7 @@ public class ContextInfoBuilderAspect {
@Deprecated
private String buildLegacyGuessMissedReqString(ContextInfo contextInfo, HttpServletRequest originalRequest) {
LegacyGuessMissedReq req = new LegacyGuessMissedReq();
req.setOriginalUrl(originalRequest.getRequestURI());
req.setHeaderOuId(contextInfo.getOuId());
req.setHeaderSaasTenantId(contextInfo.getSaasTenantId());
req.setHeaderTenantId(contextInfo.getTenantId());