flyfish-group
/
rest-proxy
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix: 修复嵌套注解无法找到的问题

This commit is contained in:
wangyu 2024-03-26 22:51:47 +08:00
parent 329e258846
commit e5f55d78b3
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -13,7 +13,7 @@
<groupId>group.flyfish</groupId> <groupId>group.flyfish</groupId>
<artifactId>rest-proxy</artifactId> <artifactId>rest-proxy</artifactId>
<version>1.1.6</version> <version>1.1.7</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
@ -22,7 +22,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<commons-collection.version>4.4</commons-collection.version> <commons-collection.version>4.4</commons-collection.version>
<commons.lang.version>2.6</commons.lang.version> <commons.lang.version>2.6</commons.lang.version>
<sdk.version>1.1.6</sdk.version> <sdk.version>1.1.7</sdk.version>
</properties> </properties>
<packaging>pom</packaging> <packaging>pom</packaging>

2
rest-proxy-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>group.flyfish</groupId> <groupId>group.flyfish</groupId>
<artifactId>rest-proxy</artifactId> <artifactId>rest-proxy</artifactId>
<version>1.1.6</version> <version>1.1.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
rest-proxy-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>group.flyfish</groupId> <groupId>group.flyfish</groupId>
<artifactId>rest-proxy</artifactId> <artifactId>rest-proxy</artifactId>
<version>1.1.6</version> <version>1.1.7</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
rest-proxy-core/src/main/java/group/flyfish/rest/registry/RestApiRegistry.java
View File

@ -18,6 +18,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.*; import org.springframework.beans.factory.support.*;
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
@ -62,7 +63,8 @@ public class RestApiRegistry implements BeanDefinitionRegistryPostProcessor, Bea
// 找基本包，找不到立马报错 // 找基本包，找不到立马报错
beanFactory.getBeansWithAnnotation(EnableRestApiProxy.class) beanFactory.getBeansWithAnnotation(EnableRestApiProxy.class)
.forEach((key, value) -> { .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()) { for (String basePackage : proxy.basePackages()) {
if (DataUtils.isNotBlank(basePackage)) { if (DataUtils.isNotBlank(basePackage)) {
packageNames.add(basePackage); packageNames.add(basePackage);