From e5f55d78b386ea200b84e89b1549067735533f25 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Tue, 26 Mar 2024 22:51:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B5=8C=E5=A5=97?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=97=A0=E6=B3=95=E6=89=BE=E5=88=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 4 ++--
 rest-proxy-api/pom.xml                                        | 2 +-
 rest-proxy-core/pom.xml                                       | 2 +-
 .../java/group/flyfish/rest/registry/RestApiRegistry.java     | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7b532f6..dc749d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>group.flyfish</groupId>
     <artifactId>rest-proxy</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -22,7 +22,7 @@
         <java.version>1.8</java.version>
         <commons-collection.version>4.4</commons-collection.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <sdk.version>1.1.6</sdk.version>
+        <sdk.version>1.1.7</sdk.version>
     </properties>
 
     <packaging>pom</packaging>
diff --git a/rest-proxy-api/pom.xml b/rest-proxy-api/pom.xml
index c1c9600..90309c7 100644
--- a/rest-proxy-api/pom.xml
+++ b/rest-proxy-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>group.flyfish</groupId>
         <artifactId>rest-proxy</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/rest-proxy-core/pom.xml b/rest-proxy-core/pom.xml
index b5e8010..4709d21 100644
--- a/rest-proxy-core/pom.xml
+++ b/rest-proxy-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>group.flyfish</groupId>
         <artifactId>rest-proxy</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/rest-proxy-core/src/main/java/group/flyfish/rest/registry/RestApiRegistry.java b/rest-proxy-core/src/main/java/group/flyfish/rest/registry/RestApiRegistry.java
index f1c9d73..3fe31a7 100644
--- a/rest-proxy-core/src/main/java/group/flyfish/rest/registry/RestApiRegistry.java
+++ b/rest-proxy-core/src/main/java/group/flyfish/rest/registry/RestApiRegistry.java
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.*;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.lang.NonNull;
@@ -62,7 +63,8 @@ public class RestApiRegistry implements BeanDefinitionRegistryPostProcessor, Bea
         // 找基本包，找不到立马报错
         beanFactory.getBeansWithAnnotation(EnableRestApiProxy.class)
                 .forEach((key, value) -> {
-                    EnableRestApiProxy proxy = value.getClass().getAnnotation(EnableRestApiProxy.class);
+                    EnableRestApiProxy proxy = AnnotationUtils.findAnnotation(value.getClass(), EnableRestApiProxy.class);
+                    if (null == proxy) return;
                     for (String basePackage : proxy.basePackages()) {
                         if (DataUtils.isNotBlank(basePackage)) {
                             packageNames.add(basePackage);