From 27419f7c97a668df6d982ac57b7f56212575ee02 Mon Sep 17 00:00:00 2001 From: zhuguanghong Date: Wed, 11 May 2022 16:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/framework/auth/constants/AopConstants.java | 6 +++--- .../src/main/java/cn/axzo/framework/auth/enums/EnvEnum.java | 4 ++-- .../axzo/framework/auth/service/BuilderUserInfoAspect.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AopConstants.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AopConstants.java index 251d5f5..815eb87 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AopConstants.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/constants/AopConstants.java @@ -4,9 +4,9 @@ public class AopConstants { public static final String HEADER_TENANT = "tenantId"; public static final String HEADER_SYSTEM_TYPE = "1"; public static final String HEADER_AUTH = "authorization"; - public static final String HAEDER_DEVICE_KIND = "deviceKind"; - public static final String HAEDER_DEVICE_NO = "deviceNo"; - public static final String HAEDER_APP_VERSION = "appVersion"; + public static final String HEADER_DEVICE_KIND = "deviceKind"; + public static final String HEADER_DEVICE_NO = "deviceNo"; + public static final String HEADER_APP_VERSION = "appVersion"; public static final String VISIT_TO = "visitTo"; public static final String USER_INFO = "userinfo"; public static final String ENV_DEV="dev"; diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/enums/EnvEnum.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/enums/EnvEnum.java index 8f41235..c994f6c 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/enums/EnvEnum.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/enums/EnvEnum.java @@ -13,7 +13,7 @@ public enum EnvEnum { //TEST1 TEST1("TEST1", "http://test1-api.axzo.cn/pudge/webApi/oauth/user"), //PRE - PRE("PRE", "http://dev-api.axzo.cn/pudge/webApi/oauth/user"), + PRE("PRE", "http://pre-api.axzo.cn/pudge/webApi/oauth/user"), ; private String key; private String value; @@ -21,7 +21,7 @@ public enum EnvEnum { public static String getValueByKey(String key) { try { for(EnvEnum env:EnvEnum.values()) { - if(env.getKey().equals(key)) { + if(env.getKey().equalsIgnoreCase(key)) { return env.getValue(); } } diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/BuilderUserInfoAspect.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/BuilderUserInfoAspect.java index 14584c3..72e7212 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/BuilderUserInfoAspect.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/BuilderUserInfoAspect.java @@ -125,9 +125,9 @@ public class BuilderUserInfoAspect { userInfo.setRequestInfo(requestInfo); } // 请求头获取数据 - requestInfo.setAppVersion(request.getHeader(AopConstants.HAEDER_APP_VERSION)); - requestInfo.setDeviceKind(request.getHeader(AopConstants.HAEDER_DEVICE_KIND)); - requestInfo.setDeviceNo(request.getHeader(AopConstants.HAEDER_DEVICE_NO)); + requestInfo.setAppVersion(request.getHeader(AopConstants.HEADER_APP_VERSION)); + requestInfo.setDeviceKind(request.getHeader(AopConstants.HEADER_DEVICE_KIND)); + requestInfo.setDeviceNo(request.getHeader(AopConstants.HEADER_DEVICE_NO)); requestInfo.setSystemType(request.getHeader(AopConstants.HEADER_SYSTEM_TYPE)); requestInfo.setTenantId(request.getHeader(AopConstants.HEADER_TENANT)); requestInfo.setVisitTo(request.getHeader(AopConstants.VISIT_TO));