feat：蓝盾本地开发实现 TencentBlueKing#9576

fcfang123 · Apr 22, 2024 · bb3bc74 · bb3bc74
1 parent 461b6a1
commit bb3bc74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.../main/kotlin/com/tencent/devops/dispatch/docker/config/DispatchDockerBeanConfiguration.kt b/.../main/kotlin/com/tencent/devops/dispatch/docker/config/DispatchDockerBeanConfiguration.kt
@@ -47,7 +47,7 @@ import org.springframework.core.Ordered
 @Suppress("ALL")
 @Configuration
 @ConditionalOnWebApplication
-@DependsOn(value = ["dispatchDslContextConfiguration"])
+@DependsOn(value = ["dispatchJooqConfiguration"])
 @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
 class DispatchDockerBeanConfiguration @Autowired constructor(
     private val dslContext: DSLContext

diff --git a/...ration/DispatchDslContextConfiguration.kt → ...onfiguration/DispatchJooqConfiguration.kt b/...ration/DispatchDslContextConfiguration.kt → ...onfiguration/DispatchJooqConfiguration.kt
@@ -55,10 +55,10 @@ import javax.sql.DataSource
 @Configuration
 @Import(DispatchDataSourceConfig::class, DBBaseConfiguration::class)
 @ConditionalOnMissingClass("com.tencent.devops.multijar.MultijarDslContextConfiguration")
-class DispatchDslContextConfiguration {
+class DispatchJooqConfiguration {
 
     companion object {
-        private val LOG = LoggerFactory.getLogger(DispatchDslContextConfiguration::class.java)
+        private val LOG = LoggerFactory.getLogger(DispatchJooqConfiguration::class.java)
     }
 
     @Bean
@@ -83,7 +83,7 @@ class DispatchDslContextConfiguration {
             }
 
             if ((packageName.startsWith("com.tencent.devops.dispatch."))) {
-                val configuration = configurationMap["dispatchJooqConfiguration"]
+                val configuration = configurationMap["jooqConfiguration"]
                     ?: throw NoSuchBeanDefinitionException("no dispatchJooqConfiguration")
                 LOG.info("dslContext_init|dispatchJooqConfiguration|${declaringClass.name}")
                 return DSL.using(configuration)
@@ -93,7 +93,7 @@ class DispatchDslContextConfiguration {
     }
 
     @Bean
-    fun dispatchJooqConfiguration(
+    fun jooqConfiguration(
         @Qualifier("dispatchDataSource")
         dispatchWindowsDataSource: DataSource,
         @Qualifier("bkJooqExecuteListenerProvider")