pref：优化流水线项目下已安装插件关联流水线查询 #11307

TencentBlueKing · Dec 16, 2024 · a0a37d7 · a0a37d7
1 parent 00c32f5
commit a0a37d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/...common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeCCAutoConfiguration.kt b/...common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeCCAutoConfiguration.kt
@@ -49,17 +49,13 @@ class CodeCCAutoConfiguration {
         codeccHost: String = "",
 
         @Value("\${codecc.gray.projectId:}")
-        codeccGrayProjectId: String? = null,
-
-        @Value("\${codecc.projectId:}")
-        codeccProjectId: String? = null
+        codeccGrayProjectId: String? = null
 
     ): CodeccApi =
         CodeccApi(
             codeccApiUrl = codeccApiGateWay,
             codeccApiProxyUrl = codeccApiProxyGateWay,
             codeccHost = codeccHost,
-            codeccGrayProjectId = codeccGrayProjectId,
-            codeccProjectId = codeccProjectId
+            codeccGrayProjectId = codeccGrayProjectId
         )
 }
diff --git a/...i/core/common/common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeccApi.kt b/...i/core/common/common-codecc/src/main/kotlin/com/tencent/devops/plugin/codecc/CodeccApi.kt
@@ -51,8 +51,7 @@ class CodeccApi(
     private val codeccApiUrl: String,
     private val codeccApiProxyUrl: String,
     private val codeccHost: String,
-    private val codeccGrayProjectId: String? = null,
-    private val codeccProjectId: String? = null
+    private val codeccGrayProjectId: String? = null
 ) {
 
     @Value("\${codecc.openapi.token:#{null}}")
@@ -193,8 +192,8 @@ class CodeccApi(
     fun getCodeccOpensourceMeasurement(atomCodeSrc: String): Result<Map<String, Any>> {
         val url = "http://$codeccHost/ms/openapi/api/open/v2/defect/opensource/measurement?url=$atomCodeSrc"
         val headers = mutableMapOf<String, String>()
-        if (!codeccProjectId.isNullOrBlank()) {
-            headers[AUTH_HEADER_PROJECT_ID] = codeccProjectId
+        if (!codeccGrayProjectId.isNullOrBlank()) {
+            headers[AUTH_HEADER_PROJECT_ID] = codeccGrayProjectId
             headers[AUTH_HEADER_CODECC_OPENAPI_TOKEN] = codeccOpenApiToken
         }
         val httpReq = Request.Builder()