♻️ 重构代码。优化代码逻辑，方便扩展资源服务器

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxResourceServerConfigurerAdapter.java

@@ -0,0 +1,65 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.common.security.component;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
+import org.springframework.security.oauth2.provider.token.DefaultAccessTokenConverter;
+import org.springframework.security.oauth2.provider.token.DefaultUserAuthenticationConverter;
+import org.springframework.security.oauth2.provider.token.RemoteTokenServices;
+
+/**
+ * @author lengleng
+ * @date 2018/6/22
+ */
+public abstract class PigxResourceServerConfigurerAdapter extends ResourceServerConfigurerAdapter {
+	@Autowired
+	protected ResourceAuthExceptionEntryPoint resourceAuthExceptionEntryPoint;
+	@Autowired
+	protected PigAccessDeniedHandler pigAccessDeniedHandler;
+	@Autowired
+	protected RemoteTokenServices remoteTokenServices;
+	@Autowired
+	protected UserDetailsService userDetailsService;
+
+	@Override
+	public abstract void configure(HttpSecurity http) throws Exception;
+
+	/**
+	 * why add  resourceId
+	 * https://stackoverflow.com/questions/28703847/how-do-you-set-a-resource-id-for-a-token
+	 *
+	 * @param resources
+	 */
+	@Override
+	public void configure(ResourceServerSecurityConfigurer resources) {
+		DefaultAccessTokenConverter accessTokenConverter = new DefaultAccessTokenConverter();
+		DefaultUserAuthenticationConverter userTokenConverter = new DefaultUserAuthenticationConverter();
+		userTokenConverter.setUserDetailsService(userDetailsService);
+		accessTokenConverter.setUserTokenConverter(userTokenConverter);
+		remoteTokenServices.setAccessTokenConverter(accessTokenConverter);
+		resources.authenticationEntryPoint(resourceAuthExceptionEntryPoint)
+			.accessDeniedHandler(pigAccessDeniedHandler)
+			.tokenServices(remoteTokenServices);
+	}
+
+
+}

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationProvider.java

@@ -17,7 +17,7 @@
 
 package com.pig4cloud.pigx.common.security.mobile;
 
-import com.pig4cloud.pigx.common.security.util.PigxUserDetailsService;
+import com.pig4cloud.pigx.common.security.service.PigxUserDetailsService;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileSecurityConfigurer.java

@@ -17,7 +17,7 @@
 
 package com.pig4cloud.pigx.common.security.mobile;
 
-import com.pig4cloud.pigx.common.security.util.PigxUserDetailsService;
+import com.pig4cloud.pigx.common.security.service.PigxUserDetailsService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.SecurityConfigurerAdapter;

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUser.java

@@ -0,0 +1,69 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.common.security.service;
+
+import lombok.Getter;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+
+import java.util.Collection;
+
+/**
+ * @author lengleng
+ * @date 2018/8/20
+ * 扩展用户信息
+ */
+public class PigxUser extends User {
+	/**
+	 * 用户ID
+	 */
+	@Getter
+	private Integer id;
+	/**
+	 * 部门ID
+	 */
+	@Getter
+	private Integer deptId;
+
+	/**
+	 * Construct the <code>User</code> with the details required by
+	 * {@link DaoAuthenticationProvider}.
+	 *
+	 * @param id                    用户ID
+	 * @param deptId                部门ID
+	 * @param username              the username presented to the
+	 *                              <code>DaoAuthenticationProvider</code>
+	 * @param password              the password that should be presented to the
+	 *                              <code>DaoAuthenticationProvider</code>
+	 * @param enabled               set to <code>true</code> if the user is enabled
+	 * @param accountNonExpired     set to <code>true</code> if the account has not expired
+	 * @param credentialsNonExpired set to <code>true</code> if the credentials have not
+	 *                              expired
+	 * @param accountNonLocked      set to <code>true</code> if the account is not locked
+	 * @param authorities           the authorities that should be granted to the caller if they
+	 *                              presented the correct username and password and the user is enabled. Not null.
+	 * @throws IllegalArgumentException if a <code>null</code> value was passed either as
+	 *                                  a parameter or as an element in the <code>GrantedAuthority</code> collection
+	 */
+	public PigxUser(Integer id, Integer deptId, String username, String password, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
+		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
+		this.id = id;
+		this.deptId = id;
+	}
+}

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java

@@ -13,7 +13,8 @@
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  * Author: lengleng (wangiegie@gmail.com)
- */package com.pig4cloud.pigx.common.security.util;
+ */
+package com.pig4cloud.pigx.common.security.service;
 
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java

@@ -0,0 +1,107 @@
+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the pig4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.pig4cloud.pigx.common.security.service;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.pig4cloud.pigx.admin.api.dto.UserInfo;
+import com.pig4cloud.pigx.admin.api.entity.SysUser;
+import com.pig4cloud.pigx.admin.api.feign.RemoteUserService;
+import com.pig4cloud.pigx.common.core.constant.CommonConstant;
+import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
+import com.pig4cloud.pigx.common.core.util.R;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 用户详细信息
+ *
+ * @author lengleng
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class PigxUserDetailsServiceImpl implements PigxUserDetailsService {
+	private final RemoteUserService remoteUserService;
+
+	/**
+	 * 用户密码登录
+	 *
+	 * @param username 用户名
+	 * @return
+	 * @throws UsernameNotFoundException
+	 */
+	@Override
+	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+		R<UserInfo> result = remoteUserService.info(username, SecurityConstants.FROM_IN);
+		return getUserDetails(result);
+	}
+
+
+	/**
+	 * 根据社交登录code 登录
+	 *
+	 * @param inStr TYPE@CODE
+	 * @return UserDetails
+	 * @throws UsernameNotFoundException
+	 */
+	@Override
+	public UserDetails loadUserBySocial(String inStr) throws UsernameNotFoundException {
+		return getUserDetails(remoteUserService.social(inStr));
+	}
+
+	/**
+	 * 构建userdetails
+	 *
+	 * @param result 用户信息
+	 * @return
+	 */
+	private UserDetails getUserDetails(R<UserInfo> result) {
+		if (result == null || result.getData() == null) {
+			throw new UsernameNotFoundException("用户不存在");
+		}
+
+		UserInfo info = result.getData();
+		Set<String> dbAuthsSet = new HashSet<>();
+		if (ArrayUtil.isNotEmpty(info.getRoles())) {
+			// 获取角色
+			Arrays.stream(info.getRoles()).forEach(role -> dbAuthsSet.add(SecurityConstants.ROLE + role));
+			// 获取资源
+			dbAuthsSet.addAll(Arrays.asList(info.getPermissions()));
+
+		}
+		Collection<? extends GrantedAuthority> authorities
+			= AuthorityUtils.createAuthorityList(dbAuthsSet.toArray(new String[0]));
+		SysUser user = info.getSysUser();
+		boolean enabled = StrUtil.equals(user.getDelFlag(), CommonConstant.STATUS_NORMAL);
+		// 构造security用户
+
+		return new PigxUser(user.getUserId(), user.getDeptId(), user.getUsername(), SecurityConstants.BCRYPT + user.getPassword(), enabled,
+			true, true, true, authorities);
+	}
+}

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

@@ -22,6 +22,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 org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -48,12 +49,12 @@ public class SecurityUtils {
 	/**
 	 * 获取用户
 	 */
-	public static String getUser(Authentication authentication) {
+	public static PigxUser getUser(Authentication authentication) {
 		Object principal = authentication.getPrincipal();
-		if (principal == null) {
-			return null;
+		if (principal instanceof PigxUser) {
+			return (PigxUser) principal;
 		}
-		return (String) principal;
+		return null;
 	}
 
 	public static String getClientId() {
@@ -68,7 +69,7 @@ public class SecurityUtils {
 	/**
 	 * 获取用户
 	 */
-	public static String getUser() {
+	public static PigxUser getUser() {
 		Authentication authentication = getAuthentication();
 		if (authentication == null) {
 			return null;