Skip to content

Commit 5f5f8b9

Browse files
authored
Merge pull request #48 from carrypann/develop
feature: 开发web公共组件 #46
2 parents 074b30b + 21b5ce6 commit 5f5f8b9

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

devops-boot-project/devops-boot-core/devops-service/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ description = "DevOps Boot Service"
33
dependencies {
44
api(project(":devops-boot-project:devops-boot-core:devops-web"))
55
api("org.springframework.boot:spring-boot-starter-actuator")
6+
api("com.squareup.okhttp3:okhttp")
67
api("io.github.openfeign:feign-okhttp")
78
api("org.springframework.cloud:spring-cloud-starter-openfeign")
89
api("org.springframework.cloud:spring-cloud-starter-consul-discovery")

devops-boot-project/devops-boot-core/devops-web/src/main/kotlin/com/tencent/devops/web/util/SpringContextUtils.kt renamed to devops-boot-project/devops-boot-core/devops-web/src/main/kotlin/com/tencent/devops/web/util/SpringContextHolder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import org.springframework.context.ApplicationContext
55
import org.springframework.context.ApplicationContextAware
66

77
/**
8-
* Spring上下文工具类
8+
* Spring ApplicationContext Holder
99
*/
10-
class SpringContextUtils : ApplicationContextAware {
10+
class SpringContextHolder : ApplicationContextAware {
1111

1212
/**
1313
* 实现ApplicationContextAware接口的回调方法,设置上下文环境

devops-boot-project/devops-boot-starters/devops-boot-starter-web/src/main/kotlin/com/tencent/devops/web/WebAutoConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.tencent.devops.web
33
import com.tencent.devops.web.banner.DevOpsBannerInitializer
44
import com.tencent.devops.web.jackson.JacksonConfiguration
55
import com.tencent.devops.web.swagger.SwaggerConfiguration
6-
import com.tencent.devops.web.util.SpringContextUtils
6+
import com.tencent.devops.web.util.SpringContextHolder
77
import org.springframework.context.annotation.Configuration
88
import org.springframework.context.annotation.Import
99
import org.springframework.context.annotation.PropertySource
@@ -14,7 +14,7 @@ import org.springframework.context.annotation.PropertySource
1414
@Configuration(proxyBeanMethods = false)
1515
@PropertySource("classpath:common-web.properties")
1616
@Import(
17-
SpringContextUtils::class,
17+
SpringContextHolder::class,
1818
JacksonConfiguration::class,
1919
SwaggerConfiguration::class,
2020
DevOpsBannerInitializer::class

0 commit comments

Comments
 (0)