Skip to content

Commit

Permalink
feat: 升级devops-framework版本 #73
Browse files Browse the repository at this point in the history
  • Loading branch information
yaoxuwan committed Apr 27, 2023
1 parent fdc4b20 commit 543b902
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 330 deletions.
Expand Up @@ -44,12 +44,10 @@ import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping

@Api("临时token服务接口")
@Primary
@FeignClient(AUTH_SERVICE_NAME, contextId = "ServiceTemporaryTokenResource")
@RequestMapping("/service/temporary/token")
interface ServiceTemporaryTokenResource {

@ApiOperation("创建临时token")
Expand Down
Expand Up @@ -37,12 +37,14 @@ import com.tencent.bkrepo.auth.pojo.token.TemporaryTokenInfo
import com.tencent.bkrepo.auth.service.TemporaryTokenService
import com.tencent.bkrepo.common.api.pojo.Response
import com.tencent.bkrepo.common.service.util.ResponseBuilder
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController

/**
* 临时token服务接口实现类
*/
@RestController
@RequestMapping("/service/temporary/token")
class ServiceTemporaryTokenResourceImpl(
private val temporaryTokenService: TemporaryTokenService
) : ServiceTemporaryTokenResource {
Expand Down
Expand Up @@ -41,20 +41,12 @@ import org.springframework.context.annotation.Configuration
@ConditionalOnClass(OtelTracer::class, MongoClientImpl::class)
class OtelMongoConfiguration {

@Bean
fun traceMongoClientSettingsBuilderCustomizer(
tracer: Tracer,
customizers: ObjectProvider<List<TraceMongoSpanCustomizer>>
): TraceMongoClientSettingsBuilderCustomizer {
return TraceMongoClientSettingsBuilderCustomizer(tracer, customizers.ifAvailable.orEmpty())
}

@Bean
// @Bean
fun dbMongoSpanCustomizer(): TraceMongoSpanCustomizer {
return DBMongoSpanCustomizer()
}

@Bean
// @Bean
fun netMongoSpanCustomizer(): TraceMongoSpanCustomizer {
return NetMongoSpanCustomizer()
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Expand Up @@ -35,12 +35,10 @@ import org.springframework.cloud.openfeign.FeignClient
import org.springframework.context.annotation.Primary
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.PathVariable
import org.springframework.web.bind.annotation.RequestMapping

@Api("分发服务操作接口")
@Primary
@FeignClient(REPLICATION_SERVICE_NAME, contextId = "ServiceClusterNodeClient")
@RequestMapping("/service/cluster")
interface ClusterNodeClient {

@GetMapping("/{name}")
Expand Down
Expand Up @@ -37,12 +37,10 @@ import org.springframework.cloud.openfeign.FeignClient
import org.springframework.context.annotation.Primary
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping

@Api("同步任务服务操作接口")
@Primary
@FeignClient(REPLICATION_SERVICE_NAME, contextId = "ReplicaTaskClient")
@RequestMapping("/service/task")
interface ReplicaTaskClient {

@ApiOperation("创建任务")
Expand Down

0 comments on commit 543b902

Please sign in to comment.