✨ 添加新特性。@UtilityClass

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.common.security.util;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.CharsetUtil;
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
 
@@ -31,6 +32,7 @@ import java.io.IOException;
  * 认证授权相关工具类
  */
 @Slf4j
+@UtilityClass
 public class AuthUtils {
 	private static final String BASIC_ = "Basic ";
 
@@ -41,8 +43,8 @@ public class AuthUtils {
 	 * @throws RuntimeException if the Basic header is not present or is not valid
 	 *                          Base64
 	 */
-	public static String[] extractAndDecodeHeader(String header)
-		throws IOException {
+	public String[] extractAndDecodeHeader(String header)
+			throws IOException {
 
 		byte[] base64Token = header.substring(6).getBytes("UTF-8");
 		byte[] decoded;
@@ -50,7 +52,7 @@ public class AuthUtils {
 			decoded = Base64.decode(base64Token);
 		} catch (IllegalArgumentException e) {
 			throw new RuntimeException(
-				"Failed to decode basic authentication token");
+					"Failed to decode basic authentication token");
 		}
 
 		String token = new String(decoded, CharsetUtil.UTF_8);
@@ -70,8 +72,8 @@ public class AuthUtils {
 	 * @return
 	 * @throws IOException
 	 */
-	public static String[] extractAndDecodeHeader(HttpServletRequest request)
-		throws IOException {
+	public String[] extractAndDecodeHeader(HttpServletRequest request)
+			throws IOException {
 		String header = request.getHeader(HttpHeaders.AUTHORIZATION);
 
 		if (header == null || !header.startsWith(BASIC_)) {

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/SecurityUtils.java

@@ -23,6 +23,7 @@ package com.pig4cloud.pigx.common.security.util;
 import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
 import com.pig4cloud.pigx.common.security.service.PigxUser;
+import lombok.experimental.UtilityClass;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -37,11 +38,12 @@ import java.util.List;
  *
  * @author L.cm
  */
+@UtilityClass
 public class SecurityUtils {
 	/**
 	 * 获取Authentication
 	 */
-	public static Authentication getAuthentication() {
+	public Authentication getAuthentication() {
 		return SecurityContextHolder.getContext().getAuthentication();
 	}
 
@@ -51,13 +53,10 @@ public class SecurityUtils {
 	 * @param authentication
 	 * @return PigxUser
 	 * <p>
-	 * 获取当前用户的全部信息
-	 * 每次check—token 后根据用户名调用 remoteService 查询用户信息，效率比较低。
-	 * 建议长链路调用不要使用，重写configure() 例如  codegen 模块ResourceServerConfigurer
-	 * 1.前提使用继承BaseResourceServerConfigurerAdapter
-	 * 2. 使用默认 configure（）
+	 * 获取当前用户的全部信息 EnablePigxResourceServer true
+	 * 获取当前用户的用户名 EnablePigxResourceServer false
 	 */
-	public static PigxUser getUser(Authentication authentication) {
+	public PigxUser getUser(Authentication authentication) {
 		Object principal = authentication.getPrincipal();
 		if (principal instanceof PigxUser) {
 			return (PigxUser) principal;
@@ -70,7 +69,7 @@ public class SecurityUtils {
 	 *
 	 * @return String
 	 */
-	public static String getUsername() {
+	public String getUsername() {
 		Object principal = getAuthentication().getPrincipal();
 		if (principal instanceof String) {
 			return principal.toString();
@@ -79,7 +78,7 @@ public class SecurityUtils {
 	}
 
 
-	public static String getClientId() {
+	public String getClientId() {
 		Authentication authentication = getAuthentication();
 		if (authentication instanceof OAuth2Authentication) {
 			OAuth2Authentication auth2Authentication = (OAuth2Authentication) authentication;
@@ -91,7 +90,7 @@ public class SecurityUtils {
 	/**
 	 * 获取用户
 	 */
-	public static PigxUser getUser() {
+	public PigxUser getUser() {
 		Authentication authentication = getAuthentication();
 		if (authentication == null) {
 			return null;
@@ -104,17 +103,17 @@ public class SecurityUtils {
 	 *
 	 * @return 角色集合
 	 */
-	public static List<Integer> getRoles() {
+	public List<Integer> getRoles() {
 		Authentication authentication = getAuthentication();
 		Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
 
 		List<Integer> roleIds = new ArrayList<>();
 		authorities.stream()
-			.filter(granted -> StrUtil.startWith(granted.getAuthority(), SecurityConstants.ROLE))
-			.forEach(granted -> {
-				String id = StrUtil.removePrefix(granted.getAuthority(), SecurityConstants.ROLE);
-				roleIds.add(Integer.parseInt(id));
-			});
+				.filter(granted -> StrUtil.startWith(granted.getAuthority(), SecurityConstants.ROLE))
+				.forEach(granted -> {
+					String id = StrUtil.removePrefix(granted.getAuthority(), SecurityConstants.ROLE);
+					roleIds.add(Integer.parseInt(id));
+				});
 		return roleIds;
 	}