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

fcfang123 · Oct 18, 2023 · 4ae4fc4 · 4ae4fc4
1 parent 73d0f8e
commit 4ae4fc4
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 22 deletions.
diff --git a/src/backend/ci/buildSrc/src/main/kotlin/plugins/task-multi-boot-jar.gradle.kts b/src/backend/ci/buildSrc/src/main/kotlin/plugins/task-multi-boot-jar.gradle.kts
@@ -31,6 +31,7 @@ tasks.register("multiBootJar") {
             isSpecifiedModulePath(it.path, multiModuleList)
         }.forEach { subProject -> addDependencies(subProject.path) }
         dependsOn("copyToRelease")
+        dependsOn("bootRun")
         // dependsOn("jib")
     }
 }

diff --git a/...nd/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/MyStartupTask.kt b/...nd/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/service/MyStartupTask.kt
@@ -0,0 +1,18 @@
+package com.tencent.devops.auth.service
+
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+import javax.annotation.PostConstruct
+
+
+@Component
+class MyStartupTask {
+    @PostConstruct
+    fun init() {
+        logger.info("MyStartupTask init")
+    }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(MyStartupTask::class.java)
+    }
+}
diff --git a/.../boot-mutijar/src/main/kotlin/com/tencent/devops/mutijar/DataSourceDefinitionRegistrar.kt b/.../boot-mutijar/src/main/kotlin/com/tencent/devops/mutijar/DataSourceDefinitionRegistrar.kt
@@ -58,7 +58,7 @@ class DataSourceDefinitionRegistrar : ImportBeanDefinitionRegistrar {
 
     companion object {
         private val logger = LoggerFactory.getLogger(DataSourceDefinitionRegistrar::class.java)
-        private val multiDataSource = listOf("auth","image").filterNot { it == "process" }
+        private val multiDataSource = listOf("auth", "image", "process")
         private val regex = Regex("""ENC\((.*?)\)""")
     }
 }
