Переглянути джерело

:recycle: 重构代码:公共字符串替换

lishangbu 6 роки тому
батько
коміт
542e022216

+ 2 - 1
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<Boolean> logout(@RequestHeader(value = "Authorization", required = false) String authHeader) {
+	public R<Boolean> logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) {
 		if (StringUtils.hasText(authHeader)) {
 			String tokenValue = authHeader.replace("Bearer", "").trim();
 			OAuth2AccessToken accessToken = tokenStore.readAccessToken(tokenValue);

+ 2 - 1
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信息为空");

+ 2 - 1
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信息为空");

+ 3 - 2
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<String, Object> params, @RequestHeader("from") String from);
+	Page selectPage(@RequestBody Map<String, Object> params, @RequestHeader(SecurityConstants.FROM) String from);
 
 	/**
 	 * 删除token
@@ -50,5 +51,5 @@ public interface RemoteTokenService {
 	 * @return
 	 */
 	@DeleteMapping("/oauth/delToken/{token}")
-	R<Boolean> deleteTokenById(@PathVariable("token") String token, @RequestHeader("from") String from);
+	R<Boolean> deleteTokenById(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from);
 }

+ 2 - 1
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<UserInfo> info(@PathVariable("username") String username
-		, @RequestHeader("from") String from);
+		, @RequestHeader(SecurityConstants.FROM) String from);
 
 	/**
 	 * 通过社交账号查询用户、角色信息