refactor(frontend): service接口重构 #1446

TencentBlueKing · Nov 15, 2023 · 9a9dd1c · 9a9dd1c
1 parent 907dad4
commit 9a9dd1c
Show file tree

Hide file tree

Showing 330 changed files with 2,637 additions and 1,096 deletions.
diff --git a/dbm-ui/frontend/src/components/apply-items/BackendQPSSpec.vue b/dbm-ui/frontend/src/components/apply-items/BackendQPSSpec.vue
@@ -79,12 +79,12 @@
   import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
 
-  import { getSpecResourceCount } from '@services/dbResource';
   import RedisClusterSpecModel from '@services/model/resource-spec/redis-cluster-sepc';
+  import { getSpecResourceCount } from '@services/source/dbresourceResource';
   import {
     getFilterClusterSpec,
     queryQPSRange,
-  } from '@services/resourceSpec';
+  } from '@services/source/dbresourceSpec';
 
   import { ClusterTypes } from '@common/const';
 

diff --git a/dbm-ui/frontend/src/components/apply-items/BackendSpec.vue b/dbm-ui/frontend/src/components/apply-items/BackendSpec.vue
@@ -60,9 +60,9 @@
   import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
 
-  import { getSpecResourceCount } from '@services/dbResource';
   import RedisClusterSpecModel from '@services/model/resource-spec/redis-cluster-sepc';
-  import { getFilterClusterSpec } from '@services/resourceSpec';
+  import { getSpecResourceCount } from '@services/source/dbresourceResource';
+  import { getFilterClusterSpec } from '@services/source/dbresourceSpec';
 
   import { ClusterTypes } from '@common/const';
 

diff --git a/dbm-ui/frontend/src/components/apply-items/BusinessItems.vue b/dbm-ui/frontend/src/components/apply-items/BusinessItems.vue
@@ -41,7 +41,7 @@
   import { useI18n } from 'vue-i18n';
   import { useRoute } from 'vue-router';
 
-  import { getBizs } from '@services/common';
+  import { getBizs } from '@services/source/cmdb';
   import type { BizItem } from '@services/types/common';
 
   import { nameRegx } from '@common/regex';

diff --git a/dbm-ui/frontend/src/components/apply-items/ClusterAlias.vue b/dbm-ui/frontend/src/components/apply-items/ClusterAlias.vue
@@ -29,7 +29,7 @@
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
 