diff --git a/...utijar/boot-mutijar/src/main/kotlin/com/tencent/devops/mutijar/JooqDefinitionRegistrar.kt b/...utijar/boot-mutijar/src/main/kotlin/com/tencent/devops/mutijar/JooqDefinitionRegistrar.kt
@@ -21,7 +21,8 @@ class JooqDefinitionRegistrar : ImportBeanDefinitionRegistrar {
         importBeanNameGenerator: BeanNameGenerator
     ) {
         multiDataSource.forEach { dataSource ->
-            val finalDataSource = if (dataSource == "process") "shardingDataSource" else "${dataSource}DataSource"
+            //if (dataSource == "process") "shardingDataSource" else
+            val finalDataSource = "${dataSource}DataSource"
             val connectionProvider = BeanDefinitionBuilder.genericBeanDefinition(
                 DataSourceConnectionProvider::class.java
             ).addConstructorArgReference(finalDataSource)
@@ -40,6 +41,6 @@ class JooqDefinitionRegistrar : ImportBeanDefinitionRegistrar {
 
     companion object {
         private val logger = LoggerFactory.getLogger(DataSourceDefinitionRegistrar::class.java)
-        private val multiDataSource = listOf("auth","image").filterNot { it == "process" }
+        private val multiDataSource = listOf("auth", "image", "process")
     }
 }
diff --git a/...boot-mutijar/src/main/kotlin/com/tencent/devops/mutijar/MutijarDslContextConfiguration.kt b/...boot-mutijar/src/main/kotlin/com/tencent/devops/mutijar/MutijarDslContextConfiguration.kt
@@ -80,7 +80,7 @@ class MutijarDslContextConfiguration {
 
     companion object {
         private val logger = LoggerFactory.getLogger(MutijarDslContextConfiguration::class.java)
-        private val multiModelService = listOf("auth","image").filterNot { it == "process" }
+        private val multiModelService = listOf("auth", "image", "process")
         private val lambdaServiceRegex = "\\.(tsource|ttarget|process|project|store)".toRegex()
     }
 }
diff --git a/...e/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt b/...e/src/main/kotlin/com/tencent/devops/process/engine/service/measure/MeasureServiceImpl.kt
@@ -67,8 +67,6 @@ class MeasureServiceImpl : MeasureService {
     @Autowired
     lateinit var buildVariableService: BuildVariableService
     @Autowired
-    lateinit var dslContext: DSLContext
-    @Autowired
     lateinit var templateService: TemplateService
     @Autowired
     lateinit var pipelineInfoService: PipelineInfoService

diff --git a/.../kotlin/com/tencent/devops/process/engine/service/rule/processor/BkVarProcessorService.kt b/.../kotlin/com/tencent/devops/process/engine/service/rule/processor/BkVarProcessorService.kt
@@ -33,10 +33,10 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
 @Service("BkVarProcessor")
-class BkVarProcessorService : ProcessorService {
+class BkVarProcessorService constructor(
+    private val dslContext: DSLContext
+) : ProcessorService {
 
-    @Autowired
-    private lateinit var dslContext: DSLContext
 
     @Autowired
     private lateinit var pipelineBuildVarDao: PipelineBuildVarDao

diff --git a/...z-process/src/main/kotlin/com/tencent/devops/process/api/ServiceScmWebhookResourceImpl.kt b/...z-process/src/main/kotlin/com/tencent/devops/process/api/ServiceScmWebhookResourceImpl.kt
@@ -42,8 +42,9 @@ import com.tencent.devops.process.webhook.CodeWebhookEventDispatcher
 import com.tencent.devops.process.webhook.pojo.event.commit.GithubWebhookEvent
 import org.springframework.amqp.rabbit.core.RabbitTemplate
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.annotation.Lazy
 
-@RestResource
+//@RestResource
 class ServiceScmWebhookResourceImpl @Autowired constructor(
     private val pipelineBuildWebhookService: PipelineBuildWebhookService,
     private val rabbitTemplate: RabbitTemplate,

diff --git a/...src/main/kotlin/com/tencent/devops/process/permission/config/PipelinePermConfiguration.kt b/...src/main/kotlin/com/tencent/devops/process/permission/config/PipelinePermConfiguration.kt
@@ -54,7 +54,9 @@ import org.springframework.core.Ordered
 @Configuration
 @ConditionalOnWebApplication
 @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
-class PipelinePermConfiguration {
+class PipelinePermConfiguration constructor(
+    val dslContext: DSLContext
+){
 
     @Bean
     @ConditionalOnProperty(prefix = "auth", name = ["idProvider"], havingValue = "bk_login")
@@ -73,7 +75,7 @@ class PipelinePermConfiguration {
     @Bean
     @ConditionalOnProperty(prefix = "auth", name = ["idProvider"], havingValue = "sample")
     fun mockPipelinePermissionService(
-        dslContext: DSLContext,
+
         pipelineInfoDao: PipelineInfoDao,
         authProjectApi: AuthProjectApi,
         authResourceApi: AuthResourceApi,
@@ -91,7 +93,7 @@ class PipelinePermConfiguration {
     @Bean
     @ConditionalOnProperty(prefix = "auth", name = ["idProvider"], havingValue = "bk_login_v3")
     fun v3pipelinePermissionService(
-        dslContext: DSLContext,
+
         client: Client,
         redisOperation: RedisOperation,
         pipelineInfoDao: PipelineInfoDao,
@@ -115,7 +117,7 @@ class PipelinePermConfiguration {
     fun githubStreamPipelinePermissionService(
         client: Client,
         pipelineInfoDao: PipelineInfoDao,
-        dslContext: DSLContext,
+
         checkTokenService: ClientTokenService
     ): PipelinePermissionService = StreamPipelinePermissionServiceImpl(
         client = client,
@@ -129,7 +131,7 @@ class PipelinePermConfiguration {
     fun gitlabStreamPipelinePermissionService(
         client: Client,
         pipelineInfoDao: PipelineInfoDao,
-        dslContext: DSLContext,
+
         checkTokenService: ClientTokenService
     ): PipelinePermissionService = StreamPipelinePermissionServiceImpl(
         client = client,
@@ -144,7 +146,7 @@ class PipelinePermConfiguration {
         authPermissionApi: AuthPermissionApi,
         authProjectApi: AuthProjectApi,
         pipelineAuthServiceCode: PipelineAuthServiceCode,
-        dslContext: DSLContext,
+
         pipelineInfoDao: PipelineInfoDao,
         pipelineViewGroupService: PipelineViewGroupService,
         authResourceApi: AuthResourceApi

diff --git a/...src/main/kotlin/com/tencent/devops/process/service/webhook/PipelineBuildWebhookService.kt b/...src/main/kotlin/com/tencent/devops/process/service/webhook/PipelineBuildWebhookService.kt
@@ -81,8 +81,10 @@ import com.tencent.devops.repository.utils.RepositoryUtils
 import org.slf4j.LoggerFactory
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
+import org.springframework.stereotype.Service
 
 @Suppress("ALL")
+@Service
 abstract class PipelineBuildWebhookService : ApplicationContextAware {
 
     override fun setApplicationContext(applicationContext: ApplicationContext) {
@@ -95,7 +97,6 @@ abstract class PipelineBuildWebhookService : ApplicationContextAware {
         gitWebhookUnlockDispatcher = applicationContext.getBean(GitWebhookUnlockDispatcher::class.java)
         pipelineWebHookQueueService = applicationContext.getBean(PipelineWebHookQueueService::class.java)
         buildLogPrinter = applicationContext.getBean(BuildLogPrinter::class.java)
-        pipelinebuildWebhookService = applicationContext.getBean(PipelineBuildWebhookService::class.java)
         pipelineBuildCommitService = applicationContext.getBean(PipelineBuildCommitService::class.java)
         webhookBuildParameterService = applicationContext.getBean(WebhookBuildParameterService::class.java)
     }
@@ -110,7 +111,6 @@ abstract class PipelineBuildWebhookService : ApplicationContextAware {
         lateinit var gitWebhookUnlockDispatcher: GitWebhookUnlockDispatcher
         lateinit var pipelineWebHookQueueService: PipelineWebHookQueueService
         lateinit var buildLogPrinter: BuildLogPrinter
-        lateinit var pipelinebuildWebhookService: PipelineBuildWebhookService // 给AOP调用
         lateinit var pipelineBuildCommitService: PipelineBuildCommitService
         lateinit var webhookBuildParameterService: WebhookBuildParameterService
         private val logger = LoggerFactory.getLogger(PipelineBuildWebhookService::class.java)
@@ -265,13 +265,13 @@ abstract class PipelineBuildWebhookService : ApplicationContextAware {
                         return@outside
                     }
 
-                    if (pipelinebuildWebhookService.webhookTriggerPipelineBuild(
+                    /*if (pipelinebuildWebhookService.webhookTriggerPipelineBuild(
                             projectId = projectId,
                             pipelineId = pipelineId,
                             codeRepositoryType = codeRepositoryType,
                             matcher = matcher
                         )
-                    ) return@outside
+                    ) return@outside*/
                 } catch (e: Throwable) {
                     logger.warn("[$pipelineId]|webhookTriggerPipelineBuild fail: $e", e)
                 }

diff --git a/...in/kotlin/com/tencent/devops/process/webhook/service/SamplePipelineBuildWebhookService.kt b/...in/kotlin/com/tencent/devops/process/webhook/service/SamplePipelineBuildWebhookService.kt
@@ -56,13 +56,13 @@ class SamplePipelineBuildWebhookService : PipelineBuildWebhookService() {
         )
     }
 
-    @BkTimed // 要aop生效必须在子类上拦截
+/*    @BkTimed // 要aop生效必须在子类上拦截
     override fun webhookTriggerPipelineBuild(
         projectId: String,
         pipelineId: String,
         codeRepositoryType: String,
         matcher: ScmWebhookMatcher
     ): Boolean {
         return super.webhookTriggerPipelineBuild(projectId, pipelineId, codeRepositoryType, matcher)
-    }
+    }*/
 }