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

add some todos

Browse Source
This commit is contained in:
Gao Wei 2022-06-10 18:35:01 +08:00
parent f7c5beb493
commit d1ff06f2eb
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,9 +8,11 @@ public class AuthConstants {
public static final String HEADER_TENANT_ID = "tenantId";
public static final String HEADER_SAAS_TENANT_ID = "SAAS_TENANT_ID";
public static final String HEADER_SAAS_TENANT_ID = "saasTenantId";
public static final String HEADER_WORKSPACE_ID = "workspaceId";
public static final String HEADER_OU_ID = "ouId";
public static final String HEADER_TERMINAL = "terminal";
public static final String HEADER_SYSTEM_TYPE = "systemType";
@ -27,5 +29,6 @@ public class AuthConstants {
public static final String HEADER_REQUEST_CODE = "requestCode";
public static final String VISIT_TO = "visitTo";
}

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

@ -46,6 +46,10 @@ public class ContextInfo {
*/
private Long saasTenantId;
/**
* TODO: 去干掉visitTo的所有相关代码
*/
@Deprecated
private String visitTo;
private UserInfoMap userInfoMap;
@ -75,5 +79,4 @@ public class ContextInfo {
//TODO: 这两天也看一下，是否直接从map转过去就够了，是不是还要再补一些其他的东西进去。
return BeanUtil.toBean(this.userInfoMap.getMap(), clazz);
}
}

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

@ -99,6 +99,7 @@ public class TerminalInfo {
aliasMap.put(NT_CMS_WEB_PROJ, NT_CMS_WEB_PROJ);
aliasMap.put(STR_TERMINAL_PROJ, NT_CMS_WEB_PROJ);
aliasMap.put(STR_TERMINAL_CMS, NT_CMS_WEB_PROJ);
aliasMap.put(NUM_TERMINAL_CMS, NT_CMS_WEB_PROJ);
//实际上不应该是直接对应于PROJ，默认先对应一个，需要再guess一下，
}
@ -136,7 +137,10 @@ public class TerminalInfo {
public static final String NT_CM_APP_CM_WORKER = "NT_CM_APP_WORKER";
static {
aliasMap.put(NT_CM_APP_CM_WORKER, NT_CM_APP_CM_WORKER);
aliasMap.put(STR_TERMINAL_CM_WORKER, NT_CM_APP_CM_LEADER);
aliasMap.put(STR_TERMINAL_CM_WORKER, NT_CM_APP_CM_WORKER);
aliasMap.put(STR_TERMINAL_CM, NT_CM_APP_CM_WORKER);
aliasMap.put(NUM_TERMINAL_CM, NT_CM_APP_CM_WORKER);
//默认把cm归到工人terminal，但可以guess一下。
}
/**

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

@ -65,6 +65,7 @@ public class UserInfo {
* 手机号
*/
private String phoneNumber;
/**
* id
*/
@ -74,4 +75,7 @@ public class UserInfo {
private String username;
//TODO: 加身份类型、确定各个ID指的是啥
}

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

@ -203,6 +203,7 @@ public class ContextInfoBuilderAspect {
contextInfo.setTerminalInfo(new TerminalInfo(request.getHeader(AuthConstants.HEADER_TERMINAL)));
contextInfo.setTenantId(StrUtil.nullSafeParseLong(request.getHeader(AuthConstants.HEADER_TENANT_ID)));
contextInfo.setSaasTenantId(StrUtil.nullSafeParseLong(request.getHeader(AuthConstants.HEADER_SAAS_TENANT_ID)));
contextInfo.setOuId(StrUtil.nullSafeParseLong(request.getHeader(AuthConstants.HEADER_OU_ID)));
contextInfo.setWorkspaceId(StrUtil.nullSafeParseLong(request.getHeader(AuthConstants.HEADER_WORKSPACE_ID)));
contextInfo.setVisitTo(request.getHeader(AuthConstants.VISIT_TO));