From 542e0222160ad694928c4a42afe00823231946a2 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Thu, 15 Nov 2018 13:13:59 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=9A=E5=85=AC=E5=85=B1=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java | 3 ++- .../common/security/handler/MobileLoginSuccessHandler.java | 3 ++- .../com/pig4cloud/pigx/common/security/util/AuthUtils.java | 3 ++- .../pig4cloud/pigx/admin/api/feign/RemoteTokenService.java | 5 +++-- .../pig4cloud/pigx/admin/api/feign/RemoteUserService.java | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 462ece856..3345099df 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -32,6 +32,7 @@ import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ScanOptions; import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.common.OAuth2AccessToken; @@ -65,7 +66,7 @@ public class PigxTokenEndpoint { * @param authHeader Authorization */ @GetMapping("/removeToken") - public R logout(@RequestHeader(value = "Authorization", required = false) String authHeader) { + public R logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) { if (StringUtils.hasText(authHeader)) { String tokenValue = authHeader.replace("Bearer", "").trim(); OAuth2AccessToken accessToken = tokenStore.readAccessToken(tokenValue); diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/MobileLoginSuccessHandler.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/MobileLoginSuccessHandler.java index 16b04d9b7..121cba965 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/MobileLoginSuccessHandler.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/handler/MobileLoginSuccessHandler.java @@ -23,6 +23,7 @@ import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.security.util.AuthUtils; import lombok.Builder; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.Authentication; import org.springframework.security.crypto.password.PasswordEncoder; @@ -63,7 +64,7 @@ public class MobileLoginSuccessHandler implements AuthenticationSuccessHandler { */ @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) { - String header = request.getHeader("Authorization"); + String header = request.getHeader(HttpHeaders.AUTHORIZATION); if (header == null || !header.startsWith(BASIC_)) { throw new UnapprovedClientAuthenticationException("请求头中client信息为空"); diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java index 1851fb309..92b32031d 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java @@ -20,6 +20,7 @@ package com.pig4cloud.pigx.common.security.util; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; import javax.servlet.http.HttpServletRequest; import java.io.IOException; @@ -71,7 +72,7 @@ public class AuthUtils { */ public static String[] extractAndDecodeHeader(HttpServletRequest request) throws IOException { - String header = request.getHeader("Authorization"); + String header = request.getHeader(HttpHeaders.AUTHORIZATION); if (header == null || !header.startsWith(BASIC_)) { throw new RuntimeException("请求头中client信息为空"); diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java index e7c2b49a7..3f502984a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.feign; import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.admin.api.feign.factory.RemoteTokenServiceFallbackFactory; +import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstant; import com.pig4cloud.pigx.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; @@ -40,7 +41,7 @@ public interface RemoteTokenService { * @return page */ @PostMapping("/oauth/listToken") - Page selectPage(@RequestBody Map params, @RequestHeader("from") String from); + Page selectPage(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM) String from); /** * 删除token @@ -50,5 +51,5 @@ public interface RemoteTokenService { * @return */ @DeleteMapping("/oauth/delToken/{token}") - R deleteTokenById(@PathVariable("token") String token, @RequestHeader("from") String from); + R deleteTokenById(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from); } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java index 4161dcd5f..5ec00a102 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java @@ -22,6 +22,7 @@ package com.pig4cloud.pigx.admin.api.feign; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.feign.factory.RemoteUserServiceFallbackFactory; +import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstant; import com.pig4cloud.pigx.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; @@ -46,7 +47,7 @@ public interface RemoteUserService { */ @GetMapping("/user/info/{username}") R info(@PathVariable("username") String username - , @RequestHeader("from") String from); + , @RequestHeader(SecurityConstants.FROM) String from); /** * 通过社交账号查询用户、角色信息