diff --git a/src/dashboard-front/src/components/resource-detail/index.vue b/src/dashboard-front/src/components/resource-detail/index.vue
index 6f4ed1304..7c96b3ecb 100644
--- a/src/dashboard-front/src/components/resource-detail/index.vue
+++ b/src/dashboard-front/src/components/resource-detail/index.vue
@@ -178,15 +178,6 @@
           </div>
         </bk-col>
       </bk-row> -->
-
-      <bk-row :class="{ 'ag-diff': checkDiff('localData.enable_websocket') }">
-        <bk-col :span="4">
-          <label class="ag-key">{{ $t("启用 WebSocket") }}:</label>
-        </bk-col>
-        <bk-col :span="10">
-          <div class="ag-value">{{ localData.enable_websocket ? $t("是") : $t("否") }}</div>
-        </bk-col>
-      </bk-row>
     </bk-container>
 
     <template v-if="localData.proxy?.backend_id">
diff --git a/src/dashboard-front/src/css/common.css b/src/dashboard-front/src/css/common.css
index 7a3b62d29..3e353ee2d 100644
--- a/src/dashboard-front/src/css/common.css
+++ b/src/dashboard-front/src/css/common.css
@@ -148,9 +148,6 @@
 .mt5 {
   margin-top: 5px !important;
 }
-.mt8 {
-  margin-top: 8px !important;
-}
 .mt10 {
   margin-top: 10px !important;
 }
diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts
index 3971a3caf..35d12096a 100644
--- a/src/dashboard-front/src/language/lang.ts
+++ b/src/dashboard-front/src/language/lang.ts
@@ -138,10 +138,6 @@ const lang: ILANG = {
   '个资源': ['resources'],
   '批量编辑资源': ['Batch Edit Resource'],
   '确定要删除实例': ['Confirm to delete the instance'],
-  '批量编辑资源（共{count}个）': ['Batch edit resources (total {count})'],
-  '确定要删除以下{count}个资源': ['Be sure to delete the following {count} resources'],
-  '删除资源后，需要生成新的版本，并发布到目标环境才能生效': ['After a resource is deleted, a new version must be generated and released to the target environment to take effect'],
-  '是否修改标签': ['Whether to modify labels'],
   '请输入资源名称或请求路径，回车结束': ['Please input resource name or path, press Enter to search'],
   '全部差异类型': ['All Diff Types'],
   '仅显示有差异的资源属性': ['Only show differences'],
@@ -1591,8 +1587,6 @@ const lang: ILANG = {
   '文件名需要跟资源名称完全一致才能导入，请检查文件名': ['Filename must matches resource name'],
   '已匹配到资源': ['Resource matched'],
   '未匹配到资源': ['Resource not matched'],
-  '启用 WebSocket': ['Enable WebSocket'],
-  '启用 WebSocket：': ['Enable WebSocket: '],
 
   // 变量的使用 $t('test', { vari1: 1, vari2: 2 })
   // // 变量的使用 $t('test', { vari1: 1, vari2: 2 })
diff --git a/src/dashboard-front/src/views/backend-service/add.vue b/src/dashboard-front/src/views/backend-service/add.vue
index 8ca8a26f1..e0fe47af9 100644
--- a/src/dashboard-front/src/views/backend-service/add.vue
+++ b/src/dashboard-front/src/views/backend-service/add.vue
@@ -110,7 +110,7 @@
                                   :rules="configRules.weight"
                                   :property="`configs.hosts.${i}.weight`"
                                   label=""
-                                  class="weight-input">
+                                  style="margin-bottom: 0px;">
                                   <bk-input
                                     class="suffix-slot-cls weights-input"
                                     :placeholder="t('权重')"
@@ -653,25 +653,15 @@ defineExpose({
     display: none;
   }
 }
-.weight-input {
-  margin-bottom: 0px;
-  border-left: 1px solid #c4c6cc !important;
-  :deep(.bk-form-content) {
-    margin-top: -1px;
-  }
-}
 .suffix-slot-cls {
   width: 80px;
   line-height: 30px;
   font-size: 12px;
   color: #63656e;
   text-align: center;
-  height: 30px;
+  height: 28px;
   border: none;
-  box-shadow: none !important;
-  :deep(.bk-input--text) {
-    border-radius: 0;
-  }
+  border-left: 1px solid #c4c6cc !important;
 }
 .scheme-select-cls {
   color: #63656e;
diff --git a/src/dashboard-front/src/views/online-debug/index.vue b/src/dashboard-front/src/views/online-debug/index.vue
index e1af70d10..41f25b20d 100644
--- a/src/dashboard-front/src/views/online-debug/index.vue
+++ b/src/dashboard-front/src/views/online-debug/index.vue
@@ -20,8 +20,7 @@
             v-for="item in stageList"
             :id="item.id"
             :key="item.id"
-            :name="getItemName(item)"
-            :disabled="['unreleased', 'failure'].includes(item?.release?.status)"
+            :name="item.name"
           />
         </bk-select>
         <div class="search-source">
@@ -538,18 +537,6 @@ const resourceGroup = computed(() => {
   return group;
 });
 
-const getItemName = (item: any) => {
-  if (!['unreleased', 'failure'].includes(item?.release?.status)) {
-    return item.name;
-  }
-  if (item?.release?.status === 'unreleased') {
-    return `${item.name} （未发布）`;
-  }
-  if (item?.release?.status === 'failure') {
-    return `${item.name} （发布失败）`;
-  }
-};
-
 const handleStageChange = (payload: number) => {
   const hasData = stageList.value.find((item: Record<string, number>) => item.id === payload);
   // 如果是未发布或者发布失败则不需要调资源列表
diff --git a/src/dashboard-front/src/views/resource/setting/comps/front-config.vue b/src/dashboard-front/src/views/resource/setting/comps/front-config.vue
index b1ebe66b1..3a9ff1f38 100644
--- a/src/dashboard-front/src/views/resource/setting/comps/front-config.vue
+++ b/src/dashboard-front/src/views/resource/setting/comps/front-config.vue
@@ -31,12 +31,6 @@
         </bk-checkbox>
       </div>
     </bk-form-item>
-    <bk-form-item
-      :label="t('启用 WebSocket')"
-      property="enable_websocket"
-      required>
-      <bk-switcher v-model="frontConfigData.enable_websocket" theme="primary" size="small"></bk-switcher>
-    </bk-form-item>
   </bk-form>
 </template>
 <script setup lang="ts">
@@ -64,7 +58,6 @@ const frontConfigData = ref({
   path: '',
   method: 'GET',
   match_subpath: false,
-  enable_websocket: false,
 });
 
 const cloneData = ref({
@@ -111,8 +104,8 @@ watch(
   () => props.detail,
   (val: any) => {
     if (Object.keys(val).length) {
-      const { path, method, match_subpath, enable_websocket } = val;
-      frontConfigData.value = { path, method, match_subpath, enable_websocket };
+      const { path, method, match_subpath } = val;
+      frontConfigData.value = { path, method, match_subpath };
       if (props.isClone) {
         cloneData.value = { path, method };
         setTimeout(() => {
diff --git a/src/dashboard-front/src/views/resource/setting/comps/select-check-box.vue b/src/dashboard-front/src/views/resource/setting/comps/select-check-box.vue
index 3b74c2b88..61cb5ad78 100644
--- a/src/dashboard-front/src/views/resource/setting/comps/select-check-box.vue
+++ b/src/dashboard-front/src/views/resource/setting/comps/select-check-box.vue
@@ -117,8 +117,6 @@ const props = defineProps({
   // 是否强制让 select 进入 focus 态
   // 用于某些场景下 select 框不展示 focus 态样式的问题
   forceFocus: { type: Boolean, default: false },
-  // 批量编辑标签时，不需要更新某一资源的标签列表
-  bathEdit: { type: Boolean, default: false },
 });
 
 const { curSelectLabelIds, resourceId, labelsData, width, isAdd, modelValue } = toRefs(props);
@@ -163,7 +161,7 @@ const handleToggle = async (v: boolean) => {
     _forceFocus.value = false;
   }
   // 新增标签标识
-  if (isAdd.value || props.bathEdit) return;
+  if (isAdd.value) return;
   setTimeout(async () => {
     // 关闭下拉框且
     if (!v) {
@@ -201,7 +199,7 @@ const addOption = async () => {
       width: 'auto',
     });
     optionName.value = '';
-    if (curLabelIds.value.length < 10 && !props.bathEdit) {
+    if (curLabelIds.value.length < 10) {
       curLabelIds.value.push(ret.id);
       if (!isAdd.value) {
         await updateResourcesLabels(apigwId, resourceId.value, { label_ids: curLabelIds.value });
diff --git a/src/dashboard-front/src/views/resource/setting/detail.vue b/src/dashboard-front/src/views/resource/setting/detail.vue
index cc32d7958..4991e1d74 100644
--- a/src/dashboard-front/src/views/resource/setting/detail.vue
+++ b/src/dashboard-front/src/views/resource/setting/detail.vue
@@ -301,29 +301,6 @@
           </bk-popover>
         </div>
       </bk-form-item>
-      <!--  是否启用 websocket  -->
-      <bk-form-item class="form-item-cls">
-        <template #label>
-          <span class="label-cls">{{ t('启用 WebSocket：') }}</span>
-        </template>
-
-        <div v-if="!frontWsEdit" class="value-container">
-          <span>{{ formData?.enable_websocket ? t('是') : t('否') }}</span>
-          <span class="operate-btn">
-            <i @click="frontWsEdit = true" class="apigateway-icon icon-ag-edit-line"></i>
-          </span>
-        </div>
-
-        <div class="edit-name mt8" v-else>
-          <bk-switcher
-            v-model="formData.enable_websocket"
-            theme="primary"
-            size="small"
-            @change="handleEditSave"
-            class="method">
-          </bk-switcher>
-        </div>
-      </bk-form-item>
     </bk-form>
 
     <div class="title">{{ t('后端配置') }}</div>
@@ -602,7 +579,6 @@ const permEdit = ref<boolean>(false);
 const publicEdit = ref<boolean>(false);
 const frontMethodEdit = ref<boolean>(false);
 const frontPathEdit = ref<boolean>(false);
-const frontWsEdit = ref(false); // 是否启用websocket的编辑态
 const backMethodEdit = ref<boolean>(false);
 const backServicesEdit = ref<boolean>(false);
 const backPathEdit = ref<boolean>(false);
@@ -879,7 +855,6 @@ const handleEditSave = async () => {
     publicEdit.value = false;
     frontMethodEdit.value = false;
     frontPathEdit.value = false;
-    frontWsEdit.value = false;
     backMethodEdit.value = false;
     backServicesEdit.value = false;
     backPathEdit.value = false;
diff --git a/src/dashboard-front/src/views/resource/setting/import.vue b/src/dashboard-front/src/views/resource/setting/import.vue
index d4d627f8b..bcdfa755e 100644
--- a/src/dashboard-front/src/views/resource/setting/import.vue
+++ b/src/dashboard-front/src/views/resource/setting/import.vue
@@ -595,7 +595,6 @@ import {
 } from '@/views/resource/setting/types';
 import TableResToAction from '@/views/resource/setting/comps/table-res-to-action.vue';
 import TableResToUncheck from '@/views/resource/setting/comps/table-res-to-uncheck.vue';
-
 // @ts-ignore
 import { useParentElement } from '@vueuse/core';
 
diff --git a/src/dashboard-front/src/views/resource/setting/index.vue b/src/dashboard-front/src/views/resource/setting/index.vue
index 9d379f183..bf30ea940 100644
--- a/src/dashboard-front/src/views/resource/setting/index.vue
+++ b/src/dashboard-front/src/views/resource/setting/index.vue
@@ -374,7 +374,7 @@
       quick-close
       :is-loading="dialogData.loading"
       @confirm="handleBatchConfirm"
-      @closed="handleBatchCancel">
+      @closed="dialogData.isShow = false">
       <div class="delete-content" v-if="isBatchDelete">
         <bk-table
           row-hover="auto"
@@ -386,12 +386,12 @@
         <bk-alert
           class="mt10 mb10"
           theme="warning"
-          :title="t('删除资源后，需要生成新的版本，并发布到目标环境才能生效')"
+          title="删除资源后，需要生成新的版本，并发布到目标环境才能生效"
         />
       </div>
       <div v-else>
         <bk-form>
-          <bk-form-item :label="t('基本信息')">
+          <bk-form-item label="基本信息">
             <bk-checkbox
               v-model="batchEditData.isPublic"
               @change="handlePublicChange">
@@ -403,24 +403,6 @@
               {{ t('允许申请权限') }}
             </bk-checkbox>
           </bk-form-item>
-          <bk-form-item :label="t('是否修改标签')">
-            <div class="edit-labels-container">
-              <bk-switcher
-                v-model="batchEditData.isUpdateLabels"
-                theme="primary"
-              />
-              <SelectCheckBox
-                class="select-labels"
-                v-if="batchEditData.isUpdateLabels"
-                :cur-select-label-ids="[]"
-                :labels-data="labelsData"
-                :bath-edit="true"
-                v-model="batchEditData.labelIds"
-                @update-success="getLabelsData"
-                @label-add-success="getLabelsData">
-              </SelectCheckBox>
-            </div>
-          </bk-form-item>
         </bk-form>
       </div>
     </bk-dialog>
@@ -662,8 +644,6 @@ const versionConfigs = reactive({
 const batchEditData = ref({
   isPublic: true,
   allowApply: true,
-  isUpdateLabels: false,
-  labelIds: [],
 });
 
 // const showEdit = ref(false);
@@ -984,11 +964,11 @@ const handleBatchOperate = async (data: IDropList) => {
   // 批量删除
   if (data.value === 'delete') {
     isBatchDelete.value = true;
-    dialogData.title = t('确定要删除以下{count}个资源', { count: selections.value.length });
+    dialogData.title = t(`确定要删除以下${selections.value.length}个资源`);
   } else {
     // 批量编辑
     isBatchDelete.value = false;
-    dialogData.title = t('批量编辑资源（共{count}个）', { count: selections.value.length });
+    dialogData.title = t(`批量编辑资源共${selections.value.length}个`);
   }
 };
 
@@ -1046,14 +1026,11 @@ const handleBatchConfirm = async () => {
       ids,
       is_public: batchEditData.value.isPublic,
       allow_apply_permission: batchEditData.value.allowApply,
-      is_update_labels: batchEditData.value.isUpdateLabels,
-      label_ids: batchEditData.value.labelIds,
     };
     // 批量编辑
     await batchEditResources(props.apigwId, params);
   }
   dialogData.isShow = false;
-  batchEditData.value.isUpdateLabels = false;
   Message({
     message: t(`${isBatchDelete.value ? '删除' : '编辑'}成功`),
     theme: 'success',
@@ -1063,11 +1040,6 @@ const handleBatchConfirm = async () => {
   resetSelections();
 };
 
-const handleBatchCancel = () => {
-  dialogData.isShow = false;
-  batchEditData.value.isUpdateLabels = false;
-};
-
 // 处理导入跳转
 const handleImport = (v: IDropList) => {
   const routerName = v.value === 'doc' ? 'apigwResourceImportDoc' : 'apigwResourceImport';
@@ -1293,8 +1265,6 @@ watch(
     if (!filterData.value.order_by) {
       delete filterData.value.order_by;
     }
-    pagination.value.offset = 0;
-    pagination.value.current = 0;
     if (v.length) {
       v.forEach((e: any) => {
         if (e.id === e.name) {
@@ -1671,14 +1641,6 @@ onBeforeMount(() => {
   color: #3a84ff;
   cursor: pointer;
 }
-.edit-labels-container {
-  .select-labels {
-    margin-left: 16px;
-    margin-top: 0px !important;
-    display: inline-block;
-    width: 240px;
-  }
-}
 </style>
 <style lang="scss">
 .content-footer {
diff --git a/src/dashboard-front/src/views/stage/overview/comps/edit-stage-sideslider.vue b/src/dashboard-front/src/views/stage/overview/comps/edit-stage-sideslider.vue
index d5797e2f2..7e8048681 100644
--- a/src/dashboard-front/src/views/stage/overview/comps/edit-stage-sideslider.vue
+++ b/src/dashboard-front/src/views/stage/overview/comps/edit-stage-sideslider.vue
@@ -162,7 +162,7 @@
                                     :rules="rules.weight"
                                     :property="`config.hosts.${index}.weight`"
                                     label=""
-                                    class="weight-input">
+                                    style="margin-bottom: 0px;">
                                     <bk-input
                                       :class="['suffix-slot-cls', 'weights-input', { 'is-error': hostItem.isRoles }]"
                                       :placeholder="$t('权重')"
@@ -883,25 +883,16 @@ defineExpose({
     }
   }
 }
-.weight-input {
-  margin-bottom: 0px;
-  border-left: 1px solid #c4c6cc !important;
-  :deep(.bk-form-content) {
-    margin-top: -1px;
-  }
-}
+
 .suffix-slot-cls {
   width: 80px;
   line-height: 30px;
   font-size: 12px;
   color: #63656e;
   text-align: center;
-  height: 30px;
+  height: 28px;
   border: none;
-  box-shadow: none !important;
-  :deep(.bk-input--text) {
-    border-radius: 0;
-  }
+  border-left: 1px solid #c4c6cc !important;
 }
 .group-text-style {
   width: 20px;
diff --git a/src/dashboard-front/src/views/stage/overview/detail-mode/resource-details.vue b/src/dashboard-front/src/views/stage/overview/detail-mode/resource-details.vue
index c9ae34d25..00785fb79 100644
--- a/src/dashboard-front/src/views/stage/overview/detail-mode/resource-details.vue
+++ b/src/dashboard-front/src/views/stage/overview/detail-mode/resource-details.vue
@@ -140,15 +140,6 @@
                 <div class="ag-value">{{ currentSource.path }}</div>
               </bk-col>
             </bk-row>
-
-            <bk-row>
-              <bk-col :span="4">
-                <label class="ag-key">{{ $t("启用 Websocket") }}:</label>
-              </bk-col>
-              <bk-col :span="10">
-                <div class="ag-value">{{ currentSource.enable_websocket ? t('是') : t('否') }}</div>
-              </bk-col>
-            </bk-row>
           </bk-container>
 
           <p
diff --git a/src/dashboard/Dockerfile b/src/dashboard/Dockerfile
index 038f064d1..df54ec820 100644
--- a/src/dashboard/Dockerfile
+++ b/src/dashboard/Dockerfile
@@ -3,7 +3,8 @@ ARG TAG=3.10.12-slim-bullseye
 FROM ${IMAGE}:${TAG}
 
 RUN apt-get update && apt-get install -y libssl-dev default-libmysqlclient-dev libffi-dev \
-    build-essential libc6-dev libjpeg-dev zlib1g-dev vim procps default-mysql-client curl openjdk-11-jdk maven
+    build-essential libc6-dev libjpeg-dev zlib1g-dev vim procps default-mysql-client curl
+
 ARG PYPI="https://pypi.org/simple/"
 RUN pip config set global.index-url "${PYPI}"
 
diff --git a/src/dashboard/apigateway/apigateway/apis/open/esb/permission/views.py b/src/dashboard/apigateway/apigateway/apis/open/esb/permission/views.py
index a3661822b..3faa10ab7 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/esb/permission/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/esb/permission/views.py
@@ -24,9 +24,6 @@
 from rest_framework import status, viewsets
 
 from apigateway.apis.open.esb.permission import serializers
-from apigateway.apis.open.permissions import (
-    OpenAPIPermission,
-)
 from apigateway.apps.esb.bkcore.models import (
     AppPermissionApplyRecord,
     ComponentSystem,
@@ -40,7 +37,7 @@
 
 
 class ComponentViewSet(viewsets.GenericViewSet):
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
     serializer_class = serializers.AppPermissionComponentSLZ
 
     @swagger_auto_schema(
@@ -66,7 +63,7 @@ def list(self, request, system_id: int, *args, **kwargs):
 
 
 class AppPermissionApplyV1APIView(viewsets.GenericViewSet):
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
     serializer_class = serializers.AppPermissionApplySLZ
 
     @transaction.atomic
@@ -105,7 +102,7 @@ class AppPermissionRenewAPIView(viewsets.GenericViewSet):
     权限续期
     """
 
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
     serializer_class = serializers.AppPermissionRenewSLZ
 
     def renew(self, request, *args, **kwargs):
@@ -125,7 +122,7 @@ def renew(self, request, *args, **kwargs):
 
 
 class AppPermissionViewSet(viewsets.ViewSet):
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
 
     def list(self, request, *args, **kwargs):
         """已申请权限列表"""
@@ -145,7 +142,7 @@ def list(self, request, *args, **kwargs):
 
 
 class AppPermissionApplyRecordViewSet(viewsets.GenericViewSet):
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
     serializer_class = serializers.AppPermissionApplyRecordQuerySLZ
 
     def list(self, request, *args, **kwargs):
diff --git a/src/dashboard/apigateway/apigateway/apis/open/esb/system/views.py b/src/dashboard/apigateway/apigateway/apis/open/esb/system/views.py
index f4891b05c..9d05bb0a8 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/esb/system/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/esb/system/views.py
@@ -22,15 +22,13 @@
 from rest_framework import status, viewsets
 
 from apigateway.apis.open.esb.system import serializers
-from apigateway.apis.open.permissions import (
-    OpenAPIPermission,
-)
 from apigateway.apps.esb.bkcore.models import ComponentSystem, ESBChannel
 from apigateway.utils.responses import V1OKJsonResponse
 
 
 class SystemViewSet(viewsets.GenericViewSet):
-    permission_classes = [OpenAPIPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
 
     def _filter_active_and_public_systems(self, boards: List[str]):
         """
diff --git a/src/dashboard/apigateway/apigateway/apis/open/gateway/urls.py b/src/dashboard/apigateway/apigateway/apis/open/gateway/urls.py
index 705bdf3c2..f286b6bd0 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/gateway/urls.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/gateway/urls.py
@@ -22,7 +22,7 @@
 
 urlpatterns = [
     path("", views.GatewayListApi.as_view(), name="openapi.gateway.list"),
-    path("<int:gateway_id>/", views.GatewayRetrieveApi.as_view(), name="openapi.gateway.retrieve"),
+    path("<int:id>/", views.GatewayRetrieveApi.as_view(), name="openapi.gateway.retrieve"),
     path(
         "<slug:gateway_name>/",
         include(
diff --git a/src/dashboard/apigateway/apigateway/apis/open/gateway/views.py b/src/dashboard/apigateway/apigateway/apis/open/gateway/views.py
index 3e2db989c..a46b87e1a 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/gateway/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/gateway/views.py
@@ -30,12 +30,6 @@
 from rest_framework import generics, status
 
 from apigateway.apis.open.gateway import serializers
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayIdPermission,
-    OpenAPIGatewayNamePermission,
-    OpenAPIGatewayRelatedAppPermission,
-    OpenAPIPermission,
-)
 from apigateway.apps.audit.constants import OpTypeEnum
 from apigateway.biz.audit import Auditor
 from apigateway.biz.gateway.saver import GatewayData, GatewaySaver
@@ -43,6 +37,7 @@
 from apigateway.biz.release import ReleaseHandler
 from apigateway.common.constants import CACHE_MAXSIZE, CACHE_TIME_5_MINUTES
 from apigateway.common.contexts import GatewayAuthContext
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.core.constants import GatewayStatusEnum
 from apigateway.core.models import JWT, Gateway
 from apigateway.utils.django import get_model_dict
@@ -60,7 +55,7 @@
 )
 class GatewayListApi(generics.ListAPIView):
     serializer_class = serializers.GatewayListV1OutputSLZ
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
 
     def get_queryset(self):
         return Gateway.objects.all()
@@ -136,9 +131,8 @@ def _filter_list_queryset(
     ),
 )
 class GatewayRetrieveApi(generics.RetrieveAPIView):
-    permission_classes = [OpenAPIGatewayIdPermission]
+    request_from_gateway_required = True
     serializer_class = serializers.GatewayRetrieveV1OutputSLZ
-    lookup_url_kwarg = "gateway_id"
     lookup_field = "id"
 
     def get_queryset(self):
@@ -151,7 +145,8 @@ def retrieve(self, request, *args, **kwargs):
 
 
 class GatewayPublicKeyRetrieveApi(generics.RetrieveAPIView):
-    permission_classes = [OpenAPIGatewayNamePermission]
+    permission_classes = [GatewayRelatedAppPermission]
+    gateway_permission_exempt = True
 
     @swagger_auto_schema(tags=["OpenAPI.Gateway"])
     def get(self, request, gateway_name: str, *args, **kwargs):
@@ -166,9 +161,9 @@ def get(self, request, gateway_name: str, *args, **kwargs):
 
 
 class GatewaySyncApi(generics.CreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
-    allow_gateway_not_exist = True
+    permission_classes = [GatewayRelatedAppPermission]
     serializer_class = serializers.GatewaySyncInputSLZ
+    allow_gateway_not_exist = True
 
     @swagger_auto_schema(request_body=serializers.GatewaySyncInputSLZ, tags=["OpenAPI.Gateway"])
     @transaction.atomic
@@ -215,7 +210,7 @@ def post(self, request, gateway_name: str, *args, **kwargs):
 
 
 class GatewayUpdateStatusApi(generics.CreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
     serializer_class = serializers.GatewayUpdateStatusInputSLZ
 
     @swagger_auto_schema(request_body=serializers.GatewayUpdateStatusInputSLZ, tags=["OpenAPI.Gateway"])
@@ -241,7 +236,7 @@ def post(self, request, *args, **kwargs):
 
 
 class GatewayRelatedAppAddApi(generics.CreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
     serializer_class = serializers.GatewayRelatedAppsAddInputSLZ
 
     @swagger_auto_schema(request_body=serializers.GatewayRelatedAppsAddInputSLZ, tags=["OpenAPI.Gateway"])
diff --git a/src/dashboard/apigateway/apigateway/apis/open/permission/serializers.py b/src/dashboard/apigateway/apigateway/apis/open/permission/serializers.py
index 59bef88f1..aa2cb75a3 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/permission/serializers.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/permission/serializers.py
@@ -126,42 +126,6 @@ def validate(self, data):
         return data
 
 
-class GatewayResourceIDs(serializers.Serializer):
-    gateway_id = serializers.IntegerField(
-        help_text="gateway_id",
-        required=True,
-    )
-    resource_ids = serializers.ListField(
-        help_text="如果不传则为网关维度申请",
-        child=serializers.IntegerField(),
-        allow_empty=True,
-        required=False,
-        max_length=100,
-    )
-
-
-class PaaSAppPermissionApplyV2InputSLZ(serializers.Serializer):
-    """
-    PaaS中应用申请访问网关API的权限
-    - 提供给 paas 开发者中心的接口
-    - 应用页面申请授权,支持网关+resource维度
-    """
-
-    target_app_code = serializers.CharField(label="", validators=[BKAppCodeValidator()])
-    gateway_resource_ids = serializers.ListField(
-        help_text="申请资源id列表(资源+网关)",
-        child=GatewayResourceIDs(),
-        allow_empty=False,
-        required=True,
-        max_length=100,
-    )
-    reason = serializers.CharField(allow_blank=True, required=False, default="")
-    expire_days = serializers.ChoiceField(
-        choices=PermissionApplyExpireDaysEnum.get_choices(),
-        default=PermissionApplyExpireDaysEnum.SIX_MONTH.value,
-    )
-
-
 class AppPermissionApplyV1InputSLZ(serializers.Serializer):
     """
     普通应用直接申请访问网关API的权限
diff --git a/src/dashboard/apigateway/apigateway/apis/open/permission/urls.py b/src/dashboard/apigateway/apigateway/apis/open/permission/urls.py
index bd61d7d8b..190f5ceca 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/permission/urls.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/permission/urls.py
@@ -64,11 +64,6 @@
         views.AppPermissionRenewAPIView.as_view(),
         name="openapi.permission.renew",
     ),
-    path(
-        "apis/permissions/apply/",
-        views.AppPermissionApplyAPIView.as_view(),
-        name="openapi.permission.renew",
-    ),
     path(
         "apis/permissions/app-permissions/",
         views.AppPermissionViewSet.as_view({"get": "list"}),
diff --git a/src/dashboard/apigateway/apigateway/apis/open/permission/views.py b/src/dashboard/apigateway/apigateway/apis/open/permission/views.py
index db0467c6b..24dcaaf37 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/permission/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/permission/views.py
@@ -22,7 +22,6 @@
 
 from blue_krill.async_utils.django_utils import apply_async_on_commit
 from django.db import transaction
-from django.utils.decorators import method_decorator
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import status, viewsets
 from rest_framework.views import APIView
@@ -31,12 +30,6 @@
     AppPermissionBuilder,
     ResourcePermissionBuilder,
 )
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayIdPermission,
-    OpenAPIGatewayNamePermission,
-    OpenAPIGatewayRelatedAppPermission,
-    OpenAPIPermission,
-)
 from apigateway.apps.permission.constants import (
     GrantDimensionEnum,
     GrantTypeEnum,
@@ -52,11 +45,11 @@
 from apigateway.biz.resource import ResourceHandler
 from apigateway.biz.resource_version import ResourceVersionHandler
 from apigateway.common.error_codes import error_codes
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.core.models import Gateway, Resource
 from apigateway.utils.responses import V1OKJsonResponse
 
 from . import serializers
-from .serializers import PaaSAppPermissionApplyV2InputSLZ
 
 logger = logging.getLogger(__name__)
 
@@ -72,10 +65,11 @@ def get_permission_model(dimension: str):
 
 
 class ResourceViewSet(viewsets.ViewSet):
-    permission_classes = [OpenAPIGatewayIdPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
 
     @swagger_auto_schema(
-        query_serializer=serializers.AppResourcePermissionInputSLZ(),
+        query_serializer=serializers.AppResourcePermissionInputSLZ,
         responses={status.HTTP_200_OK: serializers.AppResourcePermissionOutputSLZ(many=True)},
         tags=["OpenAPI.Permission"],
     )
@@ -104,7 +98,8 @@ def list(self, request, *args, **kwargs):
 
 
 class AppGatewayPermissionViewSet(viewsets.GenericViewSet):
-    permission_classes = [OpenAPIGatewayIdPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
     serializer_class = serializers.AppGatewayPermissionInputSLZ
 
     def allow_apply_by_gateway(self, request, *args, **kwargs):
@@ -174,7 +169,8 @@ class PaaSAppPermissionApplyAPIView(BaseAppPermissionApplyAPIView):
     - 提供给 paas3 开发者中心的接口
     """
 
-    permission_classes = [OpenAPIGatewayIdPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
 
     def get_serializer_class(self):
         return serializers.PaaSAppPermissionApplyInputSLZ
@@ -189,7 +185,8 @@ class AppPermissionApplyV1APIView(BaseAppPermissionApplyAPIView):
     """
 
     # 使用 GatewayRelatedAppPermission 中设置 request.gateway 的功能，而不需要校验权限
-    permission_classes = [OpenAPIGatewayNamePermission]
+    permission_classes = [GatewayRelatedAppPermission]
+    gateway_permission_exempt = True
 
     def get_serializer_class(self):
         return serializers.AppPermissionApplyV1InputSLZ
@@ -198,7 +195,7 @@ def get_serializer_class(self):
 class AppPermissionGrantViewSet(viewsets.ViewSet):
     """网关关联应用，主动为应用授权访问网关 API 的权限"""
 
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     def grant(self, request, *args, **kwargs):
         slz = serializers.GrantAppPermissionInputSLZ(data=request.data)
@@ -227,7 +224,7 @@ def grant(self, request, *args, **kwargs):
 class RevokeAppPermissionViewSet(viewsets.ViewSet):
     """网关关联应用，回收应用访问网关 API 的权限"""
 
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     def revoke(self, request, *args, **kwargs):
         slz = serializers.RevokeAppPermissionInputSLZ(data=request.data)
@@ -249,7 +246,8 @@ class AppPermissionRenewAPIView(APIView):
     权限续期
     """
 
-    permission_classes = [OpenAPIPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
 
     def post(self, request, *args, **kwargs):
         slz = serializers.AppPermissionRenewInputSLZ(
@@ -270,6 +268,7 @@ def post(self, request, *args, **kwargs):
                 bk_app_code=data["target_app_code"],
                 resource_ids=resource_ids,
             )
+
             AppResourcePermission.objects.renew_by_resource_ids(
                 gateway=gateway,
                 bk_app_code=data["target_app_code"],
@@ -281,69 +280,8 @@ def post(self, request, *args, **kwargs):
         return V1OKJsonResponse("OK")
 
 
-@method_decorator(
-    name="post",
-    decorator=swagger_auto_schema(
-        request_body=PaaSAppPermissionApplyV2InputSLZ,
-        tags=["OpenAPI.Permission"],
-    ),
-)
-class AppPermissionApplyAPIView(APIView):
-    """
-    权限批量申请(网关+resource)
-    """
-
-    permission_classes = [OpenAPIPermission]
-
-    @transaction.atomic
-    def post(self, request, *args, **kwargs):
-        slz = serializers.PaaSAppPermissionApplyV2InputSLZ(
-            data=request.data,
-            context={
-                "request": request,
-            },
-        )
-        slz.is_valid(raise_exception=True)
-
-        data = slz.validated_data
-
-        record_ids = []
-        for gateway_resources in data.get("gateway_resource_ids"):
-            gateway = Gateway.objects.get(id=gateway_resources["gateway_id"])
-            resource_ids = gateway_resources.get("resource_ids") or []
-            if resource_ids:
-                # 如果传了resource_ids就是按照资源维度申请
-                manager = PermissionDimensionManager.get_manager(GrantDimensionEnum.RESOURCE.value)
-                grant_dimension = str(GrantDimensionEnum.RESOURCE.value)
-            else:
-                manager = PermissionDimensionManager.get_manager(GrantDimensionEnum.API.value)
-                grant_dimension = str(GrantDimensionEnum.API.value)
-
-            record = manager.create_apply_record(
-                data["target_app_code"],
-                gateway,
-                resource_ids,
-                grant_dimension,
-                data["reason"],
-                data.get("expire_days", PermissionApplyExpireDaysEnum.FOREVER.value),
-                request.user.username,
-            )
-            record_ids.append(record.id)
-        try:
-            apply_async_on_commit(send_mail_for_perm_apply, args=record_ids)
-        except Exception:
-            logger.exception("send mail to gateway manager fail. apply_record_ids=%s", record_ids)
-
-        return V1OKJsonResponse(
-            "OK",
-            data={
-                "record_ids": record_ids,
-            },
-        )
-
-
 class AppPermissionViewSet(viewsets.ViewSet):
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
 
     def list(self, request, *args, **kwargs):
         """已申请权限列表"""
@@ -358,7 +296,7 @@ def list(self, request, *args, **kwargs):
 
 
 class AppPermissionRecordViewSet(viewsets.GenericViewSet):
-    permission_classes = [OpenAPIPermission]
+    request_from_gateway_required = True
     serializer_class = serializers.AppPermissionRecordInputSLZ
 
     def list(self, request, *args, **kwargs):
diff --git a/src/dashboard/apigateway/apigateway/apis/open/permissions.py b/src/dashboard/apigateway/apigateway/apis/open/permissions.py
deleted file mode 100644
index 773241b44..000000000
--- a/src/dashboard/apigateway/apigateway/apis/open/permissions.py
+++ /dev/null
@@ -1,152 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# TencentBlueKing is pleased to support the open source community by making
-# 蓝鲸智云 - API 网关 (BlueKing - APIGateway) available.
-# Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
-# Licensed under the MIT License (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-#     http://opensource.org/licenses/MIT
-#
-# Unless required by applicable law or agreed to in writing, software distributed under
-# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# We undertake not to change the open source license (MIT license) applicable
-# to the current version of the project delivered to anyone in the future.
-#
-
-from django.http import Http404
-from django.shortcuts import get_object_or_404
-from django.utils.translation import gettext_lazy
-from rest_framework import permissions
-
-from apigateway.core.models import Gateway, GatewayRelatedApp
-from apigateway.utils.django import get_object_or_None
-
-
-class OpenAPIPermission(permissions.BasePermission):
-    """仅验证来自于网关的请求
-    适用：申请网关接口权限后，就能访问的接口，路径参数中没有 gateway_id or gateway_name
-    """
-
-    message = gettext_lazy("只能通过网关访问该接口")
-
-    def has_permission(self, request, view):
-        # openapi 的请求来源必须是网关，此时经过网关的中间件（所有都开启了应用认证）, 请求中会注入 app 对象
-        if not hasattr(request, "app"):
-            return False
-
-        return True
-
-
-class OpenAPIGatewayIdPermission(permissions.BasePermission):
-    """验证来自于网关的请求，并且路径参数中有 gateway_id, 且这个 gateway_id 对应网关存在
-    适用：申请网关接口权限后 + 路径参数中 gateway_id 的接口
-    """
-
-    message = gettext_lazy("只能通过网关访问该接口，并且 gateway_id 对应网关必须存在")
-
-    def has_permission(self, request, view):
-        # openapi 的请求来源必须是网关，此时经过网关的中间件（所有都开启了应用认证）, 请求中会注入 app 对象
-        if not hasattr(request, "app"):
-            return False
-
-        # 路径参数 gateway_id 必须存在
-        gateway_obj = self.get_gateway_object(view)
-
-        if not gateway_obj:
-            raise Http404
-        request.gateway = gateway_obj
-
-        return True
-
-    def get_gateway_object(self, view):
-        """
-        根据路径参数 gateway_id 获取网关对象
-        如果 gateway_id 不在路径参数中，则返回 None，忽略此权限验证
-        否则，返回 api 对象或抛出异常
-        """
-        lookup_url_kwarg = "gateway_id"
-
-        if lookup_url_kwarg not in view.kwargs:
-            return None
-
-        filter_kwargs = {"id": view.kwargs[lookup_url_kwarg]}
-        return get_object_or_404(Gateway, **filter_kwargs)
-
-
-class OpenAPIGatewayNamePermission(permissions.BasePermission):
-    """验证来自于网关的请求，并且路径参数中有 gateway_name, 且这个 gateway_name 对应网关存在
-    适用：申请网关接口权限后 + 路径参数中 gateway_name 的接口
-    """
-
-    message = gettext_lazy("只能通过网关访问该接口，并且 gateway_name 对应网关必须存在")
-
-    def has_permission(self, request, view):
-        # openapi 的请求来源必须是网关，此时经过网关的中间件（所有都开启了应用认证）, 请求中会注入 app 对象
-        if not hasattr(request, "app"):
-            return False
-
-        # 路径参数 gateway_id 必须存在
-        gateway_obj = self.get_gateway_object(view)
-
-        if not gateway_obj:
-            raise Http404
-        request.gateway = gateway_obj
-
-        return True
-
-    def get_gateway_object(self, view):
-        """
-        根据路径参数 gateway_name 获取网关对象
-        若 gateway_name 不在路径参数中，或网关不存在，返回 None
-        """
-        lookup_url_kwarg = "gateway_name"
-
-        if lookup_url_kwarg not in view.kwargs:
-            return None
-
-        filter_kwargs = {"name": view.kwargs[lookup_url_kwarg]}
-        return get_object_or_None(Gateway, **filter_kwargs)
-
-
-class OpenAPIGatewayRelatedAppPermission(permissions.BasePermission):
-    """验证来自于网关的请求 + 路径参数中有 gateway_name, 且这个 gateway_name 对应网关存在 + 这个应用有操作这个网关的权限 (GatewayRelatedApp)
-    适用：SDK 使用的 API，某个应用通过网关的接口对网关进行变更
-    """
-
-    message = gettext_lazy("应用无操作网关权限")
-
-    def has_permission(self, request, view):
-        # openapi 的请求来源必须是网关，此时经过网关的中间件（所有都开启了应用认证）, 请求中会注入 app 对象
-        if not hasattr(request, "app"):
-            return False
-
-        gateway_obj = self.get_gateway_object(view)
-
-        # NOTE: only for GatewaySyncApi /<slug:gateway_name>/sync/, at that time, the gateway_obj is None
-        # DO NOT USE IN OTHER PLACE
-        if not gateway_obj and getattr(view, "allow_gateway_not_exist", False):
-            return True
-
-        if not gateway_obj:
-            raise Http404
-
-        request.gateway = gateway_obj
-
-        return GatewayRelatedApp.objects.filter(gateway=request.gateway, bk_app_code=request.app.app_code).exists()
-
-    def get_gateway_object(self, view):
-        """
-        根据路径参数 gateway_name 获取网关对象
-        若 gateway_name 不在路径参数中，或网关不存在，返回 None
-        """
-        lookup_url_kwarg = "gateway_name"
-
-        if lookup_url_kwarg not in view.kwargs:
-            return None
-
-        filter_kwargs = {"name": view.kwargs[lookup_url_kwarg]}
-        return get_object_or_None(Gateway, **filter_kwargs)
diff --git a/src/dashboard/apigateway/apigateway/apis/open/released/serializers.py b/src/dashboard/apigateway/apigateway/apis/open/released/serializers.py
index 3ec3a3b1d..33a9fabd5 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/released/serializers.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/released/serializers.py
@@ -58,7 +58,6 @@ class ReleasedResourceListV1InputSLZ(ResourceV1SLZ):
     url = serializers.SerializerMethodField()
     description = SerializerTranslatedField(translated_fields={"en": "description_en"})
     match_subpath = serializers.BooleanField()
-    enable_websocket = serializers.BooleanField()
     path = None
 
     def get_url(self, obj):
diff --git a/src/dashboard/apigateway/apigateway/apis/open/released/views.py b/src/dashboard/apigateway/apigateway/apis/open/released/views.py
index 8b5a0fada..3512ee548 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/released/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/released/views.py
@@ -23,14 +23,11 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import generics, status
 
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayIdPermission,
-    OpenAPIGatewayNamePermission,
-)
 from apigateway.apis.open.released import serializers
 from apigateway.biz.resource_label import ResourceLabelHandler
 from apigateway.biz.resource_url import ResourceURLHandler
 from apigateway.biz.resource_version import ResourceVersionHandler
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.core.models import Release, ReleasedResource
 from apigateway.utils.paginator import LimitOffsetPaginator
 from apigateway.utils.responses import V1OKJsonResponse
@@ -44,7 +41,8 @@
     ),
 )
 class ReleasedResourceRetrieveApi(generics.RetrieveAPIView):
-    permission_classes = [OpenAPIGatewayIdPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
 
     serializer_class = serializers.ReleasedResourceOutputSLZ
     lookup_field = "id"
@@ -86,7 +84,8 @@ def retrieve(self, request, *args, **kwargs):
     ),
 )
 class ReleasedResourceListApi(generics.ListAPIView):
-    permission_classes = [OpenAPIGatewayIdPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
     lookup_field = "id"
 
     def get_queryset(self):
@@ -121,9 +120,12 @@ def list(self, request, stage_name: Optional[str] = None, *args, **kwargs):
     ),
 )
 class ReleasedResourceListByGatewayNameApi(generics.ListAPIView):
-    permission_classes = [OpenAPIGatewayNamePermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
     lookup_field = "id"
 
+    permission_classes = [GatewayRelatedAppPermission]
+
     def get_queryset(self):
         return ReleasedResource.objects.filter(gateway=self.request.gateway)
 
diff --git a/src/dashboard/apigateway/apigateway/apis/open/resource/views.py b/src/dashboard/apigateway/apigateway/apis/open/resource/views.py
index b8a24c9f1..65af2c5eb 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/resource/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/resource/views.py
@@ -23,11 +23,9 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import generics, serializers, status
 
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayRelatedAppPermission,
-)
 from apigateway.biz.resource.importer import ResourcesImporter
 from apigateway.biz.resource.importer.openapi import OpenAPIImportManager
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.core.models import Resource
 from apigateway.utils.responses import V1OKJsonResponse
 
@@ -35,7 +33,7 @@
 
 
 class ResourceSyncApi(generics.CreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     def get_queryset(self):
         return Resource.objects.filter(gateway=self.request.gateway)
diff --git a/src/dashboard/apigateway/apigateway/apis/open/resource_doc/views.py b/src/dashboard/apigateway/apigateway/apis/open/resource_doc/views.py
index ecfb64d63..659d596f9 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/resource_doc/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/resource_doc/views.py
@@ -22,15 +22,13 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import generics, status
 
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayRelatedAppPermission,
-)
 from apigateway.apps.support.constants import DocLanguageEnum
 from apigateway.biz.resource_doc.exceptions import NoResourceDocError, ResourceDocJinja2TemplateError
 from apigateway.biz.resource_doc.importer import DocImporter
 from apigateway.biz.resource_doc.importer.parsers import ArchiveParser, OpenAPIParser
 from apigateway.common.error_codes import error_codes
 from apigateway.common.exceptions import SchemaValidationError
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.utils.responses import V1OKJsonResponse
 
 from .serializers import (
@@ -40,7 +38,7 @@
 
 
 class DocImportByArchiveApi(generics.CreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     @swagger_auto_schema(
         request_body=DocImportByArchiveV1InputSLZ,
@@ -70,7 +68,7 @@ def post(self, request, *args, **kwargs):
 
 
 class DocImportBySwaggerApi(generics.CreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     @swagger_auto_schema(
         request_body=DocImportBySwaggerV1InputSLZ,
diff --git a/src/dashboard/apigateway/apigateway/apis/open/resource_version/views.py b/src/dashboard/apigateway/apigateway/apis/open/resource_version/views.py
index 3f2926350..54c4c7720 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/resource_version/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/resource_version/views.py
@@ -22,12 +22,10 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import generics, status
 
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayRelatedAppPermission,
-)
 from apigateway.apps.support.models import ResourceDoc, ResourceDocVersion
 from apigateway.biz.releaser import ReleaseError, release
 from apigateway.biz.resource_version import ResourceVersionHandler
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.core.models import ResourceVersion, Stage
 from apigateway.utils.exception import LockTimeout
 from apigateway.utils.redis_utils import Lock
@@ -56,7 +54,7 @@
     ),
 )
 class ResourceVersionListCreateApi(generics.ListCreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
     serializer_class = ResourceVersionCreateV1InputSLZ
 
     def list(self, request, *args, **kwargs):
@@ -98,7 +96,7 @@ def create(self, request, gateway_name: str, *args, **kwargs):
 
 
 class ResourceVersionReleaseApi(generics.CreateAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
     serializer_class = ReleaseV1InputSLZ
 
     @swagger_auto_schema(tags=["OpenAPI.ResourceVersion"])
@@ -144,7 +142,7 @@ def post(self, request, gateway_name: str, *args, **kwargs):
 
 
 class ResourceVersionGetLatestApi(generics.RetrieveAPIView):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     @swagger_auto_schema(tags=["OpenAPI.ResourceVersion"])
     def get(self, request, gateway_name: str, *args, **kwargs):
diff --git a/src/dashboard/apigateway/apigateway/apis/open/stage/urls.py b/src/dashboard/apigateway/apigateway/apis/open/stage/urls.py
index 694563109..2ef3bf31a 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/stage/urls.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/stage/urls.py
@@ -24,7 +24,7 @@
     path("apis/<int:gateway_id>/stages/", views.StageViewSet.as_view({"get": "list"}), name="openapi.stage.list"),
     path(
         "apis/<slug:gateway_name>/stages/",
-        views.StageListViewSet.as_view({"get": "list"}),
+        views.StageViewSet.as_view({"get": "list_by_gateway_name"}),
         name="openapi.stage.list_by_gateway_name",
     ),
     path(
diff --git a/src/dashboard/apigateway/apigateway/apis/open/stage/views.py b/src/dashboard/apigateway/apigateway/apis/open/stage/views.py
index 845982b69..6035ba079 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/stage/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/stage/views.py
@@ -21,16 +21,12 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import status, viewsets
 
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayIdPermission,
-    OpenAPIGatewayNamePermission,
-    OpenAPIGatewayRelatedAppPermission,
-)
 from apigateway.apis.open.stage import serializers
 from apigateway.apis.open.stage.serializers import StageSLZ
 from apigateway.apps.audit.constants import OpTypeEnum
 from apigateway.biz.audit import Auditor
 from apigateway.biz.released_resource import ReleasedResourceHandler
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.core.constants import StageStatusEnum
 from apigateway.core.models import Stage
 from apigateway.utils.django import get_model_dict, get_object_or_None
@@ -38,10 +34,11 @@
 
 
 class StageViewSet(viewsets.ModelViewSet):
-    permission_classes = [OpenAPIGatewayIdPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
 
     serializer_class = serializers.StageV1SLZ
-    # lookup_field = "id"
+    lookup_field = "id"
 
     def get_queryset(self):
         return Stage.objects.filter(gateway=self.request.gateway)
@@ -63,36 +60,23 @@ def list(self, request, *args, **kwargs):
         slz = self.get_serializer(queryset, many=True)
         return V1OKJsonResponse("OK", data=slz.data)
 
-
-class StageListViewSet(viewsets.ModelViewSet):
-    permission_classes = [OpenAPIGatewayNamePermission]
-
-    serializer_class = serializers.StageV1SLZ
-    # lookup_field = "id"
-
-    def get_queryset(self):
-        return Stage.objects.filter(gateway=self.request.gateway)
-
     @swagger_auto_schema(
         responses={status.HTTP_200_OK: serializers.StageV1SLZ(many=True)},
         tags=["OpenAPI.Stage"],
     )
-    def list(self, request, gateway_name: str, *args, **kwargs):
-        if not request.gateway.is_active_and_public:
-            raise Http404
+    def list_by_gateway_name(self, request, gateway_name: str, *args, **kwargs):
+        return self.list(request, *args, **kwargs)
 
-        queryset = self.get_queryset()
-        queryset = queryset.filter(
-            status=StageStatusEnum.ACTIVE.value,
-            is_public=True,
-        )
+    def get_permissions(self):
+        if self.action == "list_by_gateway_name":
+            permission_classes = [GatewayRelatedAppPermission]
+            return [permission() for permission in permission_classes]
 
-        slz = self.get_serializer(queryset, many=True)
-        return V1OKJsonResponse("OK", data=slz.data)
+        return super().get_permissions()
 
 
 class StageV1ViewSet(viewsets.ViewSet):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     @swagger_auto_schema(
         responses={status.HTTP_200_OK: serializers.StageWithResourceVersionV1SLZ(many=True)},
@@ -109,7 +93,7 @@ def list_stages_with_resource_version(self, request, gateway_name: str, *args, *
 
 
 class StageSyncViewSet(viewsets.ViewSet):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     @swagger_auto_schema(request_body=StageSLZ, tags=["OpenAPI.Stage"])
     def sync(self, request, gateway_name: str, *args, **kwargs):
diff --git a/src/dashboard/apigateway/apigateway/apis/open/support/views.py b/src/dashboard/apigateway/apigateway/apis/open/support/views.py
index 3ef8ee505..d95fe0639 100644
--- a/src/dashboard/apigateway/apigateway/apis/open/support/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/open/support/views.py
@@ -24,10 +24,6 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import viewsets
 
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayRelatedAppPermission,
-    OpenAPIPermission,
-)
 from apigateway.apis.open.support import serializers
 from apigateway.apps.support.api_sdk import exceptions
 from apigateway.apps.support.api_sdk.helper import SDKHelper
@@ -35,6 +31,7 @@
 from apigateway.apps.support.models import GatewaySDK
 from apigateway.common.contexts import GatewayAuthContext
 from apigateway.common.error_codes import error_codes
+from apigateway.common.permissions import GatewayRelatedAppPermission
 from apigateway.core.models import Gateway, Release, ResourceVersion
 from apigateway.utils.responses import V1OKJsonResponse
 
@@ -42,7 +39,8 @@
 
 
 class APISDKV1ViewSet(viewsets.ModelViewSet):
-    permission_classes = [OpenAPIPermission]
+    gateway_permission_exempt = True
+    request_from_gateway_required = True
     serializer_class = serializers.APISDKV1SLZ
     lookup_field = "id"
 
@@ -78,7 +76,7 @@ def list_latest_sdks(self, request, *args, **kwargs):
 
 
 class SDKGenerateViewSet(viewsets.ViewSet):
-    permission_classes = [OpenAPIGatewayRelatedAppPermission]
+    permission_classes = [GatewayRelatedAppPermission]
 
     @transaction.atomic
     @swagger_auto_schema(
diff --git a/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/serializers.py b/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/serializers.py
index 0207a966b..1196d7211 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/serializers.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/serializers.py
@@ -37,21 +37,8 @@ class GatewayOutputSLZ(serializers.Serializer):
     is_official = serializers.SerializerMethodField(help_text="是否为官方网关, true: 是, false: 否")
     api_url = serializers.SerializerMethodField(help_text="网关访问地址")
 
-    class Meta:
-        ref_name = "apigateway.apis.web.docs.gateway.gateway.serializers.GatewayOutputSLZ"
-
     def get_api_url(self, obj):
         return GatewayHandler.get_api_domain(obj)
 
     def get_is_official(self, obj):
         return GatewayTypeHandler.is_official(self.context["gateway_auth_configs"][obj.id].gateway_type)
-
-
-class GatewayListOutputSLZ(GatewayOutputSLZ):
-    sdks = serializers.SerializerMethodField(help_text="SDK")
-
-    class Meta:
-        ref_name = "apigateway.apis.web.docs.gateway.gateway.serializers.GatewayListOutputSLZ"
-
-    def get_sdks(self, obj):
-        return self.context["gateway_sdks"].get(obj.id, [])
diff --git a/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/views.py b/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/views.py
index aaa977dd2..7893933cc 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/gateway/views.py
@@ -22,14 +22,13 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import generics, status
 
-from apigateway.biz.sdk.gateway_sdk import GatewaySDKHandler
 from apigateway.common.contexts import GatewayAuthContext
 from apigateway.common.permissions import GatewayDisplayablePermission
 from apigateway.core.constants import GatewayStatusEnum
 from apigateway.core.models import Gateway, Release
 from apigateway.utils.responses import OKJsonResponse
 
-from .serializers import GatewayListOutputSLZ, GatewayOutputSLZ, GatewayQueryInputSLZ
+from .serializers import GatewayOutputSLZ, GatewayQueryInputSLZ
 
 
 @method_decorator(
@@ -37,7 +36,7 @@
     decorator=swagger_auto_schema(
         operation_description="获取网关列表，仅显示公开的、已发布的网关",
         query_serializer=GatewayQueryInputSLZ,
-        responses={status.HTTP_200_OK: GatewayListOutputSLZ(many=True)},
+        responses={status.HTTP_200_OK: GatewayOutputSLZ(many=True)},
         tags=["WebAPI.Docs.Gateway"],
     ),
 )
@@ -63,17 +62,15 @@ def list(self, request, *args, **kwargs):
 
         gateway_ids = [gateway.id for gateway in gateways]
 
-        output_slz = GatewayListOutputSLZ(
+        output_slz = GatewayOutputSLZ(
             gateways,
             many=True,
             context={
                 "gateway_auth_configs": GatewayAuthContext().get_gateway_id_to_auth_config(gateway_ids),
-                "gateway_sdks": GatewaySDKHandler.get_sdks(gateway_ids),
             },
         )
 
-        # NOTE: 需将官方 SDK 放在前面，但官方标记 is_official 不在 Gateway 表中，因此需要获取数据后，再排序分页
-        # FIXME: 性能问题？
+        # 需将官方 SDK 放在前面，但官方标记 is_official 不在 Gateway 表中，因此需要获取数据后，再排序分页
         page = self.paginate_queryset(sorted(output_slz.data, key=lambda x: (-x["is_official"], x["name"])))
         return self.get_paginated_response(page)
 
diff --git a/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/resource/views.py b/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/resource/views.py
index 7e82ade2a..fb5cd55b2 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/resource/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/docs/gateway/resource/views.py
@@ -48,12 +48,12 @@ def list(self, request, gateway_name: str, *args, **kwargs):
         resources = ReleasedResourceHandler.get_public_released_resource_data_list(
             request.gateway.id, slz.validated_data["stage_name"]
         )
-        label_ids = list({label_id for resource in resources for label_id in resource.gateway_labels})
+        resource_ids = [resource.id for resource in resources]
         output_slz = ResourceOutputSLZ(
             resources,
             many=True,
             context={
-                "labels": ResourceLabelHandler.get_labels_by_ids(label_ids),
+                "labels": ResourceLabelHandler.get_labels(resource_ids),
             },
         )
         return OKJsonResponse(data=output_slz.data)
diff --git a/src/dashboard/apigateway/apigateway/apis/web/docs/urls.py b/src/dashboard/apigateway/apigateway/apis/web/docs/urls.py
index 20e1e9473..1fa7a6ee7 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/docs/urls.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/docs/urls.py
@@ -19,7 +19,6 @@
 
 urlpatterns = [
     # 所有网关 sdk
-    # FIXME: remove this in 1.15
     path("sdks/", include("apigateway.apis.web.docs.gateway.sdk.urls")),
     # 网关
     path("gateways/", include("apigateway.apis.web.docs.gateway.gateway.urls")),
diff --git a/src/dashboard/apigateway/apigateway/apis/web/metrics/serializers.py b/src/dashboard/apigateway/apigateway/apis/web/metrics/serializers.py
index f9866a522..49c08cbda 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/metrics/serializers.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/metrics/serializers.py
@@ -19,12 +19,15 @@
 from django.utils.translation import gettext as _
 from rest_framework import serializers
 
-from apigateway.apps.metrics.constants import MetricsEnum
+from apigateway.apps.metrics.constants import DimensionEnum, MetricsEnum
 
 
 class MetricsQueryInputSLZ(serializers.Serializer):
     stage_id = serializers.IntegerField(required=True, help_text="环境 id")
     resource_id = serializers.IntegerField(allow_null=True, required=False, help_text="资源 id")
+    dimension = serializers.ChoiceField(
+        choices=DimensionEnum.get_choices(), help_text="维度：app, resource, all, resource_non200_status"
+    )
     metrics = serializers.ChoiceField(choices=MetricsEnum.get_choices(), help_text="metric 类型")
     time_range = serializers.IntegerField(required=False, min_value=0, help_text="时间范围")
     time_start = serializers.IntegerField(required=False, min_value=0, help_text="开始时间")
diff --git a/src/dashboard/apigateway/apigateway/apis/web/metrics/views.py b/src/dashboard/apigateway/apigateway/apis/web/metrics/views.py
index 1ae232226..220769a2a 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/metrics/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/metrics/views.py
@@ -22,8 +22,8 @@
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import generics, status
 
-from apigateway.apps.metrics.constants import MetricsEnum
-from apigateway.apps.metrics.prometheus.dimension import MetricsFactory
+from apigateway.apps.metrics.constants import DimensionEnum, MetricsEnum
+from apigateway.apps.metrics.prometheus.dimension import DimensionMetricsFactory
 from apigateway.core.models import Resource, Stage
 from apigateway.utils.responses import OKJsonResponse
 from apigateway.utils.time import SmartTimeRange
@@ -86,6 +86,7 @@ def get(self, request, *args, **kwargs):
         slz.is_valid(raise_exception=True)
 
         data = slz.validated_data
+
         stage_name = Stage.objects.get_name(request.gateway.id, data["stage_id"])
         if not stage_name:
             raise Http404
@@ -106,16 +107,16 @@ def get(self, request, *args, **kwargs):
         time_start, time_end = smart_time_range.get_head_and_tail()
         step = smart_time_range.get_recommended_step()
 
-        metrics = MetricsFactory.create_metrics(MetricsEnum(data["metrics"]))
-
+        metrics = DimensionMetricsFactory.create_dimension_metrics(
+            DimensionEnum(data["dimension"]), MetricsEnum(data["metrics"])
+        )
         data = metrics.query_range(
             gateway_name=request.gateway.name,
-            stage_id=data.get("stage_id", 0),
             stage_name=stage_name,
-            resource_id=data.get("resource_id", 0),
             resource_name=resource_name,
             start=time_start,
             end=time_end,
             step=step,
         )
+
         return OKJsonResponse(data=data)
diff --git a/src/dashboard/apigateway/apigateway/apis/web/permission/serializers.py b/src/dashboard/apigateway/apigateway/apis/web/permission/serializers.py
index 4320091c1..117a11684 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/permission/serializers.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/permission/serializers.py
@@ -32,23 +32,7 @@
 from apigateway.utils.time import NeverExpiresTime, to_datetime_from_now
 
 
-class AppPermissionQueryInputSLZ(serializers.Serializer):
-    bk_app_code = serializers.CharField(help_text="应用ID", required=False)
-    keyword = serializers.CharField(help_text="查询关键字", required=False)
-    grant_type = serializers.ChoiceField(choices=GrantTypeEnum.get_choices(), required=False)
-    resource_id = serializers.IntegerField(help_text="资源id", required=False)
-    order_by = serializers.ChoiceField(
-        help_text="排序",
-        choices=[(field, field) for field in ["bk_app_code", "-bk_app_code", "expires", "-expires"]],
-        required=False,
-    )
-    grant_dimension = serializers.ChoiceField(
-        help_text="授权维度", choices=GrantDimensionEnum.get_choices(), required=False
-    )
-    applied_by = serializers.CharField(help_text="申请人", required=False)
-
-
-class AppPermissionOutputSLZ(serializers.Serializer):
+class AppGatewayPermissionOutputSLZ(serializers.Serializer):
     id = serializers.IntegerField(read_only=True)
     bk_app_code = serializers.CharField(max_length=32, required=True, help_text="应用编码")
     resource_id = serializers.SerializerMethodField(help_text="资源ID")
@@ -56,64 +40,43 @@ class AppPermissionOutputSLZ(serializers.Serializer):
     resource_path = serializers.SerializerMethodField(help_text="资源路径")
     resource_method = serializers.SerializerMethodField(help_text="资源方法")
     expires = serializers.SerializerMethodField(help_text="过期时间")
-    grant_dimension = serializers.ChoiceField(help_text="授权维度", choices=GrantDimensionEnum.get_choices())
     grant_type = serializers.ChoiceField(
         choices=GrantTypeEnum.get_choices(), default=GrantTypeEnum.INITIALIZE.value, help_text="授权类型"
     )
     renewable = serializers.SerializerMethodField(help_text="是否可续期")
 
     class Meta:
-        ref_name = "apigateway.apis.web.permission.serializers.AppPermissionOutputSLZ"
+        ref_name = "apigateway.apis.web.permission.serializers.AppGatewayPermissionOutputSLZ"
 
     def get_resource_id(self, obj):
-        resource = self.context.get("resource_map", {}).get(obj.get("resource_id", 0))
-        return resource.id if resource else 0
+        return 0
 
     def get_resource_name(self, obj):
-        resource = self.context.get("resource_map", {}).get(obj.get("resource_id", 0))
-        return resource.name if resource else ""
+        return ""
 
     def get_resource_path(self, obj):
-        resource = self.context.get("resource_map", {}).get(obj.get("resource_id", 0))
-        return resource.path_display if resource else ""
+        return ""
 
     def get_resource_method(self, obj):
-        resource = self.context.get("resource_map", {}).get(obj.get("resource_id", 0))
-        return resource.method if resource else ""
+        return ""
 
     def get_expires(self, obj):
-        expires = (
-            None
-            if (not obj.get("expires") or NeverExpiresTime.is_never_expired(obj.get("expires")))
-            else obj.get("expires")
-        )
+        expires = None if (not obj.expires or NeverExpiresTime.is_never_expired(obj.expires)) else obj.expires
         return serializers.DateTimeField(allow_null=True, required=False).to_representation(expires)
 
     def get_renewable(self, obj):
-        return bool(obj.get("expires") and obj.get("expires") < to_datetime_from_now(days=RENEWABLE_EXPIRE_DAYS))
+        return bool(obj.expires and obj.expires < to_datetime_from_now(days=RENEWABLE_EXPIRE_DAYS))
 
 
-class AppPermissionRenewInputSLZ(serializers.Serializer):
-    gateway_dimension_ids = serializers.ListField(
-        help_text="网关维度权限id列表", child=serializers.IntegerField(), allow_empty=True, required=False
-    )
-    resource_dimension_ids = serializers.ListField(
-        help_text="资源维度权限id列表", child=serializers.IntegerField(), allow_empty=True, required=False
-    )
-    expire_days = serializers.ChoiceField(
-        help_text="有效期",
-        choices=PermissionApplyExpireDaysEnum.get_choices(),
-        required=True,
+class AppGatewayPermissionExportOutputSLZ(AppGatewayPermissionOutputSLZ):
+    grant_type = serializers.CharField(
+        default=GrantTypeEnum.get_choice_label(GrantTypeEnum.INITIALIZE.value), help_text="授权类型"
     )
 
-    def validate(self, data):
-        gateway_dimension_ids = data.get("gateway_dimension_ids", [])
-        resource_dimension_ids = data.get("resource_dimension_ids", [])
-
-        if not gateway_dimension_ids and not resource_dimension_ids:
-            raise serializers.ValidationError("must select one permission")
-
-        return data
+    def get_expires(self, obj):
+        if NeverExpiresTime.is_never_expired(obj.expires):
+            return _("永久有效")
+        return super().get_expires(obj)
 
 
 class AppPermissionInputSLZ(serializers.Serializer):
@@ -149,51 +112,21 @@ class AppPermissionExportInputSLZ(serializers.Serializer):
             "值为 selected，支持 permission_ids 参数"
         ),
     )
-    gateway_permission_ids = serializers.ListField(
+    permission_ids = serializers.ListField(
         child=serializers.IntegerField(),
         allow_empty=True,
         required=False,
-        help_text='gateway维度:export_type 值为已选资源 "selected" 时，此项必填',
-    )
-    resource_permission_ids = serializers.ListField(
-        child=serializers.IntegerField(),
-        allow_empty=True,
-        required=False,
-        help_text='resource维度:export_type 值为已选资源 "selected" 时，此项必填',
+        help_text='export_type 值为已选资源 "selected" 时，此项必填',
     )
 
     def validate(self, data):
-        if data["export_type"] == ExportTypeEnum.SELECTED.value and (
-            not data.get("gateway_permission_ids") or not data.get("resource_permission_ids")
-        ):
+        if data["export_type"] == ExportTypeEnum.SELECTED.value and not data.get("permission_ids"):
             raise serializers.ValidationError(_("导出已选中权限时，已选中权限不能为空。"))
         return data
 
 
-class AppPermissionExportOutputSLZ(AppPermissionOutputSLZ):
-    grant_type = serializers.SerializerMethodField(help_text="过期时间")
-    grant_dimension = serializers.SerializerMethodField(help_text="过期时间")
-
-    def get_grant_type(self, obj):
-        return _(GrantTypeEnum.get_choice_label(obj.get("grant_type", GrantTypeEnum.INITIALIZE.value)))
-
-    def get_grant_dimension(self, obj):
-        return _(GrantDimensionEnum.get_choice_label(obj.get("grant_dimension")))
-
-    def get_expires(self, obj):
-        if NeverExpiresTime.is_never_expired(obj.get("expires")):
-            return _("永久有效")
-        return super().get_expires(obj)
-
-
 class AppPermissionIDsSLZ(serializers.Serializer):
     ids = serializers.ListField(child=serializers.IntegerField(), allow_empty=False, required=True)
-    expire_days = serializers.ChoiceField(
-        help_text="有效期",
-        choices=PermissionApplyExpireDaysEnum.get_choices(),
-        required=False,
-        default=PermissionApplyExpireDaysEnum.FOREVER.value,
-    )
 
 
 class AppPermissionApplyOutputSLZ(serializers.ModelSerializer):
@@ -227,6 +160,33 @@ def get_grant_dimension_display(self, obj):
         return GrantDimensionEnum.get_choice_label(obj.grant_dimension)
 
 
+class AppResourcePermissionOutputSLZ(AppGatewayPermissionOutputSLZ):
+    def get_resource_id(self, obj):
+        resource = self.context.get("resource_map", {}).get(obj.resource_id)
+        return resource.id if resource else 0
+
+    def get_resource_name(self, obj):
+        resource = self.context.get("resource_map", {}).get(obj.resource_id)
+        return resource.name if resource else ""
+
+    def get_resource_path(self, obj):
+        resource = self.context.get("resource_map", {}).get(obj.resource_id)
+        return resource.path_display if resource else ""
+
+    def get_resource_method(self, obj):
+        resource = self.context.get("resource_map", {}).get(obj.resource_id)
+        return resource.method if resource else ""
+
+
+class AppResourcePermissionExportOutputSLZ(AppResourcePermissionOutputSLZ):
+    grant_type = serializers.CharField(source="get_grant_type_display", help_text="授权类型")
+
+    def get_expires(self, obj):
+        if NeverExpiresTime.is_never_expired(obj.expires):
+            return _("永久有效")
+        return super().get_expires(obj)
+
+
 class AppPermissionRecordOutputSLZ(serializers.ModelSerializer):
     handled_resources = serializers.SerializerMethodField(help_text="已处理的资源列表")
     expire_days_display = serializers.SerializerMethodField(help_text="过期天数")
diff --git a/src/dashboard/apigateway/apigateway/apis/web/permission/urls.py b/src/dashboard/apigateway/apigateway/apis/web/permission/urls.py
index 744fd87fe..65b4972d1 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/permission/urls.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/permission/urls.py
@@ -21,46 +21,34 @@
 from . import views
 
 urlpatterns = [
-    # app-permission
-    path(
-        "app-permissions/",
-        include(
-            [
-                path("", views.AppPermissionListApi.as_view(), name="permissions.app-permissions.list"),
-                path(
-                    "renew/",
-                    views.AppPermissionRenewApi.as_view(),
-                    name="permissions.app-resource-permissions.renew",
-                ),
-                path(
-                    "export/",
-                    views.AppPermissionExportApi.as_view(),
-                    name="permissions.app-permissions.export",
-                ),
-                path(
-                    "bk-app-codes/",
-                    views.AppPermissionAppCodeListApi.as_view(),
-                    name="permissions.app-permissions.get_bk_app_codes",
-                ),
-            ]
-        ),
-    ),
     # app-resource-permission
     path(
         "app-resource-permissions/",
         include(
             [
-                path("", views.AppResourcePermissionCreateApi.as_view(), name="permissions.app-resource-permissions"),
+                path(
+                    "", views.AppResourcePermissionListCreateApi.as_view(), name="permissions.app-resource-permissions"
+                ),
                 path(
                     "renew/",
                     views.AppResourcePermissionRenewApi.as_view(),
                     name="permissions.app-resource-permissions.renew",
                 ),
+                path(
+                    "export/",
+                    views.AppResourcePermissionExportApi.as_view(),
+                    name="permissions.app-resource-permissions.export",
+                ),
                 path(
                     "delete/",
                     views.AppResourcePermissionDeleteApi.as_view(),
                     name="permissions.app-resource-permissions.delete",
                 ),
+                path(
+                    "bk-app-codes/",
+                    views.AppResourcePermissionAppCodeListApi.as_view(),
+                    name="permissions.app-resource-permissions.get_bk_app_codes",
+                ),
             ]
         ),
     ),
@@ -69,17 +57,29 @@
         "app-gateway-permissions/",
         include(
             [
-                path("", views.AppGatewayPermissionCreateApi.as_view(), name="permissions.app-gateway-permissions"),
+                path(
+                    "", views.AppGatewayPermissionListCreateApi.as_view(), name="permissions.app-gateway-permissions"
+                ),
                 path(
                     "renew/",
                     views.AppGatewayPermissionRenewApi.as_view(),
                     name="permissions.app-gateway-permissions.renew",
                 ),
+                path(
+                    "export/",
+                    views.AppGatewayPermissionExportApi.as_view(),
+                    name="permissions.app-gateway-permissions.export",
+                ),
                 path(
                     "delete/",
                     views.AppGatewayPermissionDeleteApi.as_view(),
                     name="permissions.app-gateway-permissions.delete",
                 ),
+                path(
+                    "bk-app-codes/",
+                    views.AppGatewayPermissionAppCodeListApi.as_view(),
+                    name="permissions.app-gateway-permissions.get_bk_app_codes",
+                ),
             ]
         ),
     ),
diff --git a/src/dashboard/apigateway/apigateway/apis/web/permission/views.py b/src/dashboard/apigateway/apigateway/apis/web/permission/views.py
index d96368139..b41b58a0a 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/permission/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/permission/views.py
@@ -30,7 +30,7 @@
 from rest_framework import generics, status
 
 from apigateway.apis.web.constants import ExportTypeEnum
-from apigateway.apps.permission.constants import ApplyStatusEnum, GrantDimensionEnum, GrantTypeEnum
+from apigateway.apps.permission.constants import ApplyStatusEnum, GrantTypeEnum
 from apigateway.apps.permission.models import (
     AppGatewayPermission,
     AppPermissionApply,
@@ -50,180 +50,98 @@
     AppResourcePermissionFilter,
 )
 from .serializers import (
+    AppGatewayPermissionExportOutputSLZ,
+    AppGatewayPermissionOutputSLZ,
     AppPermissionApplyApprovalInputSLZ,
     AppPermissionApplyOutputSLZ,
     AppPermissionExportInputSLZ,
-    AppPermissionExportOutputSLZ,
     AppPermissionIDsSLZ,
     AppPermissionInputSLZ,
-    AppPermissionOutputSLZ,
-    AppPermissionQueryInputSLZ,
     AppPermissionRecordOutputSLZ,
-    AppPermissionRenewInputSLZ,
+    AppResourcePermissionExportOutputSLZ,
+    AppResourcePermissionOutputSLZ,
 )
 
 logger = logging.getLogger(__name__)
 
 
-class AppGatewayPermissionQuerySetMixin:
-    def get_queryset(self):
-        return AppGatewayPermission.objects.filter(gateway=self.request.gateway).order_by("-id")
-
-
 class AppResourcePermissionQuerySetMixin:
     def get_queryset(self):
+        queryset = super().get_queryset()
+
         # 仅展示资源存在的权限
         resource_ids = Resource.objects.filter(gateway=self.request.gateway).values_list("id", flat=True)
-        return (
-            AppResourcePermission.objects.filter(gateway=self.request.gateway, resource_id__in=resource_ids)
-            .exclude(bk_app_code=settings.DEFAULT_TEST_APP["bk_app_code"])
-            .order_by("-id")
+        return queryset.filter(gateway=self.request.gateway, resource_id__in=resource_ids).exclude(
+            bk_app_code=settings.DEFAULT_TEST_APP["bk_app_code"]
         )
 
 
-class AppPermissionQuerySetMixin(AppGatewayPermissionQuerySetMixin, AppResourcePermissionQuerySetMixin):
-    def get_gateway_queryset(self):
-        return AppGatewayPermissionQuerySetMixin.get_queryset(self)
-
-    def get_resource_queryset(self):
-        return AppResourcePermissionQuerySetMixin.get_queryset(self)
-
-    def get_app_permissions(self, gateway_queryset, resource_queryset):
-        gateway_permissions = [
-            {
-                "bk_app_code": perm.bk_app_code,
-                "expires": perm.expires,
-                "grant_dimension": GrantDimensionEnum.API.value,
-            }
-            for perm in gateway_queryset
-        ]
-        resource_permission = [
-            {
-                "bk_app_code": perm.bk_app_code,
-                "grant_type": perm.grant_type,
-                "resource_id": perm.resource_id,
-                "expires": perm.expires,
-                "grant_dimension": GrantDimensionEnum.RESOURCE.value,
-            }
-            for perm in resource_queryset
-        ]
-        return gateway_permissions + resource_permission
-
-
 @method_decorator(
     name="get",
     decorator=swagger_auto_schema(
-        operation_description="获取应用权限列表",
-        query_serializer=AppPermissionQueryInputSLZ(),
-        responses={status.HTTP_200_OK: AppPermissionOutputSLZ(many=True)},
+        operation_description="获取资源权限列表",
+        responses={status.HTTP_200_OK: AppResourcePermissionOutputSLZ(many=True)},
         tags=["WebAPI.Permission"],
     ),
 )
-class AppPermissionListApi(AppPermissionQuerySetMixin, generics.ListAPIView):
-    def get_queryset(self):
-        query_params = self.request.query_params
-        app_gateway_permissions = AppGatewayPermissionFilter(self.request.GET, queryset=self.get_gateway_queryset()).qs
-        # 如果查询维度为资源 或者 授权类型不为 INITIALIZE(网关维度都为INITIALIZE)或者 查询某个资源 都要忽略掉网关维度的
-        if (
-            query_params.get("grant_dimension") == GrantDimensionEnum.RESOURCE.value
-            or (query_params.get("grant_type") and query_params.get("grant_type") != GrantTypeEnum.INITIALIZE.value)
-            or query_params.get("resource_id")
-        ):
-            app_gateway_permissions = []
-
-        app_resource_permissions = AppResourcePermissionFilter(
-            self.request.GET, queryset=self.get_resource_queryset()
-        ).qs
-        if query_params.get("grant_dimension") == GrantDimensionEnum.API.value:
-            app_resource_permissions = []
-
-        return self.get_app_permissions(app_gateway_permissions, app_resource_permissions)
-
-    def get(self, request, *args, **kwargs):
-        """
-        权限列表(gateway+resource)
-        """
-        queryset = self.get_queryset()
-        page = self.paginate_queryset(queryset)
-        resource_ids = [perm["resource_id"] for perm in page if perm.get("resource_id")]
-        resources = Resource.objects.filter(id__in=resource_ids)
-        serializer = AppPermissionOutputSLZ(
-            page, many=True, context={"resource_map": {resource.id: resource for resource in resources}}
-        )
-        return self.get_paginated_response(serializer.data)
-
-
 @method_decorator(
     name="post",
     decorator=swagger_auto_schema(
-        operation_description="批量续期",
+        operation_description="资源权限主动授权",
         responses={status.HTTP_201_CREATED: ""},
-        request_body=AppPermissionRenewInputSLZ,
+        request_body=AppPermissionInputSLZ,
         tags=["WebAPI.Permission"],
     ),
 )
-class AppPermissionRenewApi(generics.CreateAPIView):
-    @transaction.atomic
+class AppResourcePermissionListCreateApi(AppResourcePermissionQuerySetMixin, generics.ListCreateAPIView):
+    queryset = AppResourcePermission.objects.order_by("-id")
+    filterset_class = AppResourcePermissionFilter
+
+    def list(self, request, *args, **kwargs):
+        """
+        权限列表
+        """
+        queryset = self.filter_queryset(self.get_queryset())
+        page = self.paginate_queryset(queryset)
+
+        resources = Resource.objects.filter(id__in=[perm.resource_id for perm in page])
+        serializer = AppResourcePermissionOutputSLZ(
+            page, many=True, context={"resource_map": {resource.id: resource for resource in resources}}
+        )
+        return self.get_paginated_response(serializer.data)
+
     def create(self, request, *args, **kwargs):
         """
-        批量续期
+        主动授权
         """
-        slz = AppPermissionRenewInputSLZ(data=request.data, context={"gateway": request.gateway})
+        slz = AppPermissionInputSLZ(data=request.data, context={"gateway": request.gateway})
         slz.is_valid(raise_exception=True)
 
         data = slz.validated_data
 
-        if data["resource_dimension_ids"]:
-            AppResourcePermission.objects.renew_by_ids(
-                gateway=request.gateway, ids=data["resource_dimension_ids"], expires=data["expire_days"]
-            )
-
-        if data["gateway_dimension_ids"]:
-            AppGatewayPermission.objects.renew_by_ids(
-                gateway=request.gateway, ids=data["gateway_dimension_ids"], expires=data["expire_days"]
-            )
-        return OKJsonResponse(status=status.HTTP_201_CREATED)
-
-
-@method_decorator(
-    name="get",
-    decorator=swagger_auto_schema(
-        operation_description="获取有权限的应用列表",
-        responses={status.HTTP_200_OK: ""},
-        tags=["WebAPI.Permission"],
-    ),
-)
-class AppPermissionAppCodeListApi(generics.ListAPIView):
-    def list(self, request, *args, **kwargs):
-        """获取有权限的应用列表"""
-
-        gateway_app_codes = (
-            AppGatewayPermission.objects.filter(gateway=request.gateway)
-            .order_by("bk_app_code")
-            .values_list("bk_app_code", flat=True)
-        )
-
-        resource_app_codes = (
-            AppResourcePermission.objects.filter(gateway=request.gateway)
-            .order_by("bk_app_code")
-            .values_list("bk_app_code", flat=True)
+        AppResourcePermission.objects.save_permissions(
+            gateway=request.gateway,
+            resource_ids=data["resource_ids"],
+            bk_app_code=data["bk_app_code"],
+            expire_days=data["expire_days"],
+            grant_type=GrantTypeEnum.INITIALIZE.value,
         )
 
-        # 去重
-        app_codes = sorted(set(gateway_app_codes) | set(resource_app_codes))
-        return OKJsonResponse(data=list(app_codes))
+        return OKJsonResponse(status=status.HTTP_201_CREATED)
 
 
 @method_decorator(
     name="post",
     decorator=swagger_auto_schema(
-        operation_description="网关权限导出",
+        operation_description="资源权限导出",
         request_body=AppPermissionExportInputSLZ,
         responses={status.HTTP_200_OK: ""},
         tags=["WebAPI.Permission"],
     ),
 )
-class AppPermissionExportApi(AppPermissionQuerySetMixin, generics.CreateAPIView):
+class AppResourcePermissionExportApi(AppResourcePermissionQuerySetMixin, generics.CreateAPIView):
+    queryset = AppResourcePermission.objects.order_by("-id")
+
     def create(self, request, *args, **kwargs):
         """
         权限导出
@@ -233,27 +151,16 @@ def create(self, request, *args, **kwargs):
 
         data = slz.validated_data
 
-        gateway_queryset = []
-        resource_queryset = []
         if data["export_type"] == ExportTypeEnum.ALL.value:
-            gateway_queryset = self.get_gateway_queryset()
-            resource_queryset = self.get_resource_queryset()
+            queryset = self.get_queryset()
         elif data["export_type"] == ExportTypeEnum.FILTERED.value:
-            resource_queryset = AppResourcePermissionFilter(
-                data=data, queryset=self.get_queryset(), request=request
-            ).qs
+            queryset = AppResourcePermissionFilter(data=data, queryset=self.get_queryset(), request=request).qs
         elif data["export_type"] == ExportTypeEnum.SELECTED.value:
-            if data["resource_permission_ids"]:
-                resource_queryset = self.get_resource_queryset().filter(id__in=data["resource_permission_ids"])
-            if data["gateway_permission_ids"]:
-                gateway_queryset = self.get_gateway_queryset().filter(id__in=data["gateway_permission_ids"])
-
-        app_permissions = self.get_app_permissions(gateway_queryset, resource_queryset)
+            queryset = self.get_queryset().filter(id__in=data["permission_ids"])
 
-        resource_ids = [perm["resource_id"] for perm in app_permissions if perm.get("resource_id")]
-        resources = Resource.objects.filter(id__in=resource_ids)
-        slz = AppPermissionExportOutputSLZ(
-            app_permissions, many=True, context={"resource_map": {resource.id: resource for resource in resources}}
+        resources = Resource.objects.filter(id__in=[perm.resource_id for perm in queryset])
+        slz = AppResourcePermissionExportOutputSLZ(
+            queryset, many=True, context={"resource_map": {resource.id: resource for resource in resources}}
         )
         content = self._get_csv_content(slz.data)
 
@@ -269,15 +176,7 @@ def _get_csv_content(self, data: List[Any]) -> str:
         将筛选出的权限数据，整理为 csv 格式内容
         """
         data = sorted(data, key=lambda x: (x["bk_app_code"], x["resource_name"]))
-        headers = [
-            "bk_app_code",
-            "resource_name",
-            "resource_path",
-            "resource_method",
-            "expires",
-            "grant_type",
-            "grant_dimension",
-        ]
+        headers = ["bk_app_code", "resource_name", "resource_path", "resource_method", "expires", "grant_type"]
         header_row = {
             "bk_app_code": _("蓝鲸应用ID"),
             "resource_name": _("资源名称"),
@@ -285,7 +184,6 @@ def _get_csv_content(self, data: List[Any]) -> str:
             "resource_method": _("请求方法"),
             "expires": _("过期时间"),
             "grant_type": _("授权类型"),
-            "grant_dimension": _("授权维度"),
         }
 
         content = StringIO()
@@ -297,34 +195,25 @@ def _get_csv_content(self, data: List[Any]) -> str:
 
 
 @method_decorator(
-    name="post",
+    name="get",
     decorator=swagger_auto_schema(
-        operation_description="资源权限主动授权",
-        responses={status.HTTP_201_CREATED: ""},
-        request_body=AppPermissionInputSLZ,
+        operation_description="获取有资源权限的应用列表",
+        responses={status.HTTP_200_OK: ""},
         tags=["WebAPI.Permission"],
     ),
 )
-class AppResourcePermissionCreateApi(generics.CreateAPIView):
-    @transaction.atomic
-    def create(self, request, *args, **kwargs):
-        """
-        主动授权
-        """
-        slz = AppPermissionInputSLZ(data=request.data, context={"gateway": request.gateway})
-        slz.is_valid(raise_exception=True)
-
-        data = slz.validated_data
+class AppResourcePermissionAppCodeListApi(generics.ListAPIView):
+    @swagger_auto_schema()
+    def list(self, request, *args, **kwargs):
+        """获取有权限的应用列表"""
 
-        AppResourcePermission.objects.save_permissions(
-            gateway=request.gateway,
-            resource_ids=data["resource_ids"],
-            bk_app_code=data["bk_app_code"],
-            expire_days=data["expire_days"],
-            grant_type=GrantTypeEnum.INITIALIZE.value,
+        app_codes = list(
+            AppResourcePermission.objects.filter(gateway=request.gateway)
+            .order_by("bk_app_code")
+            .distinct()
+            .values_list("bk_app_code", flat=True)
         )
-
-        return OKJsonResponse(status=status.HTTP_201_CREATED)
+        return OKJsonResponse(data=app_codes)
 
 
 @method_decorator(
@@ -348,7 +237,8 @@ def create(self, request, *args, **kwargs):
         data = slz.validated_data
 
         AppResourcePermission.objects.renew_by_ids(
-            gateway=request.gateway, ids=data["ids"], expires=data["expire_days"]
+            gateway=request.gateway,
+            ids=data["ids"],
         )
 
         return OKJsonResponse(status=status.HTTP_201_CREATED)
@@ -364,6 +254,8 @@ def create(self, request, *args, **kwargs):
     ),
 )
 class AppResourcePermissionDeleteApi(AppResourcePermissionQuerySetMixin, generics.DestroyAPIView):
+    queryset = AppResourcePermission.objects.order_by("-id")
+
     @transaction.atomic
     def delete(self, request, *args, **kwargs):
         slz = AppPermissionIDsSLZ(data=request.query_params)
@@ -375,6 +267,19 @@ def delete(self, request, *args, **kwargs):
         return OKJsonResponse(status=status.HTTP_204_NO_CONTENT)
 
 
+class AppGatewayPermissionQuerySetMixin:
+    def get_queryset(self):
+        return super().get_queryset().filter(gateway=self.request.gateway)
+
+
+@method_decorator(
+    name="get",
+    decorator=swagger_auto_schema(
+        operation_description="获取网关权限列表",
+        responses={status.HTTP_200_OK: AppGatewayPermissionOutputSLZ(many=True)},
+        tags=["WebAPI.Permission"],
+    ),
+)
 @method_decorator(
     name="post",
     decorator=swagger_auto_schema(
@@ -384,7 +289,20 @@ def delete(self, request, *args, **kwargs):
         tags=["WebAPI.Permission"],
     ),
 )
-class AppGatewayPermissionCreateApi(generics.CreateAPIView):
+class AppGatewayPermissionListCreateApi(AppGatewayPermissionQuerySetMixin, generics.ListCreateAPIView):
+    queryset = AppGatewayPermission.objects.order_by("-id")
+    filterset_class = AppGatewayPermissionFilter
+
+    def list(self, request, *args, **kwargs):
+        """
+        权限列表
+        """
+        queryset = self.filter_queryset(self.get_queryset())
+        page = self.paginate_queryset(queryset)
+
+        serializer = AppGatewayPermissionOutputSLZ(page, many=True)
+        return self.get_paginated_response(serializer.data)
+
     def create(self, request, *args, **kwargs):
         """
         主动授权
@@ -405,6 +323,85 @@ def create(self, request, *args, **kwargs):
         return OKJsonResponse(status=status.HTTP_201_CREATED)
 
 
+@method_decorator(
+    name="post",
+    decorator=swagger_auto_schema(
+        operation_description="网关权限导出",
+        request_body=AppPermissionExportInputSLZ,
+        responses={status.HTTP_200_OK: ""},
+        tags=["WebAPI.Permission"],
+    ),
+)
+class AppGatewayPermissionExportApi(AppGatewayPermissionQuerySetMixin, generics.CreateAPIView):
+    queryset = AppGatewayPermission.objects.order_by("-id")
+
+    def create(self, request, *args, **kwargs):
+        """
+        权限导出
+        """
+        slz = AppPermissionExportInputSLZ(data=request.data)
+        slz.is_valid(raise_exception=True)
+
+        data = slz.validated_data
+
+        if data["export_type"] == ExportTypeEnum.ALL.value:
+            queryset = self.get_queryset()
+        elif data["export_type"] == ExportTypeEnum.FILTERED.value:
+            queryset = AppGatewayPermissionFilter(data=data, queryset=self.get_queryset(), request=request).qs
+        elif data["export_type"] == ExportTypeEnum.SELECTED.value:
+            queryset = self.get_queryset().filter(id__in=data["permission_ids"])
+
+        slz = AppGatewayPermissionExportOutputSLZ(queryset, many=True)
+        content = self._get_csv_content(slz.data)
+
+        response = DownloadableResponse(content, filename=f"{self.request.gateway.name}-permissions.csv")
+        # FIXME: change to export excel directly, while the exported csv file copy from mac to windows is not ok now!
+        # use utf-8-sig for windows
+        response.charset = "utf-8-sig" if "windows" in request.headers.get("User-Agent", "").lower() else "utf-8"
+
+        return response
+
+    def _get_csv_content(self, data: List[Any]) -> str:
+        """
+        将筛选出的权限数据，整理为 csv 格式内容
+        """
+        data = sorted(data, key=lambda x: x["bk_app_code"])
+        headers = ["bk_app_code", "expires", "grant_type"]
+        header_row = {
+            "bk_app_code": _("蓝鲸应用ID"),
+            "expires": _("过期时间"),
+            "grant_type": _("授权类型"),
+        }
+
+        content = StringIO()
+        io_csv = csv.DictWriter(content, fieldnames=headers, extrasaction="ignore")
+        io_csv.writerow(header_row)
+        io_csv.writerows(data)
+
+        return content.getvalue()
+
+
+@method_decorator(
+    name="get",
+    decorator=swagger_auto_schema(
+        operation_description="获取网关权限有权限的应用列表",
+        responses={status.HTTP_200_OK: ""},
+        tags=["WebAPI.Permission"],
+    ),
+)
+class AppGatewayPermissionAppCodeListApi(generics.ListAPIView):
+    def list(self, request, *args, **kwargs):
+        """获取有权限的应用列表"""
+
+        app_codes = list(
+            AppGatewayPermission.objects.filter(gateway=request.gateway)
+            .order_by("bk_app_code")
+            .distinct()
+            .values_list("bk_app_code", flat=True)
+        )
+        return OKJsonResponse(data=app_codes)
+
+
 @method_decorator(
     name="post",
     decorator=swagger_auto_schema(
@@ -426,7 +423,8 @@ def create(self, request, *args, **kwargs):
         data = slz.validated_data
 
         AppGatewayPermission.objects.renew_by_ids(
-            gateway=request.gateway, ids=data["ids"], expires=data["expire_days"]
+            gateway=request.gateway,
+            ids=data["ids"],
         )
 
         return OKJsonResponse(status=status.HTTP_201_CREATED)
@@ -442,6 +440,8 @@ def create(self, request, *args, **kwargs):
     ),
 )
 class AppGatewayPermissionDeleteApi(AppGatewayPermissionQuerySetMixin, generics.DestroyAPIView):
+    queryset = AppGatewayPermission.objects.order_by("-id")
+
     @transaction.atomic
     def delete(self, request, *args, **kwargs):
         slz = AppPermissionIDsSLZ(data=request.query_params)
diff --git a/src/dashboard/apigateway/apigateway/apis/web/release/views.py b/src/dashboard/apigateway/apigateway/apis/web/release/views.py
index e1faf0445..063c7c304 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/release/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/release/views.py
@@ -78,12 +78,12 @@ def list(self, request, *args, **kwargs):
         resources = ReleasedResourceHandler.get_public_released_resource_data_list(
             request.gateway.id, stage_name, is_only_public=False
         )
-        label_ids = list({label_id for resource in resources for label_id in resource.gateway_labels})
+        resource_ids = [resource.id for resource in resources]
         output_slz = ResourceOutputSLZ(
             resources,
             many=True,
             context={
-                "labels": ResourceLabelHandler.get_labels_by_ids(label_ids),
+                "labels": ResourceLabelHandler.get_labels(resource_ids),
             },
         )
         return OKJsonResponse(data=output_slz.data)
diff --git a/src/dashboard/apigateway/apigateway/apis/web/resource/serializers.py b/src/dashboard/apigateway/apigateway/apis/web/resource/serializers.py
index 23f34b77a..013791097 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/resource/serializers.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/resource/serializers.py
@@ -206,7 +206,6 @@ class Meta:
             "method",
             "path",
             "match_subpath",
-            "enable_websocket",
             "is_public",
             "allow_apply_permission",
             # 认证配置
@@ -231,9 +230,6 @@ class Meta:
             "match_subpath": {
                 "help_text": "是否匹配所有子路径",
             },
-            "enable_websocket": {
-                "help_text": "是否启用 websocket",
-            },
             "is_public": {
                 "help_text": "是否公开，true：公开，false：不公开",
             },
@@ -345,7 +341,6 @@ class Meta:
             "method",
             "path",
             "match_subpath",
-            "enable_websocket",
             "is_public",
             "allow_apply_permission",
             "auth_config",
@@ -377,9 +372,6 @@ class Meta:
             "match_subpath": {
                 "help_text": "是否匹配所有子路径",
             },
-            "enable_websocket": {
-                "help_text": "是否启用 websocket",
-            },
             "is_public": {
                 "help_text": "是否公开",
             },
@@ -504,7 +496,6 @@ class Meta:
             "method",
             "path",
             "match_subpath",
-            "enable_websocket",
             "is_public",
             "allow_apply_permission",
             # 认证配置
@@ -536,9 +527,6 @@ class Meta:
             "match_subpath": {
                 "help_text": "是否匹配所有子路径",
             },
-            "enable_websocket": {
-                "help_text": "是否启用 websocket",
-            },
             "is_public": {
                 "help_text": "是否公开",
             },
@@ -608,7 +596,6 @@ class ResourceImportInfoSLZ(serializers.Serializer):
     path = serializers.CharField(help_text="请求路径")
     path_display = serializers.SerializerMethodField(required=False, help_text="请求路径(需要体现是否匹配所有子路径)")
     match_subpath = serializers.BooleanField(help_text="是否匹配所有子路径")
-    enable_websocket = serializers.BooleanField(help_text="是否启用 websocket")
     is_public = serializers.BooleanField(help_text="是否公开")
     allow_apply_permission = serializers.BooleanField(help_text="是否允许应用在开发者中心申请访问资源的权限")
 
@@ -681,7 +668,6 @@ class ResourceExportOutputSLZ(serializers.Serializer):
     method = serializers.CharField(help_text="请求方法")
     path = serializers.CharField(help_text="请求路径")
     match_subpath = serializers.BooleanField(help_text="是否匹配所有子路径")
-    enable_websocket = serializers.BooleanField(help_text="是否启用 websocket")
     is_public = serializers.BooleanField(help_text="是否公开")
     allow_apply_permission = serializers.BooleanField(help_text="是否允许应用在开发者中心申请访问资源的权限")
 
diff --git a/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py b/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py
index 1e365e7e1..64b8dad08 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/resource_version/serializers.py
@@ -47,7 +47,6 @@ class ResourceInfoSLZ(serializers.Serializer):
         source="api_labels", required=False, allow_empty=True, child=serializers.IntegerField(), help_text="标签列表"
     )
     match_subpath = serializers.BooleanField(help_text="是否匹配所有子路径", required=False)
-    enable_websocket = serializers.BooleanField(help_text="是否开启 websocket", required=False)
     is_public = serializers.BooleanField(help_text="是否公开", required=False)
     allow_apply_permission = serializers.BooleanField(
         help_text="是否允许应用在开发者中心申请访问资源的权限", required=False
diff --git a/src/dashboard/apigateway/apigateway/apis/web/sdk/views.py b/src/dashboard/apigateway/apigateway/apis/web/sdk/views.py
index 62dbc942e..b84023815 100644
--- a/src/dashboard/apigateway/apigateway/apis/web/sdk/views.py
+++ b/src/dashboard/apigateway/apigateway/apis/web/sdk/views.py
@@ -104,8 +104,6 @@ def create(self, request, gateway_id):
                 raise error_codes.INTERNAL.format(
                     _("网关下无符合条件(请求方法为非ANY)的资源，无法生成 SDK。"), replace=True
                 )
-            except exceptions.SDKRepoConfigError:
-                raise error_codes.INTERNAL.format(_("网关 SDK 仓库配置异常。"), replace=True)
             except exceptions.GenerateError:
                 raise error_codes.INTERNAL.format(_("网关 SDK 生成失败。"), replace=True)
             except exceptions.PackError:
diff --git a/src/dashboard/apigateway/apigateway/apps/metrics/constants.py b/src/dashboard/apigateway/apigateway/apps/metrics/constants.py
index 625779912..31654cbee 100644
--- a/src/dashboard/apigateway/apigateway/apps/metrics/constants.py
+++ b/src/dashboard/apigateway/apigateway/apps/metrics/constants.py
@@ -21,13 +21,16 @@
 
 class MetricsEnum(StructuredEnum):
     REQUESTS = EnumField("requests")
-    REQUESTS_TOTAL = EnumField("requests_total")
-    NON_200_STATUS = EnumField("non_200_status")
-    APP_REQUESTS = EnumField("app_requests")
-    RESOURCE_REQUESTS = EnumField("resource_requests")
-    RESPONSE_TIME_50TH = EnumField("response_time_50th")
-    RESPONSE_TIME_80TH = EnumField("response_time_80th")
+    FAILED_REQUESTS = EnumField("failed_requests")
+    RESPONSE_TIME_95TH = EnumField("response_time_95th")
     RESPONSE_TIME_90TH = EnumField("response_time_90th")
-    INGRESS = EnumField("ingress")
-    EGRESS = EnumField("egress")
-    FAILED_500_REQUESTS = EnumField("failed_500_requests")
+    RESPONSE_TIME_80TH = EnumField("response_time_80th")
+    RESPONSE_TIME_50TH = EnumField("response_time_50th")
+
+
+class DimensionEnum(StructuredEnum):
+    ALL = EnumField("all")
+    APP = EnumField("app")
+    RESOURCE = EnumField("resource")
+    # 资源+非200状态码
+    RESOURCE_NON200_STATUS = EnumField("resource_non200_status")
diff --git a/src/dashboard/apigateway/apigateway/apps/metrics/prometheus/dimension.py b/src/dashboard/apigateway/apigateway/apps/metrics/prometheus/dimension.py
index 40a64c077..4a4a1355c 100644
--- a/src/dashboard/apigateway/apigateway/apps/metrics/prometheus/dimension.py
+++ b/src/dashboard/apigateway/apigateway/apps/metrics/prometheus/dimension.py
@@ -21,41 +21,32 @@
 
 from django.conf import settings
 
-from apigateway.apps.metrics.constants import MetricsEnum
+from apigateway.apps.metrics.constants import DimensionEnum, MetricsEnum
 from apigateway.common.error_codes import error_codes
 from apigateway.components.prometheus import prometheus_component
 
 from .base import BasePrometheusMetrics
 
 
-class BaseMetrics(BasePrometheusMetrics):
+class BaseDimensionMetrics(BasePrometheusMetrics):
+    dimension: ClassVar[DimensionEnum]
     metrics: ClassVar[MetricsEnum]
 
     @abstractmethod
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         pass
 
     def query_range(
         self,
         gateway_name: str,
         stage_name: str,
+        resource_name: Optional[str],
         start: int,
         end: int,
         step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
     ):
         # generate query expression
-        promql = self._get_query_promql(gateway_name, stage_name, step, stage_id, resource_id, resource_name)
+        promql = self._get_query_promql(gateway_name, stage_name, resource_name, step)
 
         # request prometheus http api to get metrics data
         return prometheus_component.query_range(
@@ -67,18 +58,11 @@ def query_range(
         )
 
 
-class RequestsMetrics(BaseMetrics):
+class RequestsMetrics(BaseDimensionMetrics):
+    dimension = DimensionEnum.ALL
     metrics = MetricsEnum.REQUESTS
 
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         labels = self._get_labels_expression(
             [
                 *self.default_labels,
@@ -90,122 +74,115 @@ def _get_query_promql(
         return f"sum(increase({self.metric_name_prefix}apigateway_api_requests_total{{" f"{labels}" f"}}[{step}]))"
 
 
-class RequestsTotalMetrics(BaseMetrics):
-    metrics = MetricsEnum.REQUESTS_TOTAL
+class FailedRequestsMetrics(BaseDimensionMetrics):
+    dimension = DimensionEnum.ALL
+    metrics = MetricsEnum.FAILED_REQUESTS
 
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         labels = self._get_labels_expression(
             [
                 *self.default_labels,
                 ("api_name", "=", gateway_name),
                 ("stage_name", "=", stage_name),
                 ("resource_name", "=", resource_name),
+                ("status", "=~", "5.."),
+                # ("proxy_error", "=", "1"),
             ]
         )
-        return f"sum({self.metric_name_prefix}apigateway_api_requests_total{{{labels}}})"
+        return f"sum(increase({self.metric_name_prefix}apigateway_api_requests_total{{" f"{labels}" f"}}[{step}]))"
 
 
-class Non200StatusMetrics(BaseMetrics):
-    metrics = MetricsEnum.NON_200_STATUS
+class BaseResponseTimePercentileMetrics(BaseDimensionMetrics):
+    quantile = 1.0
 
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         labels = self._get_labels_expression(
             [
                 *self.default_labels,
                 ("api_name", "=", gateway_name),
                 ("stage_name", "=", stage_name),
                 ("resource_name", "=", resource_name),
-                ("status", "!=", "200"),
             ]
         )
         return (
-            f"topk(10, sum(increase({self.metric_name_prefix}apigateway_api_requests_total{{"
+            f"histogram_quantile({self.quantile}, "
+            f"sum(rate({self.metric_name_prefix}apigateway_api_request_duration_milliseconds_bucket{{"
             f"{labels}"
-            f"}}[{step}])) by (status))"
+            f"}}[{step}])) by (le, api_name))"
         )
 
 
-class AppRequestsMetrics(BaseMetrics):
-    metrics = MetricsEnum.APP_REQUESTS
+class ResponseTime95thMetrics(BaseResponseTimePercentileMetrics):
+    dimension = DimensionEnum.ALL
+    metrics = MetricsEnum.RESPONSE_TIME_95TH
+    quantile = 0.95
 
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+
+class ResponseTime90thMetrics(BaseResponseTimePercentileMetrics):
+    dimension = DimensionEnum.ALL
+    metrics = MetricsEnum.RESPONSE_TIME_90TH
+    quantile = 0.90
+
+
+class ResponseTime80thMetrics(BaseResponseTimePercentileMetrics):
+    dimension = DimensionEnum.ALL
+    metrics = MetricsEnum.RESPONSE_TIME_80TH
+    quantile = 0.80
+
+
+class ResponseTime50thMetrics(BaseResponseTimePercentileMetrics):
+    dimension = DimensionEnum.ALL
+    metrics = MetricsEnum.RESPONSE_TIME_50TH
+    quantile = 0.50
+
+
+class ResourceRequestsMetrics(BaseDimensionMetrics):
+    dimension = DimensionEnum.RESOURCE
+    metrics = MetricsEnum.REQUESTS
+
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         labels = self._get_labels_expression(
             [
                 *self.default_labels,
                 ("api_name", "=", gateway_name),
                 ("stage_name", "=", stage_name),
+                ("resource_name", "=", resource_name),
             ]
         )
         return (
-            f"topk(10, sum(increase({self.metric_name_prefix}apigateway_app_requests_total{{"
+            f"topk(10, sum(increase({self.metric_name_prefix}apigateway_api_requests_total{{"
             f"{labels}"
-            f"}}[{step}])) by (api_name, app_code))"
+            f"}}[{step}])) by (api_name, resource_name, matched_uri))"
         )
 
 
-class ResourceRequestsMetrics(BaseMetrics):
-    metrics = MetricsEnum.RESOURCE_REQUESTS
+class ResourceFailedRequestsMetrics(BaseDimensionMetrics):
+    dimension = DimensionEnum.RESOURCE
+    metrics = MetricsEnum.FAILED_REQUESTS
 
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         labels = self._get_labels_expression(
             [
                 *self.default_labels,
                 ("api_name", "=", gateway_name),
                 ("stage_name", "=", stage_name),
                 ("resource_name", "=", resource_name),
+                ("status", "=~", "5.."),
+                # ("proxy_error", "=", "1"),
             ]
         )
         return (
             f"topk(10, sum(increase({self.metric_name_prefix}apigateway_api_requests_total{{"
             f"{labels}"
-            f"}}[{step}])) by (resource_name, matched_uri))"
+            f"}}[{step}])) by (api_name, resource_name, matched_uri))"
         )
 
 
-class BaseResponseTimePercentileMetrics(BaseMetrics):
-    quantile = 1.0
+class AppRequestsMetrics(BaseDimensionMetrics):
+    dimension = DimensionEnum.APP
+    metrics = MetricsEnum.REQUESTS
 
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         labels = self._get_labels_expression(
             [
                 *self.default_labels,
@@ -215,139 +192,60 @@ def _get_query_promql(
             ]
         )
         return (
-            f"histogram_quantile({self.quantile}, "
-            f"sum(rate({self.metric_name_prefix}apigateway_api_request_duration_milliseconds_bucket{{"
+            f"topk(10, sum(increase({self.metric_name_prefix}apigateway_app_requests_total{{"
             f"{labels}"
-            f"}}[{step}])) by (le, api_name))"
-        )
-
-
-class ResponseTime50thMetrics(BaseResponseTimePercentileMetrics):
-    metrics = MetricsEnum.RESPONSE_TIME_50TH
-    quantile = 0.50
-
-
-class ResponseTime80thMetrics(BaseResponseTimePercentileMetrics):
-    metrics = MetricsEnum.RESPONSE_TIME_80TH
-    quantile = 0.80
-
-
-class ResponseTime90thMetrics(BaseResponseTimePercentileMetrics):
-    metrics = MetricsEnum.RESPONSE_TIME_90TH
-    quantile = 0.90
-
-
-class IngressMetrics(BaseMetrics):
-    metrics = MetricsEnum.INGRESS
-
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
-        # 因为route的参数结果不能使用self._get_labels_expression方法去去除空参数
-        label_list = [
-            *self.default_labels,
-            ("type", "=", "ingress"),
-            # service 的参数规则： 网关名称.环境名称.stage-环境ID
-            ("service", "=", f"{gateway_name}.{stage_name}.stage-{stage_id}"),
-        ]
-        if resource_id:
-            # route 的参数规则： 网关名称.环境名称.资源ID
-            label_list.append(("route", "=", f"{gateway_name}.{stage_name}.{resource_id}"))
-        labels = self._get_labels_expression(label_list)
-        return (
-            # 指标：bkmonitor:bk_apigateway_bandwidth
-            f"topk(10, sum(increase({self.metric_name_prefix}bandwidth{{" f"{labels}" f"}}[{step}])) by (route))"
-        )
-
-
-class EgressMetrics(BaseMetrics):
-    metrics = MetricsEnum.EGRESS
-
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
-        # 因为route的参数结果不能使用self._get_labels_expression方法去去除空参数
-        label_list = [
-            *self.default_labels,
-            ("type", "=", "egress"),
-            # service 的参数规则： 网关名称.环境名称.stage-环境ID
-            ("service", "=", f"{gateway_name}.{stage_name}.stage-{stage_id}"),
-        ]
-        if resource_id:
-            # route 的参数规则： 网关名称.环境名称.资源ID
-            label_list.append(("route", "=", f"{gateway_name}.{stage_name}.{resource_id}"))
-        labels = self._get_labels_expression(label_list)
-
-        return (
-            # 指标：bkmonitor:bk_apigateway_bandwidth
-            f"topk(10, sum(increase({self.metric_name_prefix}bandwidth{{" f"{labels}" f"}}[{step}])) by (route))"
+            f"}}[{step}])) by (api_name, app_code))"
         )
 
 
-# 500 状态码的请求为了提供计算健康率
-class Failed500RequestsMetrics(BaseMetrics):
-    metrics = MetricsEnum.FAILED_500_REQUESTS
+class ResourceNon200StatusRequestsMetrics(BaseDimensionMetrics):
+    dimension = DimensionEnum.RESOURCE_NON200_STATUS
+    metrics = MetricsEnum.REQUESTS
 
-    def _get_query_promql(
-        self,
-        gateway_name: str,
-        stage_name: str,
-        step: str,
-        stage_id: Optional[int],
-        resource_id: Optional[int],
-        resource_name: Optional[str],
-    ) -> str:
+    def _get_query_promql(self, gateway_name: str, stage_name: str, resource_name: Optional[str], step: str) -> str:
         labels = self._get_labels_expression(
             [
                 *self.default_labels,
                 ("api_name", "=", gateway_name),
                 ("stage_name", "=", stage_name),
                 ("resource_name", "=", resource_name),
-                ("status", "=~", "5.."),
-                # ("proxy_error", "=", "1"),
+                ("status", "!=", "200"),
             ]
         )
-        return f"sum({self.metric_name_prefix}apigateway_api_requests_total{{{labels}}})"
+        return (
+            f"topk(10, sum(increase({self.metric_name_prefix}apigateway_api_requests_total{{"
+            f"{labels}"
+            f"}}[{step}])) by (api_name, resource_name, matched_uri, status))"
+        )
 
 
-class MetricsFactory:
-    # map: metrics -> metrics_class
-    _registry: Dict[MetricsEnum, Type[BaseMetrics]] = {}
+class DimensionMetricsFactory:
+    # map: dimension -> metrics -> dimension_metrics_class
+    _registry: Dict[DimensionEnum, Dict[MetricsEnum, Type[BaseDimensionMetrics]]] = {}
 
     @classmethod
-    def create_metrics(cls, metrics: MetricsEnum) -> BaseMetrics:
-        _class = cls._registry.get(metrics)
+    def create_dimension_metrics(cls, dimension: DimensionEnum, metrics: MetricsEnum) -> BaseDimensionMetrics:
+        _class = cls._registry.get(dimension, {}).get(metrics)
         if not _class:
-            raise error_codes.INVALID_ARGUMENT.format(f"unsupported metrics={metrics.value}")
+            raise error_codes.INVALID_ARGUMENT.format(
+                f"unsupported dimension={dimension.value}, metrics={metrics.value}"
+            )
         return _class()
 
     @classmethod
-    def register(cls, metrics_class: Type[BaseMetrics]):
-        if not hasattr(metrics_class, "metrics") or not isinstance(metrics_class.metrics, MetricsEnum):
-            raise ValueError("metrics_class must have a 'metrics' ClassVar of type MetricsEnum")
-        cls._registry[metrics_class.metrics] = metrics_class
-
-
-MetricsFactory.register(RequestsMetrics)
-MetricsFactory.register(RequestsTotalMetrics)
-MetricsFactory.register(Non200StatusMetrics)
-MetricsFactory.register(AppRequestsMetrics)
-MetricsFactory.register(ResourceRequestsMetrics)
-MetricsFactory.register(ResponseTime50thMetrics)
-MetricsFactory.register(ResponseTime80thMetrics)
-MetricsFactory.register(ResponseTime90thMetrics)
-MetricsFactory.register(IngressMetrics)
-MetricsFactory.register(EgressMetrics)
-MetricsFactory.register(Failed500RequestsMetrics)
+    def register(cls, dimension_metrics_class: Type[BaseDimensionMetrics]):
+        _class = dimension_metrics_class
+        cls._registry.setdefault(_class.dimension, {})
+        cls._registry[_class.dimension][_class.metrics] = dimension_metrics_class
+
+
+DimensionMetricsFactory.register(RequestsMetrics)
+DimensionMetricsFactory.register(FailedRequestsMetrics)
+DimensionMetricsFactory.register(ResponseTime95thMetrics)
+DimensionMetricsFactory.register(ResponseTime90thMetrics)
+DimensionMetricsFactory.register(ResponseTime80thMetrics)
+DimensionMetricsFactory.register(ResponseTime50thMetrics)
+DimensionMetricsFactory.register(ResourceRequestsMetrics)
+DimensionMetricsFactory.register(ResourceFailedRequestsMetrics)
+DimensionMetricsFactory.register(AppRequestsMetrics)
+DimensionMetricsFactory.register(ResourceNon200StatusRequestsMetrics)
diff --git a/src/dashboard/apigateway/apigateway/apps/permission/managers.py b/src/dashboard/apigateway/apigateway/apps/permission/managers.py
index 05d3a7592..aee6aa305 100644
--- a/src/dashboard/apigateway/apigateway/apps/permission/managers.py
+++ b/src/dashboard/apigateway/apigateway/apps/permission/managers.py
@@ -45,9 +45,9 @@ def save_permissions(self, gateway, resource_ids=None, bk_app_code=None, grant_t
         )
 
     def renew_by_ids(self, gateway, ids, expires=DEFAULT_PERMISSION_EXPIRE_DAYS):
-        expire_time = calculate_expires(expires)
-        self.filter(gateway=gateway, id__in=ids, expires__lt=expire_time).update(
-            expires=expire_time,
+        expires = to_datetime_from_now(days=expires)
+        self.filter(gateway=gateway, id__in=ids, expires__lt=expires).update(
+            expires=expires,
             updated_time=now_datetime(),
         )
 
@@ -57,9 +57,9 @@ def filter_public_permission_by_app(self, bk_app_code: str):
         return self.filter(bk_app_code=bk_app_code, gateway__is_public=True)
 
     def renew_by_ids(self, gateway, ids, expires=DEFAULT_PERMISSION_EXPIRE_DAYS, grant_type=GrantTypeEnum.RENEW.value):
-        expire_time = calculate_expires(expires)
-        self.filter(gateway=gateway, id__in=ids, expires__lt=expire_time).update(
-            expires=expire_time,
+        expires = to_datetime_from_now(days=expires)
+        self.filter(gateway=gateway, id__in=ids, expires__lt=expires).update(
+            expires=expires,
             grant_type=grant_type,
         )
 
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/bkrepo.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/bkrepo.py
index 4afb5e48f..10dd94ecb 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/bkrepo.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/bkrepo.py
@@ -56,6 +56,3 @@ def distribute(self, output_dir: str, files: List[str]) -> DistributeResult:
         result.is_local = False
 
         return result
-
-    def enabled(self) -> bool:
-        return bool(self.bkrepo and self.bkrepo.endpoint_url)
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/maven.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/maven.py
deleted file mode 100644
index f9a4f9fe3..000000000
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/maven.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#  -*- coding: utf-8 -*-
-#  #
-#  TencentBlueKing is pleased to support the open source community by making
-#  蓝鲸智云 - API 网关(BlueKing - APIGateway) available.
-#  Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
-#  Licensed under the MIT License (the "License"); you may not use this file except
-#  in compliance with the License. You may obtain a copy of the License at
-#  #
-#      http://opensource.org/licenses/MIT
-#  #
-#  Unless required by applicable law or agreed to in writing, software distributed under
-#  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-#  either express or implied. See the License for the specific language governing permissions and
-#  limitations under the License.
-#  #
-#  We undertake not to change the open source license (MIT license) applicable
-#  to the current version of the project delivered to anyone in the future.
-#  #
-import logging
-import os
-import subprocess
-from dataclasses import dataclass, field
-from pathlib import Path
-from typing import ClassVar, List
-
-from apigateway.apps.support.api_sdk.exceptions import DistributeError
-from apigateway.apps.support.api_sdk.models import DistributeResult, Distributor
-from apigateway.utils.maven import RepositoryConfig
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class MavenSourceDistributor(Distributor):
-    repository: ClassVar[str] = "default"
-    group_id: ClassVar[str] = "com.tencent.bkapi"
-    repository_config: RepositoryConfig = field(init=False)
-
-    def __post_init__(self):
-        self.repository_config = RepositoryConfig.by_name(self.repository)
-
-    def get_download_url(self):
-        group_path = self.group_id.replace(".", "/")
-        artifact_id = self.context.package
-        version = self.context.version
-        repository_url = self.repository_config.repository_url
-        return f"{repository_url}/{group_path}/{artifact_id}/{version}/{artifact_id}-{version}.jar"
-
-    def distribute(self, output_dir: str, files: List[str]) -> DistributeResult:
-        result = DistributeResult(repository=self.repository, is_local=True)
-
-        if not files:
-            return result
-
-        if not self.repository_config.repository_url:
-            raise DistributeError(f"maven repository [{self.repository}] configuration is not set")
-
-        self.context.update_language_config(
-            {
-                "is_uploaded_to_maven": True,
-                "repository": self.repository_config.repository_url,
-            }
-        )
-
-        source_dir = output_dir
-        env = os.environ.copy()
-        env["HOME"] = source_dir
-
-        command = [
-            "mvn",
-            "-s",
-            str(Path.cwd() / "apigateway/apps/support/api_sdk/maven/settings.xml"),
-            "-e",
-            "deploy:deploy-file",
-            "-DgroupId=" + self.group_id,
-            "-DartifactId=" + self.context.package,
-            "-Dversion=" + self.context.version,
-            "-Dpackaging=jar",
-            "-Dfile=" + files[0],
-            "-DrepositoryId=" + self.repository_config.repository_id,
-            "-Durl=" + self.repository_config.repository_url,
-            "-Dusername=" + self.repository_config.username,
-            "-Dpassword=" + self.repository_config.password,
-        ]
-
-        try:
-            completed_process = subprocess.run(
-                command,
-                env=env,
-                cwd=source_dir,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True,
-                check=False,
-            )
-            logger.info("stdout:%s", completed_process.stdout)
-            logger.info("stderr:%s", completed_process.stderr)
-            completed_process.check_returncode()
-        except subprocess.CalledProcessError:
-            logger.exception("upload to maven repository [%s] failed", self.repository)
-            raise DistributeError(f"can not distribute to maven repository [{self.repository}]")
-
-        result.url = self.get_download_url()
-        result.is_local = result.url == ""
-
-        return result
-
-    def enabled(self) -> bool:
-        return bool(self.repository_config and self.repository_config.repository_url)
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/pypi.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/pypi.py
index 265b849e0..69ac6c5ed 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/pypi.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/distributors/pypi.py
@@ -101,6 +101,3 @@ def distribute(self, output_dir: str, files: List[str]) -> DistributeResult:
         result.is_local = result.url == ""
 
         return result
-
-    def enabled(self) -> bool:
-        return bool(self.repository_config and self.repository_config.repository_url)
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/exceptions.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/exceptions.py
index afebad56d..6b1d93fdb 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/exceptions.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/exceptions.py
@@ -25,10 +25,6 @@ class GenerateError(SDKException):
     """生成错误"""
 
 
-class SDKRepoConfigError(SDKException):
-    """SKD配置错误"""
-
-
 class DistributeError(SDKException):
     """发布错误"""
 
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/generators/openapi.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/generators/openapi.py
index 59c63803d..aab581f8b 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/generators/openapi.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/generators/openapi.py
@@ -82,7 +82,3 @@ class PythonTemplateGenerator(OpenAPITemplateGenerator):
 
 class GolangTemplateGenerator(OpenAPITemplateGenerator):
     template_name = "bkapi_golang"
-
-
-class JavaTemplateGenerator(OpenAPITemplateGenerator):
-    template_name = "bkapi_java"
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/__init__.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/__init__.py
index 9b275dbdd..3d831e1e6 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/__init__.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/__init__.py
@@ -15,7 +15,7 @@
 # We undertake not to change the open source license (MIT license) applicable
 # to the current version of the project delivered to anyone in the future.
 #
-from apigateway.apps.support.api_sdk.managers import golang, java, python
+from apigateway.apps.support.api_sdk.managers import golang, python
 from apigateway.apps.support.constants import ProgrammingLanguageEnum
 from apigateway.utils.factory import TypeFactory
 
@@ -23,5 +23,5 @@
 
 SDKManagerFactory.register(ProgrammingLanguageEnum.PYTHON.value, python.SDKManager)
 SDKManagerFactory.register(ProgrammingLanguageEnum.GOLANG.value, golang.SDKManager)
-SDKManagerFactory.register(ProgrammingLanguageEnum.JAVA.value, java.SDKManager)
+
 __all__ = ["SDKManagerFactory"]
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/base.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/base.py
index 962d08256..406014dc0 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/base.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/base.py
@@ -19,7 +19,7 @@
 from dataclasses import dataclass
 from typing import Any, ClassVar, Dict, List, Optional, Type
 
-from apigateway.apps.support.api_sdk.exceptions import DistributeError, ResourcesIsEmpty, SDKRepoConfigError
+from apigateway.apps.support.api_sdk.exceptions import DistributeError, ResourcesIsEmpty
 from apigateway.apps.support.api_sdk.models import (
     DistributeResult,
     Distributor,
@@ -124,9 +124,6 @@ def _distribute(
         if not distributor:
             return
 
-        if not distributor.enabled():
-            raise SDKRepoConfigError("sdk repo configuration is not set")
-
         distribute_result = None
         try:
             distribute_result = distributor.distribute(output_dir, files)
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/java.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/java.py
deleted file mode 100644
index 01bd3bc4e..000000000
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/managers/java.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- coding: utf-8 -*-
-#  #
-#  TencentBlueKing is pleased to support the open source community by making
-#  蓝鲸智云 - API 网关(BlueKing - APIGateway) available.
-#  Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
-#  Licensed under the MIT License (the "License"); you may not use this file except
-#  in compliance with the License. You may obtain a copy of the License at
-#  #
-#      http://opensource.org/licenses/MIT
-#  #
-#  Unless required by applicable law or agreed to in writing, software distributed under
-#  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-#  either express or implied. See the License for the specific language governing permissions and
-#  limitations under the License.
-#  #
-#  We undertake not to change the open source license (MIT license) applicable
-#  to the current version of the project delivered to anyone in the future.
-#  #
-from apigateway.apps.support.api_sdk.distributors.bkrepo import GenericDistributor
-from apigateway.apps.support.api_sdk.distributors.maven import MavenSourceDistributor
-from apigateway.apps.support.api_sdk.generators.openapi import JavaTemplateGenerator
-from apigateway.apps.support.api_sdk.managers.base import BaseSDKManager
-from apigateway.apps.support.api_sdk.managers.mixins import SDKManagerMixin
-from apigateway.apps.support.api_sdk.packagers.maven import SourcePackager
-from apigateway.apps.support.constants import ProgrammingLanguageEnum
-
-
-class SDKManager(SDKManagerMixin, BaseSDKManager):
-    generator_cls = JavaTemplateGenerator
-    packager_cls = SourcePackager
-    public_distributor_cls = MavenSourceDistributor
-    private_distributor_cls = GenericDistributor
-    language = ProgrammingLanguageEnum.JAVA
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/maven/settings.xml b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/maven/settings.xml
deleted file mode 100644
index 92f2ae89d..000000000
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/maven/settings.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!--
- | This is the configuration file for Maven. It can be specified at two levels:
- |
- |  1. User Level. This settings.xml file provides configuration for a single user,
- |                 and is normally provided in ${user.home}/.m2/settings.xml.
- |
- |                 NOTE: This location can be overridden with the CLI option:
- |
- |                 -s /path/to/user/settings.xml
- |
- |  2. Global Level. This settings.xml file provides configuration for all Maven
- |                 users on a machine (assuming they're all using the same Maven
- |                 installation). It's normally provided in
- |                 ${maven.conf}/settings.xml.
- |
- |                 NOTE: This location can be overridden with the CLI option:
- |
- |                 -gs /path/to/global/settings.xml
- |
- | The sections in this sample file are intended to give you a running start at
- | getting the most out of your Maven installation. Where appropriate, the default
- | values (values used when the setting is not specified) are provided.
- |
- |-->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
-  <!-- localRepository
-   | The path to the local repository maven will use to store artifacts.
-   |
-   | Default: ${user.home}/.m2/repository
-  <localRepository>/path/to/local/repo</localRepository>
-  -->
-
-  <!-- interactiveMode
-   | This will determine whether maven prompts you when it needs input. If set to false,
-   | maven will use a sensible default value, perhaps based on some other setting, for
-   | the parameter in question.
-   |
-   | Default: true
-  <interactiveMode>true</interactiveMode>
-  -->
-
-  <!-- offline
-   | Determines whether maven should attempt to connect to the network when executing a build.
-   | This will have an effect on artifact downloads, artifact deployment, and others.
-   |
-   | Default: false
-  <offline>false</offline>
-  -->
-
-  <!-- pluginGroups
-   | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
-   | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
-   | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
-   |-->
-  <pluginGroups>
-    <!-- pluginGroup
-     | Specifies a further group identifier to use for plugin lookup.
-    <pluginGroup>com.your.plugins</pluginGroup>
-    -->
-  </pluginGroups>
-
-  <!-- TODO Since when can proxies be selected as depicted? -->
-  <!-- proxies
-   | This is a list of proxies which can be used on this machine to connect to the network.
-   | Unless otherwise specified (by system property or command-line switch), the first proxy
-   | specification in this list marked as active will be used.
-   |-->
-  <proxies>
-    <!-- proxy
-     | Specification for one proxy, to be used in connecting to the network.
-     |
-    <proxy>
-      <id>optional</id>
-      <active>true</active>
-      <protocol>http</protocol>
-      <username>proxyuser</username>
-      <password>proxypass</password>
-      <host>proxy.host.net</host>
-      <port>80</port>
-      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
-    </proxy>
-    -->
-  </proxies>
-
-  <!-- servers
-   | This is a list of authentication profiles, keyed by the server-id used within the system.
-   | Authentication profiles can be used whenever maven must make a connection to a remote server.
-   |-->
-  <servers>
-      <server>
-        <!-- maven根据id寻找每个仓库的鉴权信息，此处使用thirdparty作为id匹配上面的示例命令 -->
-        <id>${repositoryId}</id>
-        <username>${username}</username>
-        <password>${password}</password>
-      </server>
-    <!-- server
-     | Specifies the authentication information to use when connecting to a particular server, identified by
-     | a unique name within the system (referred to by the 'id' attribute below).
-     |
-     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
-     |       used together.
-     |
-    <server>
-      <id>deploymentRepo</id>
-      <username>repouser</username>
-      <password>repopwd</password>
-    </server>
-    -->
-
-    <!-- Another sample, using keys to authenticate.
-    <server>
-      <id>siteServer</id>
-      <privateKey>/path/to/private/key</privateKey>
-      <passphrase>optional; leave empty if not used.</passphrase>
-    </server>
-    -->
-  </servers>
-
-  <!-- mirrors
-   | This is a list of mirrors to be used in downloading artifacts from remote repositories.
-   |
-   | It works like this: a POM may declare a repository to use in resolving certain artifacts.
-   | However, this repository may have problems with heavy traffic at times, so people have mirrored
-   | it to several places.
-   |
-   | That repository definition will have a unique id, so we can create a mirror reference for that
-   | repository, to be used as an alternate download site. The mirror site will be the preferred
-   | server for that repository.
-   |-->
-  <mirrors>
-    <!-- mirror
-     | Specifies a repository mirror site to use instead of a given repository. The repository that
-     | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
-     | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
-     |
-    <mirror>
-      <id>mirrorId</id>
-      <mirrorOf>repositoryId</mirrorOf>
-      <name>Human Readable Name for this Mirror.</name>
-      <url>http://my.repository.com/repo/path</url>
-    </mirror>
-     -->
-    <mirror>
-      <id>maven-default-http-blocker</id>
-      <mirrorOf>external:http:*</mirrorOf>
-      <name>Pseudo repository to mirror external repositories initially using HTTP.</name>
-      <url>http://0.0.0.0/</url>
-      <blocked>true</blocked>
-    </mirror>
-  </mirrors>
-
-  <!-- profiles
-   | This is a list of profiles which can be activated in a variety of ways, and which can modify
-   | the build process. Profiles provided in the settings.xml are intended to provide local machine-
-   | specific paths and repository locations which allow the build to work in the local environment.
-   |
-   | For example, if you have an integration testing plugin - like cactus - that needs to know where
-   | your Tomcat instance is installed, you can provide a variable here such that the variable is
-   | dereferenced during the build process to configure the cactus plugin.
-   |
-   | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
-   | section of this document (settings.xml) - will be discussed later. Another way essentially
-   | relies on the detection of a property, either matching a particular value for the property,
-   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
-   | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
-   | Finally, the list of active profiles can be specified directly from the command line.
-   |
-   | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
-   |       repositories, plugin repositories, and free-form properties to be used as configuration
-   |       variables for plugins in the POM.
-   |
-   |-->
-  <profiles>
-    <!-- profile
-     | Specifies a set of introductions to the build process, to be activated using one or more of the
-     | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
-     | or the command line, profiles have to have an ID that is unique.
-     |
-     | An encouraged best practice for profile identification is to use a consistent naming convention
-     | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
-     | This will make it more intuitive to understand what the set of introduced profiles is attempting
-     | to accomplish, particularly when you only have a list of profile id's for debug.
-     |
-     | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
-    <profile>
-      <id>jdk-1.4</id>
-
-      <activation>
-        <jdk>1.4</jdk>
-      </activation>
-
-      <repositories>
-        <repository>
-          <id>jdk14</id>
-          <name>Repository for JDK 1.4 builds</name>
-          <url>http://www.myhost.com/maven/jdk14</url>
-          <layout>default</layout>
-          <snapshotPolicy>always</snapshotPolicy>
-        </repository>
-      </repositories>
-    </profile>
-    -->
-
-    <!--
-     | Here is another profile, activated by the property 'target-env' with a value of 'dev', which
-     | provides a specific path to the Tomcat instance. To use this, your plugin configuration might
-     | hypothetically look like:
-     |
-     | ...
-     | <plugin>
-     |   <groupId>org.myco.myplugins</groupId>
-     |   <artifactId>myplugin</artifactId>
-     |
-     |   <configuration>
-     |     <tomcatLocation>${tomcatPath}</tomcatLocation>
-     |   </configuration>
-     | </plugin>
-     | ...
-     |
-     | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
-     |       anything, you could just leave off the <value/> inside the activation-property.
-     |
-    <profile>
-      <id>env-dev</id>
-
-      <activation>
-        <property>
-          <name>target-env</name>
-          <value>dev</value>
-        </property>
-      </activation>
-
-      <properties>
-        <tomcatPath>/path/to/tomcat/instance</tomcatPath>
-      </properties>
-    </profile>
-    -->
-  </profiles>
-
-  <!-- activeProfiles
-   | List of profiles that are active for all builds.
-   |
-  <activeProfiles>
-    <activeProfile>alwaysActiveProfile</activeProfile>
-    <activeProfile>anotherAlwaysActiveProfile</activeProfile>
-  </activeProfiles>
-  -->
-</settings>
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/models.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/models.py
index 4865b0a07..77880bec8 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/models.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/models.py
@@ -126,12 +126,6 @@ class Distributor:
     def distribute(self, output_dir: str, files: List[str]) -> DistributeResult:
         raise NotImplementedError
 
-    def enabled(self) -> bool:
-        """
-        判断是否配置对应仓库配置
-        """
-        raise NotImplementedError
-
 
 @dataclass
 class SDKManager:
@@ -188,16 +182,10 @@ class GolangSDK(SDK):
     language = ProgrammingLanguageEnum.GOLANG
 
 
-@dataclass
-class JavaSDK(SDK):
-    language = ProgrammingLanguageEnum.JAVA
-
-
 class SDKFactory:
     _mappings: Dict[str, Type[SDK]] = {
         PythonSDK.language.value: PythonSDK,
         GolangSDK.language.value: GolangSDK,
-        JavaSDK.language.value: JavaSDK,
     }
 
     @classmethod
diff --git a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/packagers/maven.py b/src/dashboard/apigateway/apigateway/apps/support/api_sdk/packagers/maven.py
deleted file mode 100644
index 7e91db621..000000000
--- a/src/dashboard/apigateway/apigateway/apps/support/api_sdk/packagers/maven.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#  -*- coding: utf-8 -*-
-#  #
-#  TencentBlueKing is pleased to support the open source community by making
-#  蓝鲸智云 - API 网关(BlueKing - APIGateway) available.
-#  Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
-#  Licensed under the MIT License (the "License"); you may not use this file except
-#  in compliance with the License. You may obtain a copy of the License at
-#  #
-#      http://opensource.org/licenses/MIT
-#  #
-#  Unless required by applicable law or agreed to in writing, software distributed under
-#  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-#  either express or implied. See the License for the specific language governing permissions and
-#  limitations under the License.
-#  #
-#  We undertake not to change the open source license (MIT license) applicable
-#  to the current version of the project delivered to anyone in the future.
-#  #
-import logging
-import os
-from dataclasses import dataclass
-from pathlib import Path
-from subprocess import check_output
-from typing import List
-
-from apigateway.apps.support.api_sdk.models import Packager
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class SourcePackager(Packager):
-    def pack(self, output_dir: str) -> List[str]:
-        # 保存当前工作目录
-        original_dir = os.getcwd()
-        try:
-            # 切换到 Maven 项目目录
-            os.chdir(output_dir)
-            output = check_output(
-                [
-                    "mvn",
-                    "-s",
-                    str(Path(original_dir) / "apigateway/apps/support/api_sdk/maven/settings.xml"),
-                    "clean",
-                    "package",
-                ],
-                env={"HOME": output_dir},
-                cwd=output_dir,
-            )
-
-            logger.info(output.decode("utf-8"))
-
-            # 查找生成的 JAR 文件
-            target_dir = os.path.join(output_dir, "target")
-            jar_files = [os.path.join(target_dir, f) for f in os.listdir(target_dir) if f.endswith(".jar")]
-
-            if not jar_files:
-                raise FileNotFoundError("No JAR files found in the target directory.")
-
-            return [os.path.join(output_dir + "/target", os.path.basename(jar_file)) for jar_file in jar_files]
-
-        finally:
-            # 切换回原来的工作目录
-            os.chdir(original_dir)
diff --git a/src/dashboard/apigateway/apigateway/apps/support/constants.py b/src/dashboard/apigateway/apigateway/apps/support/constants.py
index cb3a3da86..50c2987a3 100644
--- a/src/dashboard/apigateway/apigateway/apps/support/constants.py
+++ b/src/dashboard/apigateway/apigateway/apps/support/constants.py
@@ -28,7 +28,6 @@ class ProgrammingLanguageEnum(StructuredEnum):
     UNKNOWN = EnumField("unknown")
     PYTHON = EnumField("python")
     GOLANG = EnumField("golang")
-    JAVA = EnumField("java")
 
 
 class DocLanguageEnum(StructuredEnum):
diff --git a/src/dashboard/apigateway/apigateway/biz/released_resource.py b/src/dashboard/apigateway/apigateway/biz/released_resource.py
index cf324f527..32a224712 100644
--- a/src/dashboard/apigateway/apigateway/biz/released_resource.py
+++ b/src/dashboard/apigateway/apigateway/biz/released_resource.py
@@ -33,7 +33,6 @@ class ReleasedResourceData:
     description: str = field(default="")
     description_en: Optional[str] = field(default=None)
     match_subpath: bool = field(default=False)
-    enable_websocket: bool = field(default=False)
     is_public: bool = field(default=False)
     allow_apply_permission: bool = field(default=False)
     disabled_stages: List[str] = field(default_factory=list)
@@ -41,7 +40,6 @@ class ReleasedResourceData:
     verified_app_required: bool = field(init=False)
     verified_user_required: bool = field(init=False)
     resource_perm_required: bool = field(init=False)
-    gateway_labels: List[int] = field(default_factory=list)
 
     def __post_init__(self):
         resource_auth_config = json.loads(self.contexts["resource_auth"]["config"])
@@ -59,12 +57,10 @@ def from_data(cls, released_resource_data: Dict[str, Any]) -> "ReleasedResourceD
             description=released_resource_data.get("description", ""),
             description_en=released_resource_data.get("description_en"),
             match_subpath=released_resource_data.get("match_subpath", False),
-            enable_websocket=released_resource_data.get("enable_websocket", False),
             is_public=released_resource_data["is_public"],
             allow_apply_permission=released_resource_data.get("allow_apply_permission", True),
             disabled_stages=released_resource_data.get("disabled_stages") or [],
             contexts=released_resource_data["contexts"],
-            gateway_labels=released_resource_data["api_labels"],
         )
 
     def is_disabled_in_stage(self, stage_name: str) -> bool:
diff --git a/src/dashboard/apigateway/apigateway/biz/resource/importer/parser.py b/src/dashboard/apigateway/apigateway/biz/resource/importer/parser.py
index ea78c972b..717551f1d 100644
--- a/src/dashboard/apigateway/apigateway/biz/resource/importer/parser.py
+++ b/src/dashboard/apigateway/apigateway/biz/resource/importer/parser.py
@@ -65,7 +65,6 @@ def get_resources(self) -> List[Dict[str, Any]]:
                     "method": method,
                     "path": path,
                     "match_subpath": extension_resource.get("matchSubpath", False),
-                    "enable_websocket": extension_resource.get("enableWebsocket", False),
                     "name": operation["operationId"].replace("-", "_"),  # 避免drf生成的带有-的导入不进去
                     "description": self._adapt_description(operation.get("summary"), operation.get("description")),
                     "description_en": extension_resource.get("descriptionEn"),
@@ -355,7 +354,6 @@ def __init__(self, gateway: Gateway, resources: List[Dict[str, Any]]):
                 "method": "GET",
                 "path": "/v1/test",
                 "match_subpath": False,
-                "enable_websocket": False,
                 "name": "test",
                 "description": "test",
                 "is_public": True,
@@ -414,7 +412,6 @@ def convert(self) -> List[ResourceData]:
                     method=resource["method"],
                     path=resource["path"],
                     match_subpath=resource.get("match_subpath", False),
-                    enable_websocket=resource.get("enable_websocket", False),
                     is_public=resource.get("is_public", True),
                     allow_apply_permission=resource.get("allow_apply_permission", True),
                     auth_config=ResourceAuthConfig.parse_obj(resource.get("auth_config", {})),
@@ -579,7 +576,6 @@ def _generate_bk_apigateway_resource(self, operation: Dict[str, Any], resource:
             "isPublic": resource["is_public"],
             "allowApplyPermission": resource["allow_apply_permission"],
             "matchSubpath": resource.get("match_subpath", False),
-            "enableWebsocket": resource.get("enable_websocket", False),
             "backend": self._adapt_backend(
                 backend,
                 resource.get("proxy_type", ""),
diff --git a/src/dashboard/apigateway/apigateway/biz/resource/models.py b/src/dashboard/apigateway/apigateway/biz/resource/models.py
index 1bb56be3f..0f0ce7eda 100644
--- a/src/dashboard/apigateway/apigateway/biz/resource/models.py
+++ b/src/dashboard/apigateway/apigateway/biz/resource/models.py
@@ -48,7 +48,6 @@ class ResourceData(BaseModel):
     method: str = Field(...)
     path: str = Field(...)
     match_subpath: bool = Field(default=False)
-    enable_websocket: bool = Field(default=False)
     is_public: bool = Field(default=True)
     allow_apply_permission: bool = Field(default=True)
     # auth config
@@ -81,7 +80,6 @@ def basic_field_names() -> List[str]:
             "method",
             "path",
             "match_subpath",
-            "enable_websocket",
             "is_public",
             "allow_apply_permission",
         ]
@@ -97,7 +95,6 @@ def snapshot(self) -> Dict[str, Any]:
             "method": self.method,
             "path": self.path,
             "match_subpath": self.match_subpath,
-            "enable_websocket": self.enable_websocket,
             "is_public": self.is_public,
             "allow_apply_permission": self.allow_apply_permission,
             "auth_config": self.auth_config.dict(),
@@ -113,7 +110,6 @@ def snapshot_for_checking(self) -> Dict[str, Any]:
             "method": self.method,
             "path": self.path,
             "match_subpath": self.match_subpath,
-            "enable_websocket": self.enable_websocket,
             "is_public": self.is_public,
             "allow_apply_permission": self.allow_apply_permission,
             "auth_config": self.auth_config.dict(),
diff --git a/src/dashboard/apigateway/apigateway/biz/resource/resource.py b/src/dashboard/apigateway/apigateway/biz/resource/resource.py
index c01905aac..b21d628f0 100644
--- a/src/dashboard/apigateway/apigateway/biz/resource/resource.py
+++ b/src/dashboard/apigateway/apigateway/biz/resource/resource.py
@@ -103,7 +103,6 @@ def snapshot(
             "method": resource.method,
             "path": resource.path,
             "match_subpath": resource.match_subpath,
-            "enable_websocket": resource.enable_websocket,
             "is_public": resource.is_public,
             "allow_apply_permission": resource.allow_apply_permission,
             "created_time": time.format(resource.created_time),
diff --git a/src/dashboard/apigateway/apigateway/biz/resource_label.py b/src/dashboard/apigateway/apigateway/biz/resource_label.py
index 00c0646dd..0be26db52 100644
--- a/src/dashboard/apigateway/apigateway/biz/resource_label.py
+++ b/src/dashboard/apigateway/apigateway/biz/resource_label.py
@@ -45,22 +45,6 @@ def get_labels(resource_ids: List[int]) -> Dict[int, List]:
 
         return resource_labels
 
-    @staticmethod
-    def get_labels_by_ids(label_ids: List[int]) -> Dict[int, List]:
-        queryset = ResourceLabel.objects.filter(api_label_id__in=label_ids).values(
-            "api_label_id", "api_label__name", "resource_id"
-        )
-        resource_labels = defaultdict(list)
-        for label in queryset:
-            resource_labels[label["resource_id"]].append(
-                {
-                    "id": label["api_label_id"],
-                    "name": label["api_label__name"],
-                }
-            )
-
-        return resource_labels
-
     @staticmethod
     def get_gateway_label_ids(resource_id: int) -> List[int]:
         return list(ResourceLabel.objects.filter(resource_id=resource_id).values_list("api_label_id", flat=True))
diff --git a/src/dashboard/apigateway/apigateway/biz/sdk/gateway_sdk.py b/src/dashboard/apigateway/apigateway/biz/sdk/gateway_sdk.py
index 5a1362a0d..38b0b2d8b 100644
--- a/src/dashboard/apigateway/apigateway/biz/sdk/gateway_sdk.py
+++ b/src/dashboard/apigateway/apigateway/biz/sdk/gateway_sdk.py
@@ -90,17 +90,3 @@ def get_resource_version_sdk_count_map(resource_version_ids: List[int]):
             .annotate(count=Count("id"))
         )
         return {item["resource_version_id"]: item["count"] for item in queryset}
-
-    @staticmethod
-    def get_sdks(gateway_ids: List[int]) -> Dict[int, List[Dict]]:
-        data: Dict[int, List[Dict]] = {}
-        queryset = GatewaySDK.objects.filter(gateway_id__in=gateway_ids, is_recommended=True)
-        for sdk in queryset:
-            sdk_dict = SDKFactory().create(sdk).as_dict()
-            gateway_id = sdk.gateway.id
-            if gateway_id not in data:
-                data[gateway_id] = [sdk_dict]
-            else:
-                data[gateway_id].append(sdk_dict)
-
-        return data
diff --git a/src/dashboard/apigateway/apigateway/common/permissions/__init__.py b/src/dashboard/apigateway/apigateway/common/permissions/__init__.py
index 7039fe0c0..1afc40046 100644
--- a/src/dashboard/apigateway/apigateway/common/permissions/__init__.py
+++ b/src/dashboard/apigateway/apigateway/common/permissions/__init__.py
@@ -15,4 +15,4 @@
 # We undertake not to change the open source license (MIT license) applicable
 # to the current version of the project delivered to anyone in the future.
 #
-from .permissions import GatewayPermission, GatewayDisplayablePermission  # noqa
+from .permissions import GatewayPermission, GatewayRelatedAppPermission, GatewayDisplayablePermission  # noqa
diff --git a/src/dashboard/apigateway/apigateway/common/permissions/permissions.py b/src/dashboard/apigateway/apigateway/common/permissions/permissions.py
index 3178075a7..8eb8ffb93 100644
--- a/src/dashboard/apigateway/apigateway/common/permissions/permissions.py
+++ b/src/dashboard/apigateway/apigateway/common/permissions/permissions.py
@@ -22,7 +22,8 @@
 from rest_framework import permissions
 
 from apigateway.core.constants import GatewayStatusEnum
-from apigateway.core.models import Gateway
+from apigateway.core.models import Gateway, GatewayRelatedApp
+from apigateway.utils.django import get_object_or_None
 
 
 class GatewayPermission(permissions.BasePermission):
@@ -33,6 +34,10 @@ class GatewayPermission(permissions.BasePermission):
     message = gettext_lazy("当前用户无访问网关权限")
 
     def has_permission(self, request, view):
+        # openapi 的请求来源必须是网关，此时经过网关的中间件（所有都开启了应用认证）, 请求中会注入 app 对象
+        if getattr(view, "request_from_gateway_required", False) and not hasattr(request, "app"):
+            return False
+
         gateway_obj = self.get_gateway_object(view)
 
         # FIXME: 可能的越权，待重构 open api 之后，确认剩下的逻辑哪里有需要这个的
@@ -63,6 +68,49 @@ def get_gateway_object(self, view):
         return get_object_or_404(Gateway, **filter_kwargs)
 
 
+class GatewayRelatedAppPermission(permissions.BasePermission):
+    """
+    获取网关并验证应用是否有操作网关的权限
+    """
+
+    message = gettext_lazy("应用无操作网关权限")
+
+    def has_permission(self, request, view):
+        # openapi 的请求来源必须是网关，此时经过网关的中间件（所有都开启了应用认证）, 请求中会注入 app 对象
+        if not hasattr(request, "app"):
+            return False
+
+        gateway_obj = self.get_gateway_object(view)
+        # NOTE: only for GatewaySyncApi /<slug:gateway_name>/sync/, at that time, the gateway_obj is None
+        # should be refactored in the future 新版 openapi 不要这么设计了
+        if not gateway_obj and getattr(view, "allow_gateway_not_exist", False):
+            return True
+
+        if not gateway_obj:
+            raise Http404
+
+        request.gateway = gateway_obj
+
+        # 跳过网关权限校验
+        if getattr(view, "gateway_permission_exempt", False):
+            return True
+
+        return GatewayRelatedApp.objects.filter(gateway=request.gateway, bk_app_code=request.app.app_code).exists()
+
+    def get_gateway_object(self, view):
+        """
+        根据路径参数 gateway_name 获取网关对象
+        若 gateway_name 不在路径参数中，或网关不存在，返回 None
+        """
+        lookup_url_kwarg = "gateway_name"
+
+        if lookup_url_kwarg not in view.kwargs:
+            return None
+
+        filter_kwargs = {"name": view.kwargs[lookup_url_kwarg]}
+        return get_object_or_None(Gateway, **filter_kwargs)
+
+
 class GatewayDisplayablePermission(permissions.BasePermission):
     """
     校验网关是否可公开展示
diff --git a/src/dashboard/apigateway/apigateway/conf/default.py b/src/dashboard/apigateway/apigateway/conf/default.py
index dc88fbabc..a159fffdd 100644
--- a/src/dashboard/apigateway/apigateway/conf/default.py
+++ b/src/dashboard/apigateway/apigateway/conf/default.py
@@ -572,16 +572,6 @@
 
 PYPI_MIRRORS_REPOSITORY = env.str("PYPI_INDEX_URL", "https://pypi.org/simple/")
 
-# maven 仓库配置
-MAVEN_MIRRORS_CONFIG = {
-    "default": {
-        "repository_url": env.str("DEFAULT_MAVEN_REPOSITORY_URL", ""),
-        "repository_id": env.str("DEFAULT_MAVEN_REPOSITORY_URL", "bkpaas-maven"),
-        "username": env.str("DEFAULT_MAVEN_USERNAME", "bk_apigateway"),
-        "password": env.str("DEFAULT_MAVEN_PASSWORD", "bk_apigateway"),
-    }
-}
-
 # ==============================================================================
 # 蓝鲸通知中心配置
 # ==============================================================================
diff --git a/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/convertors/resource.py b/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/convertors/resource.py
index 252622405..d8f2f3184 100644
--- a/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/convertors/resource.py
+++ b/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/convertors/resource.py
@@ -103,7 +103,6 @@ def _convert_http_resource(self, resource: Dict[str, Any]) -> Optional[BkGateway
                 uri=resource["path"],
                 methods=methods,
                 match_subpath=resource_proxy.get("match_subpath", False),
-                enable_websocket=resource.get("enable_websocket", False),
                 # 此处会覆盖 upstream 定义的超时，最终以这里为准
                 timeout=self._convert_http_resource_timeout(resource_proxy),
                 rewrite=self._convert_http_resource_rewrite(resource_proxy),
@@ -132,7 +131,6 @@ def _get_release_version_route_resource_crd(self) -> BkGatewayResource:
             "method": "GET",
             "path": "/__apigw_version",
             "match_subpath": False,
-            "enable_websocket": False,
             "is_public": False,
             "allow_apply_permission": False,
             "proxy": {
@@ -161,7 +159,6 @@ def _get_release_version_route_resource_crd(self) -> BkGatewayResource:
                 uri=resource["path"],
                 methods=[resource["method"]],
                 match_subpath=False,
-                enable_websocket=False,
                 timeout=self._convert_http_resource_timeout({"timeout": 60}),
                 rewrite=ResourceRewrite(enabled=False),
                 plugins=plugins,
diff --git a/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/models/gateway_resource.py b/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/models/gateway_resource.py
index c36d5456d..04d5728f2 100644
--- a/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/models/gateway_resource.py
+++ b/src/dashboard/apigateway/apigateway/controller/crds/v1beta1/models/gateway_resource.py
@@ -62,7 +62,6 @@ class BkGatewayResourceSpec(GatewayCustomResourceSpec):
     timeout: Optional[TimeoutConfig] = Field(default=None, description="超时配置")
     uri: str = Field(default="/", description="请求路径")
     match_subpath: bool = Field(default=False, alias="matchSubPath", description="是否匹配子路径")
-    enable_websocket: bool = Field(default=False, alias="enableWebsocket", description="是否启用 WebSocket")
     # is_public: bool = Field(default=False, alias="isPublic", description="是否公开")
     # allow_apply_permission: bool = Field(default=False, alias="allowApplyPermission", description="是否允许申请权限")
     upstream: Optional[Upstream] = Field(default_factory=Upstream, description="上游配置")
diff --git a/src/dashboard/apigateway/apigateway/core/managers.py b/src/dashboard/apigateway/apigateway/core/managers.py
index ac9378a26..93241947f 100644
--- a/src/dashboard/apigateway/apigateway/core/managers.py
+++ b/src/dashboard/apigateway/apigateway/core/managers.py
@@ -98,7 +98,6 @@ def get_resources(self, gateway_id: int, id: int) -> Dict[int, dict]:
                 "method": resource["method"],
                 "path": resource["path"],
                 "match_subpath": resource.get("match_subpath", False),
-                "enable_websocket": resource.get("enable_websocket", False),
                 "is_public": resource["is_public"],
                 "disabled_stages": resource.get("disabled_stages") or [],
                 "allow_apply_permission": resource.get("allow_apply_permission", True),
@@ -322,7 +321,6 @@ def _parse_released_resource(self, released_resource):
             "method": resource["method"],
             "path": resource["path"],
             "match_subpath": resource.get("match_subpath", False),
-            "enable_websocket": resource.get("enable_websocket", False),
             "is_public": resource["is_public"],
             "disabled_stages": resource.get("disabled_stages") or [],
             "allow_apply_permission": resource.get("allow_apply_permission", True),
diff --git a/src/dashboard/apigateway/apigateway/core/migrations/0041_auto_20240826_1737.py b/src/dashboard/apigateway/apigateway/core/migrations/0041_auto_20240826_1737.py
deleted file mode 100644
index 5e92d6459..000000000
--- a/src/dashboard/apigateway/apigateway/core/migrations/0041_auto_20240826_1737.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.25 on 2024-08-26 09:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0040_auto_20240517_1422'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='resource',
-            name='enable_websocket',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/src/dashboard/apigateway/apigateway/core/models.py b/src/dashboard/apigateway/apigateway/core/models.py
index ec5e0bd8e..4643f2774 100644
--- a/src/dashboard/apigateway/apigateway/core/models.py
+++ b/src/dashboard/apigateway/apigateway/core/models.py
@@ -197,7 +197,6 @@ class Resource(TimestampedModelMixin, OperatorModelMixin):
     method = models.CharField(max_length=10, choices=RESOURCE_METHOD_CHOICES, blank=False, null=False)
     path = models.CharField(max_length=2048, blank=False, null=False)
     match_subpath = models.BooleanField(default=False)
-    enable_websocket = models.BooleanField(default=False)
 
     # only one proxy is activated
     proxy_id = models.IntegerField(blank=False, null=False)
diff --git a/src/dashboard/apigateway/apigateway/data/apidocs/zh/get_released_resources.md b/src/dashboard/apigateway/apigateway/data/apidocs/zh/get_released_resources.md
index 015dd17cd..7411886b3 100644
--- a/src/dashboard/apigateway/apigateway/data/apidocs/zh/get_released_resources.md
+++ b/src/dashboard/apigateway/apigateway/data/apidocs/zh/get_released_resources.md
@@ -52,7 +52,6 @@ result = client.api.get_released_resources(
                 "method": "GET",
                 "url": "https://bkapi.example.com/api/echo/prod/echo/",
                 "match_subpath": false,
-                "enable_websocket": false,
                 "app_verified_required": false,
                 "resource_perm_required": false,
                 "user_verified_required": false
@@ -89,7 +88,6 @@ data.results 中字段说明
 | method                 | string   | 资源请求方法                                                        |
 | url                    | string   | 资源请求地址                                                        |
 | match_subpath          | boolean  | 是否匹配子路径，如果匹配，则路径为 /echo/ 时，支持匹配 /echo/other/ |
-| enable_websocket       | boolean  | 是否开启 websocket |
 | app_verified_required  | boolean  | 是否认证应用                                                        |
 | resource_perm_required | boolean  | 是否校验访问权限，如果校验，则应用需申请资源访问权限                |
 | user_verified_required | boolean  | 是否认证用户                                                        |
\ No newline at end of file
diff --git a/src/dashboard/apigateway/apigateway/data/apigw-definitions/bk-apigateway-inner-resources.yaml b/src/dashboard/apigateway/apigateway/data/apigw-definitions/bk-apigateway-inner-resources.yaml
index de0a3319c..5e63d4276 100644
--- a/src/dashboard/apigateway/apigateway/data/apigw-definitions/bk-apigateway-inner-resources.yaml
+++ b/src/dashboard/apigateway/apigateway/data/apigw-definitions/bk-apigateway-inner-resources.yaml
@@ -146,26 +146,6 @@ paths:
         authConfig:
           userVerifiedRequired: false
         disabledStages: []
-  /api/v1/apis/permissions/apply/:
-    post:
-      operationId: apply_permission
-      description: '批量申请权限(网关+资源)'
-      tags: []
-      x-bk-apigateway-resource:
-        isPublic: false
-        allowApplyPermission: false
-        matchSubpath: false
-        backend:
-          type: HTTP
-          method: post
-          path: /backend/api/v1/apis/permissions/apply/
-          matchSubpath: false
-          timeout: 0
-          upstreams: {}
-          transformHeaders: {}
-        authConfig:
-          userVerifiedRequired: false
-        disabledStages: []
   /api/v1/apis/{api_id}/:
     get:
       operationId: get_api
diff --git a/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_doc.md b/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_doc.md
deleted file mode 100644
index 3492119c1..000000000
--- a/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_doc.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## Installing
-
-### maven
-```
-<dependency>
-    <groupId>com.tencent.bkapi</groupId>
-    <artifactId>{gateway_name}</artifactId>
-    <version>{sdk_version}</version>
-</dependency>
-```
-
-### grade
-
-```
-implementation 'com.tencent.bkapi:{gateway_name}:{sdk_version}'
-
-```
-
-## Using the SDK
-
-Assuming the gateway API {{resource_name}} exists under gateway {{gateway_name}}
-
-
-{% include "api_sdk/en/java_sdk_usage_example.md" %}
diff --git a/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_usage_example.md b/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_usage_example.md
deleted file mode 100644
index 1199e1ea7..000000000
--- a/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_usage_example.md
+++ /dev/null
@@ -1 +0,0 @@
-{% include "api_sdk/en/java_sdk_usage_example_bkapi.md" %}
diff --git a/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_usage_example_bkapi.md b/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_usage_example_bkapi.md
deleted file mode 100644
index 6aed4bc55..000000000
--- a/src/dashboard/apigateway/apigateway/templates/api_sdk/en/java_sdk_usage_example_bkapi.md
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Create a gateway {{gateway_name}} client and call the API {{resource_name}} Example of use：
-
-```java
-package demo;
-
-import com.tencent.bkapi.{{gateway_name}}.Client;
-import com.tencent.bkapi.{{gateway_name}}.RequestParams;
-import okhttp3.Response;
-
-import java.util.Map;
-
-public class Demo {
-    public static void main(String[] args) {
-        try {
-            Client client = new Client("https://example.apigw.com/prod/");
-
-            // Build request parameters
-            RequestParams params = new RequestParams.Builder()
-                    .setData(Map.of())  // Set request parameters
-                    .setPathParams(Map.of())  // Set path parameters
-                    .setQueryParams(Map.of())  // Set querystring
-                    .setHeaders(Map.of())  // Set request headers
-                    .setTimeout(10)  // Set timeout
-                    .setBkAppCode("x")  // Set application authentication
-                    .setBkAppSecret("y")  // Set application authentication
-                    .setBkToken("z")  // Set user authentication
-                    .build();
-
-            // Make the request
-            Response response = client.{{resource_name}}(params);
-
-            // Handle the response
-            if (response.isSuccessful()) {
-                System.out.println("Response: " + response.body().string());
-            } else {
-                System.err.println("Request failed: " + response.code());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
-
-```
-
-The above is only an example, please modify the parameters and the way they are called according to the actual use.
-
-### 3. Note
-
-The `endpoint` parameter when creating a gateway can be found in the specific gateway profile for the corresponding access address. If it is not set, it will automatically be probed using the following.
diff --git a/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_doc.md b/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_doc.md
deleted file mode 100644
index 24a4dbb52..000000000
--- a/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_doc.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## 安装
-
-### maven
-```
-<dependency>
-    <groupId>com.tencent.bkapi</groupId>
-    <artifactId>{gateway_name}</artifactId>
-    <version>{sdk_version}</version>
-</dependency>
-```
-
-### grade
-
-```
-implementation 'com.tencent.bkapi:{gateway_name}:{sdk_version}'
-
-```
-
-## 使用 SDK
-
-假定网关 {{gateway_name}} 下存在网关 API {{resource_name}}。
-
-
-{% include "api_sdk/zh-hans/python_sdk_usage_example.md" %}
diff --git a/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_usage_example.md b/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_usage_example.md
deleted file mode 100644
index 112fa26e0..000000000
--- a/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_usage_example.md
+++ /dev/null
@@ -1 +0,0 @@
-{% include "api_sdk/zh-hans/java_sdk_usage_example_bkapi.md" %}
diff --git a/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_usage_example_bkapi.md b/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_usage_example_bkapi.md
deleted file mode 100644
index 7b79a015b..000000000
--- a/src/dashboard/apigateway/apigateway/templates/api_sdk/zh-hans/java_sdk_usage_example_bkapi.md
+++ /dev/null
@@ -1,50 +0,0 @@
-{% load json_filters %}
-创建网关 {{gateway_name}} Client 并调用 API 资源 {{resource_name}} 使用示例：
-
-```java
-package demo;
-
-import com.tencent.bkapi.{{gateway_name}}.Client;
-import com.tencent.bkapi.{{gateway_name}}.RequestParams;
-import okhttp3.Response;
-
-import java.util.Map;
-
-public class Demo {
-    public static void main(String[] args) {
-        try {
-            Client client = new Client("https://example.apigw.com/prod/");
-
-            // Build request parameters
-            RequestParams params = new RequestParams.Builder()
-                    .setData(Map.of())  // 设置请求参数
-                    .setPathParams(Map.of())  // 设置路径参数
-                    .setQueryParams(Map.of())  // 设置 querystring
-                    .setHeaders(Map.of())  // 设置请求头
-                    .setTimeout(10)  // 设置超时
-                    .setBkAppCode("x")  // 设置应用认证
-                    .setBkAppSecret("y")  // 设置应用认证
-                    .setBkToken("z")  // 设置用户认证
-                    .build();
-
-            // Make the request
-            Response response = client.{{resource_name}}(params);
-
-            // Handle the response
-            if (response.isSuccessful()) {
-                System.out.println("Response: " + response.body().string());
-            } else {
-                System.err.println("Request failed: " + response.code());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
-```
-
-以上仅为示例，具体参数及调用方式请按实际用途修改。
-
-### 3. 注意事项
-
-创建网关时的 `endpoint` 参数可在具体的网关简介中找到对应的访问地址。
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/conftest.py b/src/dashboard/apigateway/apigateway/tests/apis/open/conftest.py
index cc7dad8c8..05cc14488 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/conftest.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/open/conftest.py
@@ -21,6 +21,6 @@
 @pytest.fixture()
 def ignore_related_app_permission(mocker):
     mocker.patch(
-        "apigateway.apis.open.permissions.OpenAPIGatewayRelatedAppPermission.has_permission",
+        "apigateway.common.permissions.permissions.GatewayRelatedAppPermission.has_permission",
         return_value=True,
     )
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/gateway/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/open/gateway/test_views.py
index 0b0e5b63c..621336022 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/gateway/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/open/gateway/test_views.py
@@ -31,7 +31,7 @@
 @pytest.fixture()
 def disable_app_permission(mocker):
     mocker.patch(
-        "apigateway.apis.open.gateway.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+        "apigateway.apis.open.gateway.views.GatewayRelatedAppPermission.has_permission",
         return_value=True,
     )
 
@@ -76,7 +76,7 @@ def test_retrieve(self, request_to_view, request_factory, fake_gateway):
         response = request_to_view(
             request,
             view_name="openapi.gateway.retrieve",
-            path_params={"gateway_id": fake_gateway.id},
+            path_params={"id": fake_gateway.id},
         )
         result = get_response_json(response)
 
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/permission/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/open/permission/test_views.py
index d32eb875c..743efd689 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/permission/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/open/permission/test_views.py
@@ -23,7 +23,6 @@
 
 from apigateway.apis.open.permission import views
 from apigateway.apps.permission import models
-from apigateway.core.models import Gateway
 from apigateway.tests.utils.testing import get_response_json
 
 pytestmark = pytest.mark.django_db
@@ -32,7 +31,7 @@
 @pytest.fixture(autouse=True)
 def disable_api_related_app_permission_check(mocker):
     mocker.patch(
-        "apigateway.apis.open.permission.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+        "apigateway.apis.open.permission.views.GatewayRelatedAppPermission.has_permission",
         return_value=True,
     )
 
@@ -132,20 +131,14 @@ class TestResourceViewSet:
     def test_list(
         self,
         mocker,
-        # fake_gateway,
+        fake_gateway,
         request_factory,
         is_active_and_public,
         mocked_resources,
         mocked_resource_permissions,
         expected,
     ):
-        fake_gateway = G(
-            Gateway,
-            name="test",
-            _maintainers="admin",
-            status=1,
-            is_public=True,
-        )
+        fake_gateway.name = "test"
 
         if mocked_resources:
             for d in mocked_resources:
@@ -186,7 +179,7 @@ def test_list(
         request.app = mock.MagicMock(app_code="test")
 
         view = views.ResourceViewSet.as_view({"get": "list"})
-        response = view(request, gateway_id=fake_gateway.id)
+        response = view(request)
 
         result = get_response_json(response)
         assert result["data"] == expected
@@ -294,7 +287,7 @@ def test_retrieve(self, mocker, request_factory, unique_id, fake_gateway):
 class TestAppPermissionGrantViewSet:
     def test_grant(self, mocker, request_factory, fake_gateway):
         mocker.patch(
-            "apigateway.apis.open.permission.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+            "apigateway.apis.open.permission.views.GatewayRelatedAppPermission.has_permission",
             return_value=True,
         )
         request = request_factory.post(
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/released/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/open/released/test_views.py
index 9b375919e..ba8595cdb 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/released/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/open/released/test_views.py
@@ -198,7 +198,6 @@ def test_list(
         self,
         mocker,
         request_factory,
-        request_to_view,
         fake_gateway,
         stage_name,
         mocked_resources,
@@ -219,7 +218,7 @@ def test_list(
         request.app = mock.MagicMock(app_code="test")
 
         view = views.ReleasedResourceListApi.as_view()
-        response = view(request, gateway_id=fake_gateway.id, stage_name=stage_name)
+        response = view(request, stage_name)
         result = get_response_json(response)
 
         assert result["code"] == 0
@@ -246,7 +245,6 @@ class TestReleasedResourceListByGatewayNameApi:
                         "method": "GET",
                         "path": "/test/",
                         "match_subpath": False,
-                        "enable_websocket": False,
                         "app_verified_required": True,
                         "resource_perm_required": True,
                         "user_verified_required": True,
@@ -258,7 +256,6 @@ class TestReleasedResourceListByGatewayNameApi:
                         "method": "POST",
                         "path": "/test/",
                         "match_subpath": False,
-                        "enable_websocket": False,
                         "app_verified_required": False,
                         "resource_perm_required": False,
                         "user_verified_required": False,
@@ -276,7 +273,6 @@ class TestReleasedResourceListByGatewayNameApi:
                             "method": "GET",
                             "url": "http://bkapi.example.com/test/",
                             "match_subpath": False,
-                            "enable_websocket": False,
                             "app_verified_required": True,
                             "resource_perm_required": True,
                             "user_verified_required": True,
@@ -288,7 +284,6 @@ class TestReleasedResourceListByGatewayNameApi:
                             "method": "POST",
                             "url": "http://bkapi.example.com/test/",
                             "match_subpath": False,
-                            "enable_websocket": False,
                             "app_verified_required": False,
                             "resource_perm_required": False,
                             "user_verified_required": False,
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/resource_version/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/open/resource_version/test_views.py
index b5df99d67..ef3e1c3d8 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/resource_version/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/open/resource_version/test_views.py
@@ -31,7 +31,7 @@ class TestResourceVersionListCreateApi:
     @pytest.fixture(autouse=True)
     def setup_fixtures(self, mocker):
         mocker.patch(
-            "apigateway.apis.open.resource_version.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+            "apigateway.apis.open.resource_version.views.GatewayRelatedAppPermission.has_permission",
             return_value=True,
         )
 
@@ -89,7 +89,7 @@ class TestResourceVersionReleaseApi:
     @pytest.fixture(autouse=True)
     def setup_fixtures(self, mocker):
         mocker.patch(
-            "apigateway.apis.open.resource_version.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+            "apigateway.apis.open.resource_version.views.GatewayRelatedAppPermission.has_permission",
             return_value=True,
         )
 
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/stage/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/open/stage/test_views.py
index a6c8715a9..4f54d33f3 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/stage/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/open/stage/test_views.py
@@ -43,7 +43,7 @@ def test_list(self, request_factory, fake_gateway):
 
         # have 2 active stages
         view = views.StageViewSet.as_view({"get": "list"})
-        response = view(request, gateway_id=fake_gateway.id)
+        response = view(request)
         result = get_response_json(response)
 
         assert result["code"] == 0
@@ -66,11 +66,11 @@ def test_list(self, request_factory, fake_gateway):
         s2.save()
 
         view = views.StageViewSet.as_view({"get": "list"})
-        response = view(request, gateway_id=fake_gateway.id)
+        response = view(request)
         result = get_response_json(response)
 
-        assert response.status_code == 200
         assert result["code"] == 0
+        assert response.status_code == 200
         assert result["data"] == [
             {
                 "id": s1.id,
@@ -92,8 +92,8 @@ def test_list_by_gateway_name(self, request_to_view, request_factory, fake_gatew
 
         result = get_response_json(response)
 
-        assert response.status_code == 200
         assert result["code"] == 0
+        assert response.status_code == 200
         assert result["data"] == [
             {
                 "id": stage.id,
@@ -138,7 +138,7 @@ def list_stages_with_resource_version(self, request_to_view, request_factory, fa
 class TestStageSyncViewSet:
     def test_sync(self, mocker, unique_gateway_name, request_factory):
         mocker.patch(
-            "apigateway.apis.open.stage.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+            "apigateway.apis.open.stage.views.GatewayRelatedAppPermission.has_permission",
             return_value=True,
         )
 
@@ -183,7 +183,7 @@ def test_sync(self, mocker, unique_gateway_name, request_factory):
 
     def test_sync_backends(self, fake_plugin_type_bk_header_rewrite, mocker, unique_gateway_name, request_factory):
         mocker.patch(
-            "apigateway.apis.open.stage.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+            "apigateway.apis.open.stage.views.GatewayRelatedAppPermission.has_permission",
             return_value=True,
         )
 
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/support/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/open/support/test_views.py
index 725bf2b05..08e3d77b1 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/support/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/open/support/test_views.py
@@ -33,7 +33,7 @@
 @pytest.fixture()
 def has_related_app_permission(mocker):
     mocker.patch(
-        "apigateway.apis.open.permission.views.OpenAPIGatewayRelatedAppPermission.has_permission",
+        "apigateway.apis.open.permission.views.GatewayRelatedAppPermission.has_permission",
         return_value=True,
     )
 
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/open/test_permissions.py b/src/dashboard/apigateway/apigateway/tests/apis/open/test_permissions.py
deleted file mode 100644
index 07fdf9122..000000000
--- a/src/dashboard/apigateway/apigateway/tests/apis/open/test_permissions.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# TencentBlueKing is pleased to support the open source community by making
-# 蓝鲸智云 - API 网关(BlueKing - APIGateway) available.
-# Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
-# Licensed under the MIT License (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-#     http://opensource.org/licenses/MIT
-#
-# Unless required by applicable law or agreed to in writing, software distributed under
-# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-# either express or implied. See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# We undertake not to change the open source license (MIT license) applicable
-# to the current version of the project delivered to anyone in the future.
-#
-from unittest import mock
-
-import pytest
-from django.http import Http404
-from rest_framework import viewsets
-
-from apigateway.apis.open.permissions import (
-    OpenAPIGatewayIdPermission,
-    OpenAPIGatewayNamePermission,
-    OpenAPIGatewayRelatedAppPermission,
-    OpenAPIPermission,
-)
-from apigateway.utils.responses import OKJsonResponse
-
-pytestmark = pytest.mark.django_db
-
-
-class TestOpenAPIPermission:
-    class APINameViewSet(viewsets.ViewSet):
-        permission_classes = [OpenAPIPermission]
-
-        def retrieve(self, request, api_name: str, *args, **kwargs):
-            return OKJsonResponse()
-
-    @pytest.mark.parametrize(
-        "has_app, expected",
-        [
-            (False, False),
-            (True, True),
-        ],
-    )
-    def test_has_permission(
-        self,
-        fake_request,
-        has_app,
-        expected,
-    ):
-        permission = OpenAPIPermission()
-        if has_app:
-            fake_request.app = mock.MagicMock(app_code="test")
-
-        view = self.APINameViewSet.as_view({"get": "retrieve"})
-        assert permission.has_permission(fake_request, view) == expected
-
-
-class TestOpenAPIGatewayIdPermission:
-    class APINameViewSet(viewsets.ViewSet):
-        permission_classes = [OpenAPIGatewayIdPermission]
-
-        def retrieve(self, request, api_name: str, *args, **kwargs):
-            return OKJsonResponse()
-
-    @pytest.mark.parametrize(
-        "with_fake_gateway, has_app, expected",
-        [
-            (True, False, False),
-            (False, True, Http404),
-            (True, True, True),
-        ],
-    )
-    def test_has_permission(
-        self,
-        mocker,
-        fake_request,
-        fake_gateway,
-        with_fake_gateway,
-        has_app,
-        expected,
-    ):
-        permission = OpenAPIGatewayIdPermission()
-
-        mocker.patch.object(permission, "get_gateway_object", return_value=fake_gateway if with_fake_gateway else None)
-        if has_app:
-            fake_request.app = mock.MagicMock(app_code="test")
-
-        view = self.APINameViewSet.as_view({"get": "retrieve"})
-        if expected == Http404:
-            with pytest.raises(Http404):
-                permission.has_permission(fake_request, view)
-            return
-
-        assert permission.has_permission(fake_request, view) == expected
-
-    def test_get_gateway_object(self, fake_gateway):
-        permission = OpenAPIGatewayIdPermission()
-        view = self.APINameViewSet.as_view({"get": "retrieve"})
-
-        view.kwargs = {}
-        result = permission.get_gateway_object(view)
-        assert result is None
-
-        view.kwargs = {"gateway_id": fake_gateway.id}
-        result = permission.get_gateway_object(view)
-        assert result == fake_gateway
-
-
-class TestOpenAPIGatewayNamePermission:
-    class APINameViewSet(viewsets.ViewSet):
-        permission_classes = [OpenAPIGatewayNamePermission]
-
-        def retrieve(self, request, api_name: str, *args, **kwargs):
-            return OKJsonResponse()
-
-    @pytest.mark.parametrize(
-        "with_fake_gateway, has_app, expected",
-        [
-            (True, False, False),
-            (False, True, Http404),
-            (True, True, True),
-        ],
-    )
-    def test_has_permission(
-        self,
-        mocker,
-        fake_request,
-        fake_gateway,
-        with_fake_gateway,
-        has_app,
-        expected,
-    ):
-        permission = OpenAPIGatewayNamePermission()
-
-        mocker.patch.object(permission, "get_gateway_object", return_value=fake_gateway if with_fake_gateway else None)
-        if has_app:
-            fake_request.app = mock.MagicMock(app_code="test")
-
-        view = self.APINameViewSet.as_view({"get": "retrieve"})
-        if expected == Http404:
-            with pytest.raises(Http404):
-                permission.has_permission(fake_request, view)
-            return
-
-        assert permission.has_permission(fake_request, view) == expected
-
-    def test_get_gateway_object(self, fake_gateway):
-        permission = OpenAPIGatewayNamePermission()
-        view = self.APINameViewSet.as_view({"get": "retrieve"})
-
-        view.kwargs = {}
-        result = permission.get_gateway_object(view)
-        assert result is None
-
-        view.kwargs = {"gateway_name": "not-exist"}
-        result = permission.get_gateway_object(view)
-        assert result is None
-
-        view.kwargs = {"gateway_name": fake_gateway.name}
-        result = permission.get_gateway_object(view)
-        assert result == fake_gateway
-
-
-class TestOpenAPIGatewayRelatedAppPermission:
-    class APINameViewSet(viewsets.ViewSet):
-        permission_classes = [OpenAPIGatewayRelatedAppPermission]
-
-        def retrieve(self, request, api_name: str, *args, **kwargs):
-            return OKJsonResponse()
-
-    @pytest.mark.parametrize(
-        "with_fake_gateway, allow_gateway_not_exist, mock_allow_manage, expected",
-        [
-            (False, True, False, True),
-            (False, False, False, Http404),
-            (True, False, False, False),
-            (True, False, True, True),
-        ],
-    )
-    def test_has_permission(
-        self,
-        mocker,
-        fake_request,
-        fake_gateway,
-        with_fake_gateway,
-        allow_gateway_not_exist,
-        mock_allow_manage,
-        expected,
-    ):
-        permission = OpenAPIGatewayRelatedAppPermission()
-
-        mocker.patch.object(permission, "get_gateway_object", return_value=fake_gateway if with_fake_gateway else None)
-        mocker.patch(
-            "apigateway.apis.open.permissions.GatewayRelatedApp.objects.filter",
-            return_value=mocker.MagicMock(exists=mocker.MagicMock(return_value=mock_allow_manage)),
-        )
-        fake_request.app = mock.MagicMock(app_code="test")
-
-        view = self.APINameViewSet.as_view({"get": "retrieve"})
-        view.allow_gateway_not_exist = allow_gateway_not_exist
-
-        if expected == Http404:
-            with pytest.raises(Http404):
-                permission.has_permission(fake_request, view)
-            return
-
-        assert permission.has_permission(fake_request, view) == expected
-
-    def test_get_gateway_object(self, fake_gateway):
-        permission = OpenAPIGatewayRelatedAppPermission()
-        view = self.APINameViewSet.as_view({"get": "retrieve"})
-
-        view.kwargs = {}
-        result = permission.get_gateway_object(view)
-        assert result is None
-
-        view.kwargs = {"gateway_name": "not-exist"}
-        result = permission.get_gateway_object(view)
-        assert result is None
-
-        view.kwargs = {"gateway_name": fake_gateway.name}
-        result = permission.get_gateway_object(view)
-        assert result == fake_gateway
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/docs/gateway/gateway/test_serializers.py b/src/dashboard/apigateway/apigateway/tests/apis/web/docs/gateway/gateway/test_serializers.py
index b1a3c8e5e..59c6c93de 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/docs/gateway/gateway/test_serializers.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/docs/gateway/gateway/test_serializers.py
@@ -28,7 +28,6 @@ def test_to_representation(self, settings, fake_gateway):
             fake_gateway,
             context={
                 "gateway_auth_configs": GatewayAuthContext().get_gateway_id_to_auth_config([fake_gateway.id]),
-                "gateway_sdks": {},
             },
         )
 
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_serializers.py b/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_serializers.py
index 84e647fc6..c9efea608 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_serializers.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_serializers.py
@@ -28,6 +28,7 @@ def test_validate(self):
                 "data": {
                     "stage_id": 1,
                     "resource_id": 1,
+                    "dimension": "all",
                     "metrics": "requests",
                     "time_start": 1,
                     "time_end": 2,
@@ -36,6 +37,7 @@ def test_validate(self):
                 "expected": {
                     "stage_id": 1,
                     "resource_id": 1,
+                    "dimension": "all",
                     "metrics": "requests",
                     "time_start": 1,
                     "time_end": 2,
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_views.py
index 2ad5d3b8c..97cba1452 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/metrics/test_views.py
@@ -46,7 +46,7 @@ def test_get_recommended_step(self, time_range_minutes, expected):
 class TestQueryRangeApi:
     def test_get(self, mocker, fake_stage, request_view):
         mocker.patch(
-            "apigateway.apis.web.metrics.views.MetricsFactory.create_metrics",
+            "apigateway.apis.web.metrics.views.DimensionMetricsFactory.create_dimension_metrics",
             return_value=mocker.Mock(query_range=mocker.Mock(return_value={"foo": "bar"})),
         )
 
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_serializers.py b/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_serializers.py
index ca1c7d60d..d21243fd2 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_serializers.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_serializers.py
@@ -16,16 +16,13 @@
 # We undertake not to change the open source license (MIT license) applicable
 # to the current version of the project delivered to anyone in the future.
 #
-
 import pytest
 from django.test import TestCase
 from django_dynamic_fixture import G
 from rest_framework.exceptions import ValidationError
 
 from apigateway.apis.web.permission import serializers
-from apigateway.apis.web.permission.views import AppPermissionQuerySetMixin
 from apigateway.apps.permission import models
-from apigateway.apps.permission.models import AppGatewayPermission, AppResourcePermission
 from apigateway.core.models import Gateway, Resource
 from apigateway.tests.utils.testing import create_request, dummy_time
 
@@ -79,7 +76,7 @@ def test_to_internal_value(self, fake_resource):
                 slz.is_valid(raise_exception=True)
 
 
-class TestAppPermissionOutputSLZ(TestCase):
+class TestAppGatewayPermissionOutputSLZ(TestCase):
     def test_to_representation(self):
         gateway = G(Gateway)
         resource = G(Resource, gateway=gateway, path="/echo/", method="GET")
@@ -91,6 +88,33 @@ def test_to_representation(self):
             expires=None,
         )
 
+        data = [
+            {
+                "instance": app_api_permission,
+                "expected": {
+                    "id": app_api_permission.id,
+                    "bk_app_code": "test",
+                    "resource_id": 0,
+                    "resource_name": "",
+                    "resource_path": "",
+                    "resource_method": "",
+                    "expires": None,
+                    "grant_type": "initialize",
+                    "renewable": False,
+                },
+            }
+        ]
+
+        for test in data:
+            slz = serializers.AppGatewayPermissionOutputSLZ(instance=test["instance"])
+            self.assertEqual(slz.data, test["expected"])
+
+
+class TestAppResourcePermissionOutputSLZ(TestCase):
+    def test_to_representation(self):
+        gateway = G(Gateway)
+        resource = G(Resource, gateway=gateway, path="/echo/", method="GET")
+
         app_resource_permission = G(
             models.AppResourcePermission,
             gateway=gateway,
@@ -101,41 +125,30 @@ def test_to_representation(self):
         )
         app_resource_permission.resource = resource
 
-        api_permissions = AppGatewayPermission.objects.filter(gateway=gateway).order_by("-id")
-        resource_permissions = AppResourcePermission.objects.filter(gateway=gateway).order_by("-id")
-        permissions = AppPermissionQuerySetMixin().get_app_permissions(api_permissions, resource_permissions)
-        slz = serializers.AppPermissionOutputSLZ(
-            permissions,
-            many=True,
-            context={
-                "resource_map": {resource.id: resource},
-            },
-        )
-        assert slz.data == [
-            {
-                "bk_app_code": "test",
-                "resource_id": 0,
-                "resource_name": "",
-                "resource_path": "",
-                "resource_method": "",
-                "expires": None,
-                "grant_dimension": "api",
-                "grant_type": "initialize",
-                "renewable": False,
-            },
+        data = [
             {
-                "bk_app_code": "test",
-                "resource_id": resource.id,
-                "resource_name": resource.name,
-                "resource_path": resource.path,
-                "resource_method": resource.method,
-                "expires": "2019-01-01 20:30:00",
-                "grant_dimension": "resource",
-                "grant_type": "apply",
-                "renewable": True,
+                "instance": app_resource_permission,
+                "expected": {
+                    "id": app_resource_permission.id,
+                    "bk_app_code": "test",
+                    "resource_id": resource.id,
+                    "resource_name": resource.name,
+                    "resource_path": "/echo/",
+                    "resource_method": "GET",
+                    "expires": dummy_time.str,
+                    "grant_type": "apply",
+                    "renewable": True,
+                },
             },
         ]
 
+        for test in data:
+            context = {}
+            if test["instance"] == app_resource_permission:
+                context["resource_map"] = {app_resource_permission.resource_id: resource}
+            slz = serializers.AppResourcePermissionOutputSLZ(instance=test["instance"], context=context)
+            self.assertEqual(slz.data, test["expected"])
+
 
 class TestAppPermissionIDsSLZ(TestCase):
     @classmethod
@@ -149,12 +162,8 @@ def test_to_internal_value(self):
         data = [
             {
                 "ids": [1, 2],
-                "expire_days": 0,
-            },
-            {
-                "ids": [1, 2, 3],
-                "expire_days": 0,
             },
+            {"ids": [1, 2, 3]},
         ]
         for test in data:
             slz = serializers.AppPermissionIDsSLZ(data=test)
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_views.py
index 7651c3bf5..067a1b69b 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/permission/test_views.py
@@ -32,7 +32,11 @@
 pytestmark = pytest.mark.django_db
 
 
-class TestAppPermissionViewSet:
+class TestAppResourcePermissionViewSet:
+    @pytest.fixture(autouse=True)
+    def setup_fixtures(self, mocker):
+        mocker.patch("apigateway.apis.web.permission.serializers.BKAppCodeValidator.__call__")
+
     def test_list(self, fake_resource, request_view):
         fake_gateway = fake_resource.gateway
 
@@ -51,12 +55,6 @@ def test_list(self, fake_resource, request_view):
             grant_type="apply",
         )
 
-        G(
-            models.AppGatewayPermission,
-            gateway=fake_gateway,
-            bk_app_code="test",
-        )
-
         data = [
             {
                 "params": {
@@ -73,7 +71,7 @@ def test_list(self, fake_resource, request_view):
         for test in data:
             response = request_view(
                 "GET",
-                "permissions.app-permissions.list",
+                "permissions.app-resource-permissions",
                 path_params={"gateway_id": fake_gateway.id},
                 gateway=fake_gateway,
                 data=test["params"],
@@ -83,8 +81,6 @@ def test_list(self, fake_resource, request_view):
             assert response.status_code == 200, result
             assert result["data"]["count"] == test["expected"]["count"]
 
-
-class TestAppResourcePermissionViewSet:
     def test_create(self, mocker, request_view, fake_resource):
         mocker.patch("apigateway.apps.permission.models.generate_expire_time", return_value=dummy_time.time)
         fake_gateway = fake_resource.gateway
@@ -131,6 +127,40 @@ class TestAppGatewayPermissionViewSet:
     def setup_fixtures(self, mocker):
         mocker.patch("apigateway.apis.web.permission.serializers.BKAppCodeValidator.__call__")
 
+    def test_list(self, fake_resource, request_view):
+        fake_gateway = fake_resource.gateway
+
+        G(
+            models.AppGatewayPermission,
+            gateway=fake_gateway,
+            bk_app_code="test",
+        )
+
+        data = [
+            {
+                "params": {
+                    "bk_app_code": "test",
+                    "grant_type": "initialize",
+                },
+                "expected": {
+                    "count": 1,
+                },
+            }
+        ]
+
+        for test in data:
+            response = request_view(
+                "GET",
+                "permissions.app-gateway-permissions",
+                path_params={"gateway_id": fake_gateway.id},
+                gateway=fake_gateway,
+                data=test["params"],
+            )
+
+            result = response.json()
+            assert response.status_code == 200, result
+            assert result["data"]["count"] == test["expected"]["count"]
+
     def test_create(self, mocker, request_view, fake_resource):
         mocker.patch("apigateway.apps.permission.models.generate_expire_time", return_value=dummy_time.time)
         fake_gateway = fake_resource.gateway
@@ -193,7 +223,6 @@ def test_renew(self):
             {
                 "params": {
                     "ids": [perm_2.id],
-                    "expire_days": 180,
                 },
             },
         ]
@@ -271,10 +300,7 @@ def test_renew(self):
 
         data = [
             {
-                "params": {
-                    "ids": [perm_1.id],
-                    "expire_days": 180,
-                },
+                "params": {"ids": [perm_1.id]},
             },
         ]
 
@@ -310,7 +336,6 @@ def test_destroy(self):
         data = [
             {
                 "ids": [perm_1.id],
-                "expire_days": 180,
             },
         ]
 
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/resource/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/web/resource/test_views.py
index 734fab7c9..fbfb7e92e 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/resource/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/resource/test_views.py
@@ -469,7 +469,6 @@ class TestResourceImportCheckApi:
                         "is_public": True,
                         "allow_apply_permission": True,
                         "doc": [],
-                        "enable_websocket": False,
                         "auth_config": {
                             "auth_verified_required": True,
                             "app_verified_required": True,
@@ -546,7 +545,6 @@ class TestResourceImportCheckApi:
                         "is_public": True,
                         "allow_apply_permission": True,
                         "doc": [],
-                        "enable_websocket": False,
                         "auth_config": {
                             "auth_verified_required": True,
                             "app_verified_required": True,
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py
index 3a10a2925..b1c944688 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_serializers.py
@@ -129,7 +129,6 @@ def test_to_representation_v1(
                     "description_en": fake_resource_version_v1.data[0]["description_en"],
                     "gateway_label_ids": fake_resource_version_v1.data[0]["api_labels"],
                     "match_subpath": fake_resource_version_v1.data[0]["match_subpath"],
-                    "enable_websocket": fake_resource_version_v1.data[0]["enable_websocket"],
                     "is_public": fake_resource_version_v1.data[0]["is_public"],
                     "allow_apply_permission": fake_resource_version_v1.data[0]["allow_apply_permission"],
                     "doc_updated_time": "",
@@ -190,7 +189,6 @@ def test_to_representation_v2(
                     "description_en": fake_resource_version_v2.data[0]["description_en"],
                     "gateway_label_ids": fake_resource_version_v2.data[0]["api_labels"],
                     "match_subpath": fake_resource_version_v2.data[0]["match_subpath"],
-                    "enable_websocket": fake_resource_version_v2.data[0]["enable_websocket"],
                     "is_public": fake_resource_version_v2.data[0]["is_public"],
                     "allow_apply_permission": fake_resource_version_v2.data[0]["allow_apply_permission"],
                     "doc_updated_time": "",
diff --git a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py
index d53cb8da1..ad48bffef 100644
--- a/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py
+++ b/src/dashboard/apigateway/apigateway/tests/apis/web/resource_version/test_views.py
@@ -125,7 +125,6 @@ def test_retrieve(
                     "is_public": fake_resource_version_v2.data[0]["is_public"],
                     "allow_apply_permission": fake_resource_version_v2.data[0]["allow_apply_permission"],
                     "doc_updated_time": "",
-                    "enable_websocket": False,
                     "proxy": {
                         "config": fake_resource_version_v2.data[0]["proxy"]["config"],
                         "backend": {
diff --git a/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_dimension.py b/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_dimension.py
index b38bdf134..03af9225f 100644
--- a/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_dimension.py
+++ b/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_dimension.py
@@ -16,58 +16,21 @@
 # We undertake not to change the open source license (MIT license) applicable
 # to the current version of the project delivered to anyone in the future.
 #
-from apigateway.apps.metrics.constants import MetricsEnum
+from apigateway.apps.metrics.constants import DimensionEnum, MetricsEnum
 from apigateway.apps.metrics.prometheus import dimension
 
 
-class TestRequestTotalMetrics:
-    def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
-
-        data = [
-            {
-                "params": {
-                    "gateway_name": "foo",
-                    "stage_id": 1,
-                    "stage_name": "prod",
-                    "resource_id": 1,
-                    "resource_name": "get_foo",
-                    "step": "1m",
-                },
-                "expected": (
-                    'sum(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
-                    'stage_name="prod", resource_name="get_foo"})'
-                ),
-            },
-            {
-                "params": {
-                    "gateway_name": "foo",
-                    "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
-                    "resource_name": None,
-                    "step": "1m",
-                },
-                "expected": ('sum(bk_apigateway_apigateway_api_requests_total{api_name="foo", ' 'stage_name="prod"})'),
-            },
-        ]
-        for test in data:
-            metrics = dimension.RequestsTotalMetrics()
-            result = metrics._get_query_promql(**test["params"])
-            assert result == test["expected"]
-
-
 class TestRequestsMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
@@ -80,8 +43,6 @@ def test_get_query_promql(self, mocker):
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": None,
                     "step": "1m",
                 },
@@ -97,137 +58,94 @@ def test_get_query_promql(self, mocker):
             assert result == test["expected"]
 
 
-class TestNon200StatusMetrics:
-    def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
-
-        data = [
-            {
-                "params": {
-                    "gateway_name": "foo",
-                    "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
-                    "resource_name": "get_foo",
-                    "step": "1m",
-                },
-                "expected": (
-                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
-                    'stage_name="prod", resource_name="get_foo", status!="200"}[1m])) by (status))'
-                ),
-            },
-            {
-                "params": {
-                    "gateway_name": "foo",
-                    "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
-                    "resource_name": None,
-                    "step": "1m",
-                },
-                "expected": (
-                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
-                    'stage_name="prod", status!="200"}[1m])) by (status))'
-                ),
-            },
-        ]
-        for test in data:
-            metrics = dimension.Non200StatusMetrics()
-            result = metrics._get_query_promql(**test["params"])
-            assert result == test["expected"], result
-
-
-class TestAppRequestsMetrics:
+class TestFailedRequestsMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_apigateway_app_requests_total{api_name="foo", '
-                    'stage_name="prod"}[1m])) by (api_name, app_code))'
+                    'sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod", resource_name="get_foo", status=~"5.."}[1m]))'
                 ),
             },
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": None,
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_apigateway_app_requests_total{api_name="foo", '
-                    'stage_name="prod"}[1m])) by (api_name, app_code))'
+                    'sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod", status=~"5.."}[1m]))'
                 ),
             },
         ]
         for test in data:
-            metrics = dimension.AppRequestsMetrics()
+            metrics = dimension.FailedRequestsMetrics()
             result = metrics._get_query_promql(**test["params"])
             assert result == test["expected"], result
 
 
-class TestResourceRequestsMetrics:
+class TestResponseTime95thMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
-                    'stage_name="prod", resource_name="get_foo"}[1m])) by (resource_name, matched_uri))'
+                    "histogram_quantile(0.95, sum(rate(bk_apigateway_apigateway_api_request_duration_milliseconds_bucket{"
+                    'api_name="foo", stage_name="prod", resource_name="get_foo"}[1m])) by (le, api_name))'
                 ),
             },
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": None,
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
-                    'stage_name="prod"}[1m])) by (resource_name, matched_uri))'
+                    "histogram_quantile(0.95, sum(rate(bk_apigateway_apigateway_api_request_duration_milliseconds_bucket{"
+                    'api_name="foo", stage_name="prod"}[1m])) '
+                    "by (le, api_name))"
                 ),
             },
         ]
         for test in data:
-            metrics = dimension.ResourceRequestsMetrics()
+            metrics = dimension.ResponseTime95thMetrics()
             result = metrics._get_query_promql(**test["params"])
             assert result == test["expected"], result
 
 
 class TestResponseTime50thMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
@@ -240,8 +158,6 @@ def test_get_query_promql(self, mocker):
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": None,
                     "step": "1m",
                 },
@@ -258,258 +174,200 @@ def test_get_query_promql(self, mocker):
             assert result == test["expected"], result
 
 
-class TestResponseTime80thMetrics:
-    def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
-
-        data = [
-            {
-                "params": {
-                    "gateway_name": "foo",
-                    "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
-                    "resource_name": "get_foo",
-                    "step": "1m",
-                },
-                "expected": (
-                    "histogram_quantile(0.8, sum(rate(bk_apigateway_apigateway_api_request_duration_milliseconds_bucket{"
-                    'api_name="foo", stage_name="prod", resource_name="get_foo"}[1m])) by (le, api_name))'
-                ),
-            },
-            {
-                "params": {
-                    "gateway_name": "foo",
-                    "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
-                    "resource_name": None,
-                    "step": "1m",
-                },
-                "expected": (
-                    "histogram_quantile(0.8, sum(rate(bk_apigateway_apigateway_api_request_duration_milliseconds_bucket{"
-                    'api_name="foo", stage_name="prod"}[1m])) '
-                    "by (le, api_name))"
-                ),
-            },
-        ]
-        for test in data:
-            metrics = dimension.ResponseTime80thMetrics()
-            result = metrics._get_query_promql(**test["params"])
-            assert result == test["expected"], result
-
-
-class TestResponseTime90thMetrics:
+class TestResourceRequestsMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
                 "expected": (
-                    "histogram_quantile(0.9, sum(rate(bk_apigateway_apigateway_api_request_duration_milliseconds_bucket{"
-                    'api_name="foo", stage_name="prod", resource_name="get_foo"}[1m])) by (le, api_name))'
+                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod", resource_name="get_foo"}[1m])) by (api_name, resource_name, matched_uri))'
                 ),
             },
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 1,
                     "resource_name": None,
                     "step": "1m",
                 },
                 "expected": (
-                    "histogram_quantile(0.9, sum(rate(bk_apigateway_apigateway_api_request_duration_milliseconds_bucket{"
-                    'api_name="foo", stage_name="prod"}[1m])) '
-                    "by (le, api_name))"
+                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod"}[1m])) by (api_name, resource_name, matched_uri))'
                 ),
             },
         ]
         for test in data:
-            metrics = dimension.ResponseTime90thMetrics()
+            metrics = dimension.ResourceRequestsMetrics()
             result = metrics._get_query_promql(**test["params"])
             assert result == test["expected"], result
 
 
-class TestIngressMetrics:
+class TestResourceFailedRequestsMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 2,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_bandwidth{type="ingress", service="foo.prod.stage-1", '
-                    'route="foo.prod.2"}[1m])) by (route))'
+                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod", resource_name="get_foo", status=~"5.."}[1m])) by (api_name, resource_name, matched_uri))'
                 ),
             },
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 0,
                     "resource_name": None,
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_bandwidth{type="ingress", service="foo.prod.stage-1"'
-                    "}[1m])) by (route))"
+                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod", status=~"5.."}[1m])) by (api_name, resource_name, matched_uri))'
                 ),
             },
         ]
         for test in data:
-            metrics = dimension.IngressMetrics()
+            metrics = dimension.ResourceFailedRequestsMetrics()
             result = metrics._get_query_promql(**test["params"])
             assert result == test["expected"], result
 
 
-class TestEgressMetrics:
+class TestAppRequestsMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 2,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_bandwidth{type="egress", service="foo.prod.stage-1", '
-                    'route="foo.prod.2"}[1m])) by (route))'
+                    'topk(10, sum(increase(bk_apigateway_apigateway_app_requests_total{api_name="foo", '
+                    'stage_name="prod", resource_name="get_foo"}[1m])) by (api_name, app_code))'
                 ),
             },
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 0,
                     "resource_name": None,
                     "step": "1m",
                 },
                 "expected": (
-                    'topk(10, sum(increase(bk_apigateway_bandwidth{type="egress", service="foo.prod.stage-1"'
-                    "}[1m])) by (route))"
+                    'topk(10, sum(increase(bk_apigateway_apigateway_app_requests_total{api_name="foo", '
+                    'stage_name="prod"}[1m])) by (api_name, app_code))'
                 ),
             },
         ]
         for test in data:
-            metrics = dimension.EgressMetrics()
+            metrics = dimension.AppRequestsMetrics()
             result = metrics._get_query_promql(**test["params"])
             assert result == test["expected"], result
 
 
-class TestFailed500RequestsMetrics:
+class TestResourceNon200StatusRequestsMetrics:
     def test_get_query_promql(self, mocker):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         data = [
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 0,
                     "resource_name": "get_foo",
                     "step": "1m",
                 },
                 "expected": (
-                    'sum(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
-                    'stage_name="prod", resource_name="get_foo", status=~"5.."})'
+                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod", resource_name="get_foo", status!="200"}[1m])) by (api_name, resource_name, matched_uri, status))'
                 ),
             },
             {
                 "params": {
                     "gateway_name": "foo",
                     "stage_name": "prod",
-                    "stage_id": 1,
-                    "resource_id": 0,
                     "resource_name": None,
                     "step": "1m",
                 },
                 "expected": (
-                    'sum(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
-                    'stage_name="prod", status=~"5.."})'
+                    'topk(10, sum(increase(bk_apigateway_apigateway_api_requests_total{api_name="foo", '
+                    'stage_name="prod", status!="200"}[1m])) by (api_name, resource_name, matched_uri, status))'
                 ),
             },
         ]
         for test in data:
-            metrics = dimension.Failed500RequestsMetrics()
+            metrics = dimension.ResourceNon200StatusRequestsMetrics()
             result = metrics._get_query_promql(**test["params"])
             assert result == test["expected"], result
 
 
-class TestMetricsFactory:
-    def test_create_metrics(self):
+class TestDimensionMetricsFactory:
+    def test_create_dimension_metrics(self):
         data = [
             {
+                "dimension": "all",
                 "metrics": "requests",
                 "expected": dimension.RequestsMetrics,
             },
             {
-                "metrics": "requests_total",
-                "expected": dimension.RequestsTotalMetrics,
+                "dimension": "all",
+                "metrics": "failed_requests",
+                "expected": dimension.FailedRequestsMetrics,
             },
             {
-                "metrics": "non_200_status",
-                "expected": dimension.Non200StatusMetrics,
-            },
-            {
-                "metrics": "app_requests",
-                "expected": dimension.AppRequestsMetrics,
-            },
-            {
-                "metrics": "resource_requests",
-                "expected": dimension.ResourceRequestsMetrics,
+                "dimension": "all",
+                "metrics": "response_time_95th",
+                "expected": dimension.ResponseTime95thMetrics,
             },
             {
+                "dimension": "all",
                 "metrics": "response_time_50th",
                 "expected": dimension.ResponseTime50thMetrics,
             },
             {
-                "metrics": "response_time_80th",
-                "expected": dimension.ResponseTime80thMetrics,
-            },
-            {
-                "metrics": "response_time_90th",
-                "expected": dimension.ResponseTime90thMetrics,
-            },
-            {
-                "metrics": "ingress",
-                "expected": dimension.IngressMetrics,
+                "dimension": "resource",
+                "metrics": "requests",
+                "expected": dimension.ResourceRequestsMetrics,
             },
             {
-                "metrics": "egress",
-                "expected": dimension.EgressMetrics,
+                "dimension": "app",
+                "metrics": "requests",
+                "expected": dimension.AppRequestsMetrics,
             },
             {
-                "metrics": "failed_500_requests",
-                "expected": dimension.Failed500RequestsMetrics,
+                "dimension": "resource_non200_status",
+                "metrics": "requests",
+                "expected": dimension.ResourceNon200StatusRequestsMetrics,
             },
         ]
         for test in data:
-            result = dimension.MetricsFactory.create_metrics(
+            result = dimension.DimensionMetricsFactory.create_dimension_metrics(
+                DimensionEnum(test["dimension"]),
                 MetricsEnum(test["metrics"]),
             )
             assert isinstance(result, test["expected"])
diff --git a/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_statistics.py b/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_statistics.py
index 2a08b604f..e0ff55d9d 100644
--- a/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_statistics.py
+++ b/src/dashboard/apigateway/apigateway/tests/apps/metrics/prometheus/test_statistics.py
@@ -35,7 +35,9 @@ class TestStatisticsGatewayRequestMetrics:
         ],
     )
     def test_get_query_promql(self, mocker, step, expected):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         metrics = statistics.StatisticsGatewayRequestMetrics()
         result = metrics._get_query_promql(step)
@@ -56,7 +58,9 @@ class TestStatisticsGatewayRequestDurationMetrics:
         ],
     )
     def test_get_query_promql(self, mocker, step, expected):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         metrics = statistics.StatisticsGatewayRequestDurationMetrics()
         result = metrics._get_query_promql(step)
@@ -77,7 +81,9 @@ class TestStatisticsAppRequestMetrics:
         ],
     )
     def test_get_query_promql(self, mocker, step, expected):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         metrics = statistics.StatisticsAppRequestMetrics()
         result = metrics._get_query_promql(step)
@@ -98,7 +104,9 @@ class TestStatisticsAppRequestByResourceMetrics:
         ],
     )
     def test_get_query_promql(self, mocker, step, expected):
-        mocker.patch("apigateway.apps.metrics.prometheus.dimension.BaseMetrics.default_labels", return_value=[])
+        mocker.patch(
+            "apigateway.apps.metrics.prometheus.dimension.BaseDimensionMetrics.default_labels", return_value=[]
+        )
 
         metrics = statistics.StatisticsAppRequestByResourceMetrics()
         result = metrics._get_query_promql(step)
diff --git a/src/dashboard/apigateway/apigateway/tests/biz/resource/importer/test_openapi.py b/src/dashboard/apigateway/apigateway/tests/biz/resource/importer/test_openapi.py
index 2bff83a0f..3dac7d73a 100644
--- a/src/dashboard/apigateway/apigateway/tests/biz/resource/importer/test_openapi.py
+++ b/src/dashboard/apigateway/apigateway/tests/biz/resource/importer/test_openapi.py
@@ -712,7 +712,6 @@ def test_generate_paths(self, fake_resource_dict):
                 "isPublic": fake_resource_dict["is_public"],
                 "allowApplyPermission": fake_resource_dict["allow_apply_permission"],
                 "matchSubpath": fake_resource_dict["match_subpath"],
-                "enableWebsocket": fake_resource_dict["enable_websocket"],
                 "backend": {
                     "name": fake_resource_dict["backend"]["name"],
                     "method": fake_resource_dict["backend"]["config"]["method"].lower(),
diff --git a/src/dashboard/apigateway/apigateway/tests/biz/test_resource_label.py b/src/dashboard/apigateway/apigateway/tests/biz/test_resource_label.py
index fd22ab6f2..69e840929 100644
--- a/src/dashboard/apigateway/apigateway/tests/biz/test_resource_label.py
+++ b/src/dashboard/apigateway/apigateway/tests/biz/test_resource_label.py
@@ -51,13 +51,3 @@ def test_get_labels(self, fake_resource):
                 {"id": label_2.id, "name": label_2.name},
             ]
         }
-
-    def test_get_labels_by_ids(self, fake_resource):
-        label_1 = G(APILabel, gateway=fake_resource.gateway, name="label1")
-        label_2 = G(APILabel, gateway=fake_resource.gateway, name="label2")
-
-        G(ResourceLabel, resource=fake_resource, api_label=label_1)
-        G(ResourceLabel, resource=fake_resource, api_label=label_2)
-
-        resource_labels = ResourceLabelHandler.get_labels_by_ids([label_1.id])
-        assert resource_labels == {fake_resource.id: [{"id": label_1.id, "name": label_1.name}]}
diff --git a/src/dashboard/apigateway/apigateway/tests/common/test_permissions.py b/src/dashboard/apigateway/apigateway/tests/common/test_permissions.py
new file mode 100644
index 000000000..025efd354
--- /dev/null
+++ b/src/dashboard/apigateway/apigateway/tests/common/test_permissions.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+#
+# TencentBlueKing is pleased to support the open source community by making
+# 蓝鲸智云 - API 网关(BlueKing - APIGateway) available.
+# Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
+# Licensed under the MIT License (the "License"); you may not use this file except
+# in compliance with the License. You may obtain a copy of the License at
+#
+#     http://opensource.org/licenses/MIT
+#
+# Unless required by applicable law or agreed to in writing, software distributed under
+# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied. See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# We undertake not to change the open source license (MIT license) applicable
+# to the current version of the project delivered to anyone in the future.
+#
+from unittest import mock
+
+import pytest
+from django.http import Http404
+from rest_framework import viewsets
+
+from apigateway.common.permissions import GatewayRelatedAppPermission
+from apigateway.utils.responses import OKJsonResponse
+
+pytestmark = pytest.mark.django_db
+
+
+class TestGatewayRelatedAppPermission:
+    class APINameViewSet(viewsets.ViewSet):
+        permission_classes = [GatewayRelatedAppPermission]
+
+        def retrieve(self, request, api_name: str, *args, **kwargs):
+            return OKJsonResponse()
+
+    @pytest.mark.parametrize(
+        "mock_gateway, allow_gateway_not_exist, gateway_permission_exempt, mock_allow_manage, expected",
+        [
+            (None, True, False, False, True),
+            (None, False, False, False, Http404),
+            ("gateway", False, True, False, True),
+            ("gateway", False, False, False, False),
+            ("gateway", False, False, True, True),
+        ],
+    )
+    def test_has_permission(
+        self,
+        fake_request,
+        fake_gateway,
+        mocker,
+        mock_gateway,
+        allow_gateway_not_exist,
+        gateway_permission_exempt,
+        mock_allow_manage,
+        expected,
+    ):
+        permission = GatewayRelatedAppPermission()
+
+        mocker.patch.object(permission, "get_gateway_object", return_value=fake_gateway if mock_gateway else None)
+        mocker.patch(
+            "apigateway.common.permissions.permissions.GatewayRelatedApp.objects.filter",
+            return_value=mocker.MagicMock(exists=mocker.MagicMock(return_value=mock_allow_manage)),
+        )
+        fake_request.app = mock.MagicMock(app_code="test")
+
+        view = self.APINameViewSet.as_view({"get": "retrieve"})
+        view.allow_gateway_not_exist = allow_gateway_not_exist
+        view.gateway_permission_exempt = gateway_permission_exempt
+
+        if expected == Http404:
+            with pytest.raises(Http404):
+                permission.has_permission(fake_request, view)
+            return
+
+        assert permission.has_permission(fake_request, view) == expected
+
+    def test_get_api_object(self, fake_gateway):
+        permission = GatewayRelatedAppPermission()
+        view = self.APINameViewSet.as_view({"get": "retrieve"})
+
+        view.kwargs = {}
+        result = permission.get_gateway_object(view)
+        assert result is None
+
+        view.kwargs = {"gateway_name": "not-exist"}
+        result = permission.get_gateway_object(view)
+        assert result is None
+
+        view.kwargs = {"gateway_name": fake_gateway.name}
+        result = permission.get_gateway_object(view)
+        assert result == fake_gateway
diff --git a/src/dashboard/apigateway/apigateway/tests/conftest.py b/src/dashboard/apigateway/apigateway/tests/conftest.py
index 4c46290f1..79da39fda 100644
--- a/src/dashboard/apigateway/apigateway/tests/conftest.py
+++ b/src/dashboard/apigateway/apigateway/tests/conftest.py
@@ -1074,7 +1074,6 @@ def fake_resource_dict():
         "method": "POST",
         "path": "/users",
         "match_subpath": False,
-        "enable_websocket": False,
         "name": "add_user",
         "description": "创建新用户",
         "description_en": "Adds a new user",
diff --git a/src/dashboard/apigateway/apigateway/utils/maven.py b/src/dashboard/apigateway/apigateway/utils/maven.py
deleted file mode 100644
index 29c4ccc8f..000000000
--- a/src/dashboard/apigateway/apigateway/utils/maven.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#  -*- coding: utf-8 -*-
-#  #
-#  TencentBlueKing is pleased to support the open source community by making
-#  蓝鲸智云 - API 网关(BlueKing - APIGateway) available.
-#  Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
-#  Licensed under the MIT License (the "License"); you may not use this file except
-#  in compliance with the License. You may obtain a copy of the License at
-#  #
-#      http://opensource.org/licenses/MIT
-#  #
-#  Unless required by applicable law or agreed to in writing, software distributed under
-#  the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-#  either express or implied. See the License for the specific language governing permissions and
-#  limitations under the License.
-#  #
-#  We undertake not to change the open source license (MIT license) applicable
-#  to the current version of the project delivered to anyone in the future.
-#  #
-from dataclasses import dataclass
-
-from django.conf import settings
-
-
-@dataclass
-class RepositoryConfig:
-    repository_url: str
-    repository_id: str
-    username: str
-    password: str
-
-    @classmethod
-    def by_name(cls, name: str):
-        mirrors_config = getattr(settings, "MAVEN_MIRRORS_CONFIG", None) or {}
-        maven_config = mirrors_config.get(name) or {}
-
-        return cls(
-            repository_url=maven_config.get("repository_url", ""),
-            repository_id=maven_config.get("repository_id", ""),
-            username=maven_config.get("username", ""),
-            password=maven_config.get("password", ""),
-        )
diff --git a/src/dashboard/apigateway/requirements.txt b/src/dashboard/apigateway/requirements.txt
index 34768ac29..0917e7a4e 100644
--- a/src/dashboard/apigateway/requirements.txt
+++ b/src/dashboard/apigateway/requirements.txt
@@ -12,7 +12,7 @@ bk-notice-sdk==1.3.1 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-bcs-api-gateway==1.12.1 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-bk-apigateway==1.0.11 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-client-core==1.2.0 ; python_version >= "3.10" and python_version < "3.11"
-bkapi-client-generator==0.1.30 ; python_version >= "3.10" and python_version < "3.11"
+bkapi-client-generator==0.1.29 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-component-open==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-paasv3==1.0.1 ; python_version >= "3.10" and python_version < "3.11"
 bkpaas-auth==2.0.6 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/src/dashboard/apigateway/requirements_dev.txt b/src/dashboard/apigateway/requirements_dev.txt
index be46e2666..809ead5af 100644
--- a/src/dashboard/apigateway/requirements_dev.txt
+++ b/src/dashboard/apigateway/requirements_dev.txt
@@ -13,7 +13,7 @@ bk-notice-sdk==1.3.1 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-bcs-api-gateway==1.12.1 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-bk-apigateway==1.0.11 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-client-core==1.2.0 ; python_version >= "3.10" and python_version < "3.11"
-bkapi-client-generator==0.1.30 ; python_version >= "3.10" and python_version < "3.11"
+bkapi-client-generator==0.1.29 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-component-open==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
 bkapi-paasv3==1.0.1 ; python_version >= "3.10" and python_version < "3.11"
 bkpaas-auth==2.0.6 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/src/dashboard/poetry.lock b/src/dashboard/poetry.lock
index 16c066710..659488ba2 100644
--- a/src/dashboard/poetry.lock
+++ b/src/dashboard/poetry.lock
@@ -310,12 +310,12 @@ reference = "tencent"
 
 [[package]]
 name = "bkapi-client-generator"
-version = "0.1.30"
+version = "0.1.29"
 description = ""
 optional = false
 python-versions = ">=3.6,<4.0"
 files = [
-    {file = "bkapi_client_generator-0.1.30-py3-none-any.whl", hash = "sha256:c09cda8dabdfa7b0106f20ad572f2ce9d3249feea4edf351c0d5666bb1421860"},
+    {file = "bkapi_client_generator-0.1.29-py3-none-any.whl", hash = "sha256:da1b1561cf05e0ed7b82e2a46f54feeb788557ec9fa3831aae133ca3c414e917"},
 ]
 
 [package.source]
@@ -5029,4 +5029,4 @@ reference = "tencent"
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.10,<3.11"
-content-hash = "2f4aa3e247ca8e26808d804e5bd135807a4ded255dc01359708124e7d0fd624c"
+content-hash = "0f46e6e5722f82b0b1365af7f02d2173bfcb3afb4e8602ce71eaff55ba5719ef"
diff --git a/src/dashboard/pyproject.toml b/src/dashboard/pyproject.toml
index c8dbfb59b..b75e201b9 100644
--- a/src/dashboard/pyproject.toml
+++ b/src/dashboard/pyproject.toml
@@ -42,7 +42,7 @@ bk-crypto-python-sdk = "^1.0.4"
 bk-iam = "1.3.4"
 cryptography = "42.0.5"
 apigw-manager = "3.0.2"
-bkapi-client-generator = "0.1.30"
+bkapi-client-generator = "0.1.29"
 curlify = "^2.2.1"
 bkapi-component-open = "^1.0.3"
 django-prometheus = "2.2.0"