feat: Job 支持多租户 TencentBlueKing#3369

wangyu096 · Jan 9, 2025 · 8e77042 · 8e77042
1 parent 67e66ac
commit 8e77042
Showing 1 changed file with 25 additions and 22 deletions.
diff --git a/...end/commons/paas-sdk/src/main/java/com/tencent/bk/job/common/paas/cmsi/CmsiApiClient.java b/...end/commons/paas-sdk/src/main/java/com/tencent/bk/job/common/paas/cmsi/CmsiApiClient.java
@@ -49,6 +49,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.helpers.MessageFormatter;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -83,28 +84,30 @@ public CmsiApiClient(EsbProperties esbProperties,
     }
 
     public List<EsbNotifyChannelDTO> getNotifyChannelList() {
-        try {
-            HttpMetricUtil.setHttpMetricName(CommonMetricNames.ESB_CMSI_API_HTTP);
-            HttpMetricUtil.addTagForCurrentMetric(
-                Tag.of(EsbMetricTags.KEY_API_NAME, API_GET_NOTIFY_CHANNEL_LIST)
-            );
-            EsbResp<List<EsbNotifyChannelDTO>> esbResp = doRequest(
-                OpenApiRequestInfo.builder()
-                    .method(HttpMethodEnum.GET)
-                    .uri(API_GET_NOTIFY_CHANNEL_LIST)
-                    .authorization(authorization)
-                    .build(),
-                new TypeReference<EsbResp<List<EsbNotifyChannelDTO>>>() {
-                }
-            );
-            return esbResp.getData();
-        } catch (Exception e) {
-            String errorMsg = "Get " + API_GET_NOTIFY_CHANNEL_LIST + " error";
-            log.error(errorMsg, e);
-            throw new InternalCmsiException(errorMsg, e, ErrorCode.CMSI_MSG_CHANNEL_DATA_ERROR);
-        } finally {
-            HttpMetricUtil.clearHttpMetric();
-        }
+//        try {
+//            HttpMetricUtil.setHttpMetricName(CommonMetricNames.ESB_CMSI_API_HTTP);
+//            HttpMetricUtil.addTagForCurrentMetric(
+//                Tag.of(EsbMetricTags.KEY_API_NAME, API_GET_NOTIFY_CHANNEL_LIST)
+//            );
+//            EsbResp<List<EsbNotifyChannelDTO>> esbResp = doRequest(
+//                OpenApiRequestInfo.builder()
+//                    .method(HttpMethodEnum.GET)
+//                    .uri(API_GET_NOTIFY_CHANNEL_LIST)
+//                    .authorization(authorization)
+//                    .build(),
+//                new TypeReference<EsbResp<List<EsbNotifyChannelDTO>>>() {
+//                }
+//            );
+//            return esbResp.getData();
+//        } catch (Exception e) {
+//            String errorMsg = "Get " + API_GET_NOTIFY_CHANNEL_LIST + " error";
+//            log.error(errorMsg, e);
+//            throw new InternalCmsiException(errorMsg, e, ErrorCode.CMSI_MSG_CHANNEL_DATA_ERROR);
+//        } finally {
+//            HttpMetricUtil.clearHttpMetric();
+//        }
+        // 临时注释，保证多租户联调正常
+        return Collections.emptyList();
     }
 
     public void sendMsg(String msgType,