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

fcfang123 · Oct 18, 2023 · ee22977 · ee22977
1 parent ea6207c
commit ee22977
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 18 deletions.
diff --git a/...ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/config/JooqConfiguration.kt b/...ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/config/JooqConfiguration.kt
@@ -56,7 +56,7 @@ import javax.sql.DataSource
  */
 @Configuration
 @Import(DataSourceConfig::class, DBBaseConfiguration::class)
-@ConditionalOnMissingClass("com.tencent.devops.mutijar.MutijarDslContextConfiguration")
+@ConditionalOnMissingClass("com.tencent.devops.multijar.MultijarDslContextConfiguration")
 @AutoConfigureAfter(DBBaseConfiguration::class)
 class JooqConfiguration {
 

diff --git a/...ore/mutijar/boot-mutijar/build.gradle.kts → ...e/multijar/boot-multijar/build.gradle.kts b/...ore/mutijar/boot-mutijar/build.gradle.kts → ...e/multijar/boot-multijar/build.gradle.kts
diff --git a/.../mutijar/DataSourceDefinitionRegistrar.kt → ...multijar/DataSourceDefinitionRegistrar.kt b/.../mutijar/DataSourceDefinitionRegistrar.kt → ...multijar/DataSourceDefinitionRegistrar.kt
@@ -1,7 +1,6 @@
-package com.tencent.devops.mutijar
+package com.tencent.devops.multijar
 
 import com.mysql.jdbc.Driver
-import com.tencent.devops.common.web.jasypt.DefaultEncryptor
 import com.zaxxer.hikari.HikariDataSource
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean
@@ -12,11 +11,9 @@ import org.springframework.boot.autoconfigure.AutoConfigureOrder
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar
 import org.springframework.core.Ordered
-import org.springframework.core.env.Environment
 import org.springframework.core.io.ClassPathResource
 import org.springframework.core.type.AnnotationMetadata
 import org.springframework.transaction.annotation.EnableTransactionManagement
-import java.util.Properties
 
 
 @Configuration

diff --git a/...devops/mutijar/JooqDefinitionRegistrar.kt → ...evops/multijar/JooqDefinitionRegistrar.kt b/...devops/mutijar/JooqDefinitionRegistrar.kt → ...evops/multijar/JooqDefinitionRegistrar.kt
@@ -1,11 +1,10 @@
-package com.tencent.devops.mutijar
+package com.tencent.devops.multijar
 
 import com.tencent.devops.common.db.listener.BkJooqExecuteListener
 import org.jooq.SQLDialect
 import org.jooq.impl.DataSourceConnectionProvider
 import org.jooq.impl.DefaultConfiguration
 import org.jooq.impl.DefaultExecuteListenerProvider
-import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.support.BeanDefinitionBuilder
 import org.springframework.beans.factory.support.BeanDefinitionRegistry
 import org.springframework.beans.factory.support.BeanNameGenerator

diff --git a/...cent/devops/mutijar/MutijarApplication.kt → ...nt/devops/multijar/MultijarApplication.kt b/...cent/devops/mutijar/MutijarApplication.kt → ...nt/devops/multijar/MultijarApplication.kt
@@ -25,7 +25,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.tencent.devops.mutijar
+package com.tencent.devops.multijar
 
 import com.tencent.devops.common.service.MicroService
 import com.tencent.devops.common.service.MicroServiceApplication

diff --git a/...mutijar/MutijarDslContextConfiguration.kt → ...ltijar/MultijarDslContextConfiguration.kt b/...mutijar/MutijarDslContextConfiguration.kt → ...ltijar/MultijarDslContextConfiguration.kt
@@ -24,13 +24,12 @@
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.tencent.devops.mutijar
+package com.tencent.devops.multijar
 
 import com.tencent.devops.common.db.config.DBBaseConfiguration
 import org.jooq.DSLContext
 import org.jooq.impl.DSL
 import org.jooq.impl.DefaultConfiguration
-import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.InjectionPoint
 import org.springframework.beans.factory.NoSuchBeanDefinitionException
 import org.springframework.beans.factory.config.ConfigurableBeanFactory
@@ -43,15 +42,14 @@ import java.lang.reflect.AnnotatedElement
 import java.lang.reflect.Constructor
 import java.lang.reflect.Field
 import java.lang.reflect.Method
-import java.lang.reflect.Parameter
 
 /**
  *
  * Powered By Tencent
  */
 @Configuration
 @Import(DBBaseConfiguration::class, DataSourceDefinitionRegistrar::class, JooqDefinitionRegistrar::class)
-class MutijarDslContextConfiguration {
+class MultijarDslContextConfiguration {
     @Bean
     @Primary
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)

diff --git a/...utijar/src/main/resources/application.yml → ...ltijar/src/main/resources/application.yml b/...utijar/src/main/resources/application.yml → ...ltijar/src/main/resources/application.yml
@@ -27,7 +27,7 @@ spring:
       - store
       - quality
   application:
-    name: mutijar
-    desc: DevOps MUTIJAR Service
+    name: multijar
+    desc: DevOps MULTIJAR Service
     version: 4.0.0
-    packageName: com.tencent.devops.mutijar
+    packageName: com.tencent.devops.multijar
diff --git a/src/backend/ci/core/mutijar/build.gradle.kts → ...backend/ci/core/multijar/build.gradle.kts b/src/backend/ci/core/mutijar/build.gradle.kts → ...backend/ci/core/multijar/build.gradle.kts
@@ -26,5 +26,5 @@
  */
 
 subprojects {
-    group = "com.tencent.bk.devops.ci.mutijar"
+    group = "com.tencent.bk.devops.ci.multijar"
 }
diff --git a/src/backend/ci/settings.gradle.kts b/src/backend/ci/settings.gradle.kts
@@ -268,5 +268,5 @@ include(":core:metrics:biz-metrics-sample")
 include(":core:metrics:boot-metrics")
 include(":core:metrics:model-metrics")
 
-include("core:mutijar")
-include("core:mutijar:boot-mutijar")
+include("core:multijar")
+include("core:multijar:boot-multijar")