-  import { verifyDuplicatedClusterName } from '@services/dbbase';
+  import { verifyDuplicatedClusterName } from '@services/source/dbbase';
 
   interface Props {
     modelValue: string,

diff --git a/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue b/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue
@@ -81,9 +81,9 @@
   import { useI18n } from 'vue-i18n';
   import { useRequest } from 'vue-request';
 
-  import { getSpecResourceCount } from '@services/dbResource';
   import ResourceSpecModel from '@services/model/resource-spec/resourceSpec';
-  import { getResourceSpecList } from '@services/resourceSpec';
+  import { getSpecResourceCount } from '@services/source/dbresourceResource';
+  import { getResourceSpecList } from '@services/source/dbresourceSpec';
 
   interface ResourceSpecData extends ResourceSpecModel {
     count?: number,

diff --git a/dbm-ui/frontend/src/components/auth/AuthComponent.tsx b/dbm-ui/frontend/src/components/auth/AuthComponent.tsx
@@ -11,7 +11,10 @@
  * the specific language governing permissions and limitations under the License.
 */
 
-import { checkAuthAllowed, getApplyDataLink } from '@services/common';
+import {
+  checkAuthAllowed,
+  getApplyDataLink,
+} from '@services/source/iam';
 
 import './style.less';
 

diff --git a/dbm-ui/frontend/src/components/business-selector/BusinessSelector.vue b/dbm-ui/frontend/src/components/business-selector/BusinessSelector.vue
@@ -53,7 +53,7 @@
 <script setup lang="ts">
   import { useI18n } from 'vue-i18n';
 
-  import { getBizs } from '@services/common';
+  import { getBizs } from '@services/source/cmdb';
   import type { BizItem } from '@services/types/common';
 
   import { useUserProfile } from '@stores';

diff --git a/dbm-ui/frontend/src/components/cluster-authorize/ClusterAuthorize.vue b/dbm-ui/frontend/src/components/cluster-authorize/ClusterAuthorize.vue
@@ -156,9 +156,9 @@
   import { useI18n } from 'vue-i18n';
 
   import { getPermissionRules, preCheckAuthorizeRules } from '@services/permission';
-  import { createTicket } from '@services/ticket';
+  import { checkHost } from '@services/source/ipchooser';
+  import { createTicket } from '@services/source/ticket';
   import type { ResourceItem } from '@services/types/clusters';
-  import type { HostDetails } from '@services/types/ip';
   import type { AuthorizePreCheckData, PermissionRule } from '@services/types/permission';
   import type { WhitelistItem } from '@services/types/whitelist';
 
@@ -317,7 +317,7 @@
   /**
    * ip 选择
    */
-  function handleChangeIP(data: HostDetails[]) {
+  function handleChangeIP(data: ServiceReturnType<typeof checkHost>) {
     state.formdata.source_ips = data.map(item => ({
       ip: item.ip,
       bk_host_id: item.host_id,

diff --git a/dbm-ui/frontend/src/components/cluster-common/ExcelAuthorize.vue b/dbm-ui/frontend/src/components/cluster-common/ExcelAuthorize.vue
@@ -110,7 +110,7 @@
   import type { UploadFile } from 'bkui-vue/lib/upload/upload.type';
   import { useI18n } from 'vue-i18n';
 
-  import { createTicket } from '@services/ticket';
+  import { createTicket } from '@services/source/ticket';
   import type { BaseResponse } from '@services/types/common';
   import type {
     AuthorizePreCheckData,

diff --git a/dbm-ui/frontend/src/components/cluster-common/RenderPassword.vue b/dbm-ui/frontend/src/components/cluster-common/RenderPassword.vue
@@ -54,7 +54,7 @@
   } from 'bkui-vue/lib/icon';
   import { ref } from 'vue';
 
-  import { getPulsarPassword } from '@services/source/bigdata';
+  import { getPulsarPassword } from '@services/source/pulsar';
 
   import { useCopy } from '@hooks';
 

diff --git a/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/HdfsHostTable.vue b/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/HdfsHostTable.vue
@@ -78,9 +78,9 @@
 <script lang="tsx">
   import { useI18n } from 'vue-i18n';
 
-  import type {
-    HostDetails,
-  } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
+
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
 
   export type IHostTableData = HostDetails;
 </script>

diff --git a/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/RenderHostTable.vue b/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/RenderHostTable.vue
@@ -77,9 +77,9 @@
 <script lang="tsx">
   import { useI18n } from 'vue-i18n';
 
-  import type {
-    HostDetails,
-  } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
+
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
 
   export type IHostTableData = HostDetails;
 </script>

diff --git a/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/es-host-table/index.vue b/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/es-host-table/index.vue
@@ -82,7 +82,9 @@
 <script lang="tsx">
   import { useI18n } from 'vue-i18n';
 
-  import type { HostDetails } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
+
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
 
   export interface IHostTableDataWithInstance extends HostDetails {
     instance_num: number;

diff --git a/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/hook/useLocalPagination.ts b/dbm-ui/frontend/src/components/cluster-common/big-data-host-table/hook/useLocalPagination.ts
@@ -16,15 +16,15 @@ import {
   ref,
 } from 'vue';
 
-import type {
-  HostDetails,
-} from '@services/types/ip';
+import { checkHost } from '@services/source/ipchooser';
 
 import { useDebouncedRef } from '@hooks';
 
 import { encodeRegexp } from '@utils';
 
-export default function (originalData: Ref<Array<HostDetails>>) {
+type HostDetails = ServiceReturnType<typeof checkHost>
+
+export default function (originalData: Ref<HostDetails>) {
   const pagination = reactive({
     count: 0,
     current: 1,
@@ -44,7 +44,7 @@ export default function (originalData: Ref<Array<HostDetails>>) {
         result.push(item);
       }
       return result;
-    }, [] as Array<HostDetails>);
+    }, [] as HostDetails);
   });
 
   const isShowPagination = ref(false);

diff --git a/dbm-ui/frontend/src/components/cluster-common/es-host-expansion/Index.vue b/dbm-ui/frontend/src/components/cluster-common/es-host-expansion/Index.vue
@@ -87,11 +87,13 @@
   <script setup lang="tsx">
   import { useI18n } from 'vue-i18n';
 
-  import type { HostDetails } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
 
   import HostSelector from './components/HostSelector.vue';
   import ResourcePoolSelector from './components/ResourcePoolSelector.vue';
 
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
+
   export interface TExpansionNode {
     // 集群节点展示名
     label: string,

diff --git a/dbm-ui/frontend/src/components/cluster-common/es-host-expansion/components/HostSelector.vue b/dbm-ui/frontend/src/components/cluster-common/es-host-expansion/components/HostSelector.vue
@@ -81,7 +81,7 @@
   } from 'vue';
   import { useI18n } from 'vue-i18n';
 
-  import type { HostDetails } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
 
   import { useGlobalBizs } from '@stores';
 
@@ -90,6 +90,8 @@
 
   import type { TExpansionNode } from '../Index.vue';
 
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
+
   interface Props {
     cloudInfo: {
       id: number,
@@ -133,22 +135,22 @@
     {
       label: t('节点 IP'),
       field: 'ip',
-      render: ({ data }: {data:HostDetails}) => data.ip || '--',
+      render: ({ data }: {data: HostDetails}) => data.ip || '--',
     },
     {
       label: t('Agent状态'),
       field: 'alive',
-      render: ({ data }: { data:HostDetails }) => <HostAgentStatus data={data.alive} />,
+      render: ({ data }: { data: HostDetails }) => <HostAgentStatus data={data.alive} />,
     },
     {
       label: t('磁盘_GB'),
       field: 'bk_disk',
-      render: ({ data }: {data:HostDetails}) => data.bk_disk || '--',
+      render: ({ data }: {data: HostDetails}) => data.bk_disk || '--',
     },
     {
       label: t('操作'),
       width: 100,
-      render: ({ data }: {data:HostDetails}) => (
+      render: ({ data }: {data: HostDetails}) => (
         <bk-button
           text
           theme="primary"

diff --git a/...ntend/src/components/cluster-common/es-host-expansion/components/ResourcePoolSelector.vue b/...ntend/src/components/cluster-common/es-host-expansion/components/ResourcePoolSelector.vue
@@ -77,8 +77,10 @@
   import { useI18n } from 'vue-i18n';
   import { useRequest } from 'vue-request';
 
-  import { fetchRecommendSpec } from '@services/dbResource';
-  import { getResourceSpecList } from '@services/resourceSpec';
+  import {
+    fetchRecommendSpec,
+    getResourceSpecList,
+  } from '@services/source/dbresourceSpec';
 
   import SpecDetail from '@components/cluster-common/SpecDetailForPopover.vue';
 

diff --git a/dbm-ui/frontend/src/components/cluster-common/es-host-replace/Index.vue b/dbm-ui/frontend/src/components/cluster-common/es-host-replace/Index.vue
@@ -120,7 +120,7 @@
   import { useI18n } from 'vue-i18n';
 
   import type EsNodeModel from '@services/model/es/es-node';
-  import type { HostDetails } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
 
   import {
     type IHostTableDataWithInstance,
@@ -131,7 +131,7 @@
   import HostSelector from './components/HostSelector.vue';
   import ResourcePoolSelector from './components/ResourcePoolSelector.vue';
 
-  export interface TReplaceNode{
+  export interface TReplaceNode {
     // 集群id
     clusterId: number,
     // 集群的节点类型
@@ -159,7 +159,7 @@
   interface Props {
     data: TReplaceNode,
     ipSource: string,
-    disableHostMethod?: (params: HostDetails) => string | boolean
+    disableHostMethod?: (params: ServiceReturnType<typeof checkHost>[number]) => string | boolean
   }
 
   interface Emits {

diff --git a/dbm-ui/frontend/src/components/cluster-common/es-host-replace/components/HostSelector.vue b/dbm-ui/frontend/src/components/cluster-common/es-host-replace/components/HostSelector.vue
@@ -66,7 +66,7 @@
   import { ref } from 'vue';
   import { useI18n } from 'vue-i18n';
 
-  import type { HostDetails } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
 
   import { useGlobalBizs } from '@stores';
 
@@ -75,6 +75,8 @@
 
   import type { TReplaceNode } from '../Index.vue';
 
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
+
   interface Props {
     data: TReplaceNode,
     placehoderId: string,

diff --git a/...rontend/src/components/cluster-common/es-host-replace/components/ResourcePoolSelector.vue b/...rontend/src/components/cluster-common/es-host-replace/components/ResourcePoolSelector.vue
@@ -43,8 +43,10 @@
   import { useI18n } from 'vue-i18n';
   import { useRequest } from 'vue-request';
 
-  import { fetchRecommendSpec } from '@services/dbResource';
-  import { getResourceSpecList } from '@services/resourceSpec';
+  import {
+    fetchRecommendSpec,
+    getResourceSpecList,
+  } from '@services/source/dbresourceSpec';
 
   import SpecDetail from '@components/cluster-common/SpecDetailForPopover.vue';
 

diff --git a/dbm-ui/frontend/src/components/cluster-common/host-expansion/Index.vue b/dbm-ui/frontend/src/components/cluster-common/host-expansion/Index.vue
@@ -87,11 +87,13 @@
   <script setup lang="tsx">
   import { useI18n } from 'vue-i18n';
 
-  import type { HostDetails } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
 
   import HostSelector from './components/HostSelector.vue';
   import ResourcePoolSelector from './components/ResourcePoolSelector.vue';
 
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
+
   export interface TExpansionNode {
     // 集群节点展示名
     label: string,

diff --git a/dbm-ui/frontend/src/components/cluster-common/host-expansion/components/HostSelector.vue b/dbm-ui/frontend/src/components/cluster-common/host-expansion/components/HostSelector.vue
@@ -81,7 +81,7 @@
   } from 'vue';
   import { useI18n } from 'vue-i18n';
 
-  import type { HostDetails } from '@services/types/ip';
+  import { checkHost } from '@services/source/ipchooser';
 
   import { useGlobalBizs } from '@stores';
 
@@ -90,6 +90,8 @@
 
   import type { TExpansionNode } from '../Index.vue';
 
+  type HostDetails = ServiceReturnType<typeof checkHost>[number]
+
   interface Props {
     cloudInfo: {
       id: number,
@@ -133,22 +135,22 @@
     {
       label: t('节点 IP'),
       field: 'ip',
-      render: ({ data }: {data:HostDetails}) => data.ip || '--',
+      render: ({ data }: {data: HostDetails}) => data.ip || '--',
     },
     {
       label: t('Agent状态'),
       field: 'alive',
-      render: ({ data }: { data:HostDetails }) => <HostAgentStatus data={data.alive} />,
+      render: ({ data }: { data: HostDetails }) => <HostAgentStatus data={data.alive} />,
     },
     {
       label: t('磁盘_GB'),
       field: 'bk_disk',
-      render: ({ data }: {data:HostDetails}) => data.bk_disk || '--',
+      render: ({ data }: {data: HostDetails}) => data.bk_disk || '--',
     },
     {
       label: t('操作'),
       width: 100,
-      render: ({ data }: {data:HostDetails}) => (
+      render: ({ data }: {data: HostDetails}) => (
         <bk-button
           text
           theme="primary"

diff --git a/...frontend/src/components/cluster-common/host-expansion/components/ResourcePoolSelector.vue b/...frontend/src/components/cluster-common/host-expansion/components/ResourcePoolSelector.vue
@@ -78,8 +78,10 @@
   import { useI18n } from 'vue-i18n';
   import { useRequest } from 'vue-request';
 
-  import { fetchRecommendSpec } from '@services/dbResource';
-  import { getResourceSpecList } from '@services/resourceSpec';
+  import {
+    fetchRecommendSpec,
+    getResourceSpecList,
+  } from '@services/source/dbresourceSpec';
 
   import SpecDetail from '@components/cluster-common/SpecDetailForPopover.vue';