From 430126646ca25d6087e4d47c22fe565e5a47df23 Mon Sep 17 00:00:00 2001 From: Gao Wei Date: Tue, 28 Jun 2022 18:40:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E7=82=B9=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=BA=86visitTo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/auth/constants/AuthConstants.java | 14 ++++++++++---- .../axzo/framework/auth/domain/TerminalInfo.java | 3 ++- .../auth/service/ContextInfoBuilderAspect.java | 2 -- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AuthConstants.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AuthConstants.java index 72e4573..5bf32a0 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AuthConstants.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AuthConstants.java @@ -3,10 +3,16 @@ package cn.axzo.framework.auth.constants; public class AuthConstants { private AuthConstants(){} public static final String ENV_DEV="dev"; + + /** + * @deprecated 之前传projectId，以后废弃 + */ + @Deprecated + public static final String HEADER_TENANT_ID = "tenantId"; + ///----BEGIN 前端向后端请求时要带的Header ---- public static final String HEADER_TOKEN = "Authorization"; - public static final String HEADER_TENANT_ID = "tenantId"; public static final String HEADER_SAAS_TENANT_ID = "saasTenantId"; public static final String HEADER_WORKSPACE_ID = "workspaceId"; @@ -21,13 +27,13 @@ public class AuthConstants { public static final String HEADER_DEVICE_NO = "deviceNo"; public static final String HEADER_APP_VERSION = "appVersion"; + ///----END 前端向后端请求时要带的Header ---- + + public static final String USER_INFO = "userinfo"; - //这个Header用于 apisix向pudge 的/apisix/authorization 做校验请求 public static final String HEADER_REQUEST_CODE = "requestCode"; - public static final String VISIT_TO = "visitTo"; - } diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java index 77e46e7..e1ecabb 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java @@ -105,6 +105,7 @@ public class TerminalInfo { */ @Deprecated public static final String STR_TERMINAL_SMP = "smp"; + /** * 智能面板 ？？？ */ @@ -228,7 +229,7 @@ public class TerminalInfo { } /** - * SM，智能面板 + * SM，智能面板机 */ public static final String NT_SM = "NT_SM"; static { diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java index 7db816e..524966a 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java @@ -143,8 +143,6 @@ public class ContextInfoBuilderAspect { String terminalHeader = request.getHeader(AuthConstants.HEADER_TERMINAL); contextInfo.setTerminalInfo(new TerminalInfo(terminalHeader)); - - contextInfo.setVisitTo(request.getHeader(AuthConstants.VISIT_TO)); } //// 以上都是还没有去remote auth之前的动作