Merge branch 'master' of https://gitee.com/li_xueqiang1/kxs

* 'master' of https://gitee.com/li_xueqiang1/kxs:
  no message
  no message

kxs-admin/src/main/java/com/kxs/admin/api/filter/RequestDecoderFilter.java

@@ -25,9 +25,7 @@ public class RequestDecoderFilter extends OncePerRequestFilter {
 	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
 			throws ServletException, IOException {
 
+
 		filterChain.doFilter(request, response);
     }
-
-
-
 }

kxs-admin/src/main/java/com/kxs/admin/api/filter/ValidateCodeFilter.java

@@ -42,7 +42,7 @@ public class ValidateCodeFilter extends OncePerRequestFilter {
 
 		try {
 
-//			checkCode(request);
+			checkCode(request);
 
 			filterChain.doFilter(request, response);
 		}catch (Exception e) {

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/GlobalBizExceptionHandler.java

@@ -26,7 +26,7 @@ import java.util.List;
  */
 @Slf4j
 @RestControllerAdvice
-@Order(Integer.MIN_VALUE)
+@Order(10000)
 public class GlobalBizExceptionHandler {
 
     /**
@@ -41,6 +41,7 @@ public class GlobalBizExceptionHandler {
 
         return R.failed(e.getLocalizedMessage());
     }
+
     /**
      * 运行时异常.
      * @param e the e

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/component/SkyCustomOpaqueTokenIntrospector.java

@@ -1,15 +1,13 @@
 package com.kxs.common.security.component;
 
 import cn.hutool.extra.spring.SpringUtil;
-import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.security.model.KxsUser;
 import com.kxs.common.security.service.KxsUserDetailsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.Ordered;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.OAuth2AuthenticatedPrincipal;
@@ -57,12 +55,13 @@ public class SkyCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector
 					oldAuthorization.getAuthorizationGrantType().getValue()))
 			.max(Comparator.comparingInt(Ordered::getOrder));
 
-		UserDetails userDetails = null;
 		try {
+
+			//获取用户信息
 			Object principal = Objects.requireNonNull(oldAuthorization).getAttributes().get(Principal.class.getName());
-			UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = (UsernamePasswordAuthenticationToken) principal;
-			Object tokenPrincipal = usernamePasswordAuthenticationToken.getPrincipal();
-			userDetails = optional.get().loadUserByUser((KxsUser) tokenPrincipal);
+			Authentication authentication = (Authentication) principal;
+
+			return (KxsUser) authentication.getPrincipal();
 		}
 		catch (UsernameNotFoundException notFoundException) {
 			log.warn("用户不不存在 {}", notFoundException.getLocalizedMessage());
@@ -70,14 +69,8 @@ public class SkyCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector
 		}
 		catch (Exception ex) {
 			log.error("资源服务器 introspect Token error {}", ex.getLocalizedMessage());
+			throw new RuntimeException(ex);
 		}
-
-		// 注入客户端信息，方便上下文中获取
-		KxsUser kxsUser = (KxsUser) userDetails;
-		Objects.requireNonNull(kxsUser)
-			.getAttributes()
-			.put(SecurityConstants.CLIENT_ID, oldAuthorization.getRegisteredClientId());
-		return kxsUser;
 	}
 
 }