feat: 指定模块统一打包插件 TencentBlueKing#8672

fcfang123 · Jun 15, 2023 · 61bdf59 · 61bdf59
1 parent 64fe929
commit 61bdf59
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...common-client/src/main/kotlin/com/tencent/devops/common/client/ClientAutoConfiguration.kt b/...common-client/src/main/kotlin/com/tencent/devops/common/client/ClientAutoConfiguration.kt
@@ -38,6 +38,7 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.AutoConfigureAfter
 import org.springframework.boot.autoconfigure.AutoConfigureOrder
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
+import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.client.discovery.composite.CompositeDiscoveryClient
 import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration
 import org.springframework.context.annotation.Bean
@@ -53,6 +54,7 @@ import org.springframework.core.Ordered
 @PropertySource("classpath:/common-client.properties")
 @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
 @AutoConfigureAfter(ServiceAutoConfiguration::class, LoadBalancerAutoConfiguration::class)
+@EnableConfigurationProperties(MutilJarServiceMapConfiguration::class)
 class ClientAutoConfiguration {
 
     @Value("\${spring.cloud.consul.discovery.tags:prod}")

diff --git a/...lient/src/main/kotlin/com/tencent/devops/common/client/MutilJarServiceMapConfiguration.kt b/...lient/src/main/kotlin/com/tencent/devops/common/client/MutilJarServiceMapConfiguration.kt
@@ -1,9 +1,9 @@
 package com.tencent.devops.common.client
 
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.context.annotation.Configuration
+import org.springframework.boot.context.properties.ConstructorBinding
 
-@Configuration
+@ConstructorBinding
 @ConfigurationProperties(prefix = "mutiljar.service.map")
 class MutilJarServiceMapConfiguration {
     val propertiesMap: Map<String, String> = mutableMapOf()

diff --git a/src/backend/ci/core/common/common-client/src/main/resources/META-INF/spring.factories b/src/backend/ci/core/common/common-client/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.tencent.devops.common.client.ClientAutoConfiguration,\
-com.tencent.devops.common.client.MutilJarServiceMapConfiguration
+com.tencent.devops.common.client.ClientAutoConfiguration