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

Merge branch 'new_3A' into planz

Browse Source
This commit is contained in:
cn 2022-08-27 15:11:15 +08:00
commit a96a3097a1
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/enums/EnvEnum.java
View File

@ -13,6 +13,8 @@ public enum EnvEnum {
TEST("TEST", "http://test-api.axzo.cn/pudge/webApi/oauth/apisix/authentication"), TEST("TEST", "http://test-api.axzo.cn/pudge/webApi/oauth/apisix/authentication"),
//TEST1 //TEST1
TEST1("TEST1", "http://test1-api.axzo.cn/pudge/webApi/oauth/apisix/authentication"), TEST1("TEST1", "http://test1-api.axzo.cn/pudge/webApi/oauth/apisix/authentication"),
//TEST1
UAT("UAT", "http://uat-api.axzo.cn/pudge/webApi/oauth/apisix/authentication"),
//PRE //PRE
PRE("PRE", "http://pre-api.axzo.cn/pudge/webApi/oauth/apisix/authentication"), PRE("PRE", "http://pre-api.axzo.cn/pudge/webApi/oauth/apisix/authentication"),
; ;

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

@ -219,6 +219,7 @@ public class ContextInfoBuilderAspect {
try { try {
HttpRequest request = HttpRequest.get(url).header(AuthConstants.HEADER_TOKEN, contextInfo.getToken()) HttpRequest request = HttpRequest.get(url).header(AuthConstants.HEADER_TOKEN, contextInfo.getToken())
.header(AuthConstants.HEADER_TERMINAL, contextInfo.getTerminalInfo().getRawTerminalString()) .header(AuthConstants.HEADER_TERMINAL, contextInfo.getTerminalInfo().getRawTerminalString())
.header(AuthConstants.HEADER_SYSTEM_TYPE,contextInfo.getSystemAndDeviceInfo().getSystemType())
.header(AuthConstants.HEADER_WORKSPACE_ID, contextInfo.getWorkspaceId().toString()) .header(AuthConstants.HEADER_WORKSPACE_ID, contextInfo.getWorkspaceId().toString())
.header(AuthConstants.HEADER_OU_ID, contextInfo.getOuId().toString()) .header(AuthConstants.HEADER_OU_ID, contextInfo.getOuId().toString())
.header(AuthConstants.HEADER_REQUEST_CODE, "") // 本地调试，传个空 .header(AuthConstants.HEADER_REQUEST_CODE, "") // 本地调试，传个空