From 319597d4497addc5c5553aaaf1d34ad8e700733c Mon Sep 17 00:00:00 2001 From: lbw Date: Mon, 24 Jul 2023 21:41:10 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84feign=20client=20registrar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org.springframework.cloud.openfeign.FeignClient.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- pigx-common/pigx-common-bom/pom.xml | 5 +++++ .../cloud/openfeign/PigxFeignClientsRegistrar.java | 4 ++-- ... org.springframework.cloud.openfeign.FeignClient.imports} | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/service/org.springframework.cloud.openfeign.FeignClient.imports delete mode 100644 pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/spring.factories rename pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/{org.springframework.boot.autoconfigure.AutoConfiguration.imports => org.springframework.cloud.openfeign.FeignClient.imports} (82%) diff --git a/pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/service/org.springframework.cloud.openfeign.FeignClient.imports b/pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/service/org.springframework.cloud.openfeign.FeignClient.imports new file mode 100644 index 000000000..bff844c71 --- /dev/null +++ b/pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/service/org.springframework.cloud.openfeign.FeignClient.imports @@ -0,0 +1 @@ +com.pig4cloud.pigx.app.api.feign.RemoteAppUserService diff --git a/pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/spring.factories b/pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index c7b5bad5c..000000000 --- a/pigx-app-server/pigx-app-server-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -com.pig4cloud.pigx.common.feign.PigxFeignAutoConfiguration=\ - com.pig4cloud.pigx.app.api.feign.RemoteAppUserService diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 29453a690..56cb84184 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -287,6 +287,11 @@ springdoc-openapi-starter-webflux-ui ${springdoc.version} + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.version} + org.springdoc springdoc-openapi-starter-webmvc-api diff --git a/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java b/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java index eea83315b..fbc46a29c 100644 --- a/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java +++ b/pigx-common/pigx-common-feign/src/main/java/org/springframework/cloud/openfeign/PigxFeignClientsRegistrar.java @@ -37,6 +37,7 @@ import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -68,8 +69,7 @@ public class PigxFeignClientsRegistrar } private void registerFeignClients(BeanDefinitionRegistry registry) { - List feignClients = SpringFactoriesLoader.loadFactoryNames(getSpringFactoriesLoaderFactoryClass(), - getBeanClassLoader()); + List feignClients = new ArrayList<>(); // 支持 springboot 2.7 + 最新版本的配置方式 ImportCandidates.load(FeignClient.class, getBeanClassLoader()).forEach(feignClients::add); diff --git a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports similarity index 82% rename from pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports index 460350b55..8e911a8d6 100644 --- a/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports @@ -5,5 +5,7 @@ com.pig4cloud.pigx.admin.api.feign.RemoteParamService com.pig4cloud.pigx.admin.api.feign.RemoteTenantService com.pig4cloud.pigx.admin.api.feign.RemoteTokenService com.pig4cloud.pigx.admin.api.feign.RemoteUserService +com.pig4cloud.pigx.admin.api.feign.RemoteRoleService +com.pig4cloud.pigx.admin.api.feign.RemoteDeptService com.pig4cloud.pigx.admin.api.feign.RemoteDictService com.pig4cloud.pigx.admin.api.feign.RemoteAuditLogService