From 9a9dd1c95bf106f326da6f29cfc64d3d76212aaa Mon Sep 17 00:00:00 2001 From: 3octaves <873551943@qq.com> Date: Wed, 15 Nov 2023 19:09:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor(frontend):=20service=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=87=8D=E6=9E=84=20#1446?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/apply-items/BackendQPSSpec.vue | 4 +- .../components/apply-items/BackendSpec.vue | 4 +- .../components/apply-items/BusinessItems.vue | 2 +- .../components/apply-items/ClusterAlias.vue | 2 +- .../components/apply-items/SpecSelector.vue | 4 +- .../src/components/auth/AuthComponent.tsx | 5 +- .../business-selector/BusinessSelector.vue | 2 +- .../cluster-authorize/ClusterAuthorize.vue | 6 +- .../cluster-common/ExcelAuthorize.vue | 2 +- .../cluster-common/RenderPassword.vue | 2 +- .../big-data-host-table/HdfsHostTable.vue | 6 +- .../big-data-host-table/RenderHostTable.vue | 6 +- .../es-host-table/index.vue | 4 +- .../hook/useLocalPagination.ts | 10 +- .../es-host-expansion/Index.vue | 4 +- .../components/HostSelector.vue | 12 +- .../components/ResourcePoolSelector.vue | 6 +- .../cluster-common/es-host-replace/Index.vue | 6 +- .../components/HostSelector.vue | 4 +- .../components/ResourcePoolSelector.vue | 6 +- .../cluster-common/host-expansion/Index.vue | 4 +- .../components/HostSelector.vue | 12 +- .../components/ResourcePoolSelector.vue | 6 +- .../cluster-common/host-replace/Index.vue | 4 +- .../components/ResourcePoolSelector.vue | 6 +- .../cluster-details/ClusterTopo.vue | 28 +- .../cluster-details/common/useRenderGraph.tsx | 30 ++- .../cluster-event-change/EventChange.vue | 5 +- .../components/cluster-selector-new/Index.vue | 6 +- .../components/common/SearchBar.vue | 2 +- .../cluster-selector/useClusterData.ts | 14 +- .../cluster-selector/useSpiderClusterData.ts | 2 +- .../cluster-spec-plan-selector/Index.vue | 4 +- .../components/db-member-selector/index.vue | 4 +- .../components/RenderTopoHost.vue | 10 +- .../src/components/ip-selector/IpSelector.vue | 7 +- .../src/components/layouts/Copyright.vue | 2 +- .../src/components/vue2/ip-selector/index.ts | 2 +- dbm-ui/frontend/src/hooks/useApplyBase.ts | 3 +- .../services/model/db-resource/import-host.ts | 4 +- .../src/services/model/redis/redis-host.ts | 2 +- .../frontend/src/services/source/bigdata.ts | 99 +------ dbm-ui/frontend/src/services/source/cmdb.ts | 112 ++++++++ .../frontend/src/services/source/configs.ts | 59 +++-- .../source/{dbAdmin.ts => dbadmin.ts} | 9 +- dbm-ui/frontend/src/services/source/dbbase.ts | 25 ++ .../frontend/src/services/source/dbdirty.ts | 41 +++ dbm-ui/frontend/src/services/source/dbha.ts | 62 +++++ .../src/services/source/dbresourceResource.ts | 173 +++++++++++++ .../src/services/source/dbresourceSpec.ts | 124 +++++++++ dbm-ui/frontend/src/services/source/es.ts | 58 ++++- .../src/services/source/fixpointRollback.ts | 33 ++- dbm-ui/frontend/src/services/source/hdfs.ts | 61 ++++- dbm-ui/frontend/src/services/source/iam.ts | 42 +++ .../frontend/src/services/source/influxdb.ts | 12 +- .../src/services/source/influxdbGroup.ts | 36 ++- dbm-ui/frontend/src/services/source/infras.ts | 23 ++ .../frontend/src/services/source/instances.ts | 8 +- .../frontend/src/services/source/ipchooser.ts | 100 +++++-- dbm-ui/frontend/src/services/source/kafka.ts | 53 +++- .../source/{resources.ts => mysql.ts} | 4 +- .../src/services/source/mysqlCluster.ts | 64 +++-- .../frontend/src/services/source/package.ts | 78 ++++++ .../frontend/src/services/source/profile.ts | 42 +++ dbm-ui/frontend/src/services/source/pulsar.ts | 85 ++++-- .../source/{resourceRedis.ts => redis.ts} | 66 +++-- .../frontend/src/services/source/redisDts.ts | 30 ++- .../src/services/source/redisRollback.ts | 12 +- .../src/services/source/redisToolbox.ts | 26 +- .../src/services/source/remoteService.ts | 18 +- .../source/{resourceSpider.ts => spider.ts} | 34 ++- .../frontend/src/services/source/sqlImport.ts | 77 +++--- .../frontend/src/services/source/storage.ts | 40 +++ .../frontend/src/services/source/taskflow.ts | 120 +++++++++ .../source/{resourceTendbha.ts => tendbha.ts} | 24 +- ...{resourceTendbsingle.ts => tendbsingle.ts} | 24 +- .../frontend/src/services/source/ticket.tsx | 244 ++++++++++++++++++ dbm-ui/frontend/src/services/source/user.ts | 30 +++ .../frontend/src/services/source/version.ts | 44 ++++ dbm-ui/frontend/src/stores/globalBizs.ts | 2 +- dbm-ui/frontend/src/stores/useMenu.ts | 2 +- dbm-ui/frontend/src/stores/useUserProfile.ts | 8 +- .../src/stores/useUserSemanticTasks.ts | 2 +- .../src/views/db-configure/business/Bind.vue | 2 +- .../list/components/hooks/useTreeData.ts | 14 +- .../list/components/Operation.vue | 2 +- .../src/views/es-manage/apply/Index.vue | 20 +- .../es-manage/common/expansion/Index.vue | 8 +- .../views/es-manage/common/replace/Index.vue | 5 +- .../views/es-manage/common/shrink/Index.vue | 6 +- .../list/components/detail/Index.vue | 4 +- .../components/detail/components/BaseInfo.vue | 4 +- .../detail/components/node-list/Index.vue | 10 +- .../node-list/components/InstanceDetail.vue | 6 +- .../es-manage/list/components/list/Index.vue | 21 +- .../components/SwtichEventDetatils.vue | 5 +- .../event-center/pages/DBHASwitchEvents.vue | 7 +- .../src/views/exception/BizPermission.vue | 2 +- .../src/views/hdfs-manage/apply/Index.vue | 11 +- .../hdfs-manage/common/expansion/Index.vue | 8 +- .../hdfs-manage/common/replace/Index.vue | 2 +- .../views/hdfs-manage/common/shrink/Index.vue | 6 +- .../list/components/detail/Index.vue | 4 +- .../components/detail/components/BaseInfo.vue | 4 +- .../detail/components/node-list/Index.vue | 10 +- .../node-list/components/InstanceDetail.vue | 6 +- .../list/components/list/Index.vue | 20 +- .../list/components/ClusterSettings.vue | 4 +- .../influxdb-manage/apply/common/base.ts | 2 +- .../src/views/influxdb-manage/apply/index.vue | 6 +- .../influxdb-manage/details/AsideList.vue | 4 +- .../views/influxdb-manage/details/Details.vue | 4 +- .../components/render-list/Index.vue | 6 +- .../render-list/components/Replace.vue | 2 +- .../report/components/SearchBox.vue | 2 +- .../src/views/kafka-manage/apply/Index.vue | 13 +- .../kafka-manage/common/expansion/Index.vue | 5 +- .../kafka-manage/common/replace/Index.vue | 2 +- .../kafka-manage/common/shrink/Index.vue | 6 +- .../list/components/detail/Index.vue | 4 +- .../components/detail/components/BaseInfo.vue | 4 +- .../detail/components/node-list/Index.vue | 10 +- .../node-list/components/InstanceDetail.vue | 6 +- .../list/components/list/Index.vue | 16 +- .../main-views/hooks/useLoopDirtyPool.ts | 4 +- .../frontend/src/views/main-views/routes.ts | 2 +- .../views/mission/components/PreviewHost.vue | 2 +- .../mission/components/RedisResultFiles.vue | 7 +- .../mission/components/RetrySelector.vue | 2 +- .../src/views/mission/pages/Details.vue | 7 +- .../src/views/mission/pages/index.vue | 8 +- .../src/views/mysql/apply/ApplyMySQL.vue | 12 +- .../src/views/mysql/apply/CreateModule.vue | 4 +- .../apply/components/MySQLDomainTable.vue | 8 +- .../views/mysql/apply/hooks/useMysqlData.ts | 13 +- .../src/views/mysql/checksum/Index.vue | 2 +- .../mysql/common/MySQLExcelAuthorize.vue | 2 +- .../mysql/db-backup/pages/page1/Index.vue | 2 +- .../src/views/mysql/db-clear/index.vue | 2 +- .../src/views/mysql/db-rename/index.vue | 2 +- .../db-table-backup/pages/page1/Index.vue | 2 +- .../components/RenderData/RenderHost.vue | 4 +- .../mysql/flashback/pages/page1/Index.vue | 2 +- .../mysql/ha-cluster-list/components/List.vue | 27 +- .../components/detail/Index.vue | 4 +- .../ha-instance-list/components/List.vue | 4 +- .../components/detail/Index.vue | 4 +- .../master-failover/pages/page1/Index.vue | 2 +- .../pages/page1/components/BatchEntry.vue | 3 +- .../master-slave-clone/pages/page1/Index.vue | 2 +- .../RenderData/RenderMasterSlaveHost.vue | 3 +- .../master-slave-swap/pages/page1/Index.vue | 2 +- .../pages/page1/components/BatchEntry.vue | 2 +- .../partition-manage/components/Operation.vue | 5 +- .../mysql/privilege-clone-client/index.vue | 12 +- .../mysql/privilege-clone-inst/index.vue | 2 +- .../mysql/proxy-add/pages/page1/Index.vue | 2 +- .../components/RenderData/RenderProxy.vue | 4 +- .../mysql/proxy-replace/pages/page1/Index.vue | 2 +- .../RenderData/RenderTargetProxyIp.vue | 3 +- .../mysql/rollback/pages/page1/Index.vue | 2 +- .../single-cluster-list/components/List.vue | 20 +- .../components/detail/Index.vue | 4 +- .../src/views/mysql/slave-add/index.vue | 5 +- .../components/RenderData/RenderNewSlave.vue | 4 +- .../components/sql-file/local-file/Index.vue | 2 +- .../sql-file/manual-input/Index.vue | 2 +- .../mysql/sql-execute/steps/step2/Index.vue | 2 +- .../steps/step2/hooks/useFlowStatus.ts | 4 +- .../sql-execute/steps/step2/hooks/useLog.ts | 2 +- .../views/pulsar-manage/apply/common/base.ts | 2 +- .../src/views/pulsar-manage/apply/index.vue | 16 +- .../pulsar-manage/common/expansion/Index.vue | 9 +- .../pulsar-manage/common/replace/Index.vue | 2 +- .../pulsar-manage/common/shrink/Index.vue | 6 +- .../list/components/detail/Index.vue | 4 +- .../components/detail/components/BaseInfo.vue | 4 +- .../detail/components/node-list/Index.vue | 10 +- .../node-list/components/InstanceDetail.vue | 6 +- .../list/components/list/Index.vue | 19 +- .../list/components/ManagerPassword.vue | 2 +- .../src/views/redis/apply/ApplyRedis.vue | 28 +- .../capacity-change/pages/page1/Index.vue | 14 +- .../pages/page1/Index.vue | 12 +- .../cluster-type-update/pages/page1/Index.vue | 12 +- .../common/cluster-deploy-plan/Index.vue | 2 +- .../redis/common/edit-field/ClusterName.vue | 7 +- .../data-check-repair/pages/page1/Index.vue | 2 +- .../pages/page1/basic-info-table/Row.vue | 8 +- .../db-create-slave/pages/page1/Index.vue | 6 +- .../redis/db-data-copy/pages/page1/Index.vue | 9 +- .../page1/components/cross-business/Index.vue | 8 +- .../page1/components/cross-business/Row.vue | 6 +- .../components/intra-business-third/Index.vue | 8 +- .../components/within-business/Index.vue | 8 +- .../redis/db-replace/pages/page1/Index.vue | 2 +- .../components/RenderRedis.vue | 7 +- .../redis/db-structure/pages/page1/Index.vue | 10 +- .../redis/list/components/detail/Index.vue | 4 +- .../redis/list/components/list/Index.vue | 15 +- .../components/list/components/Backup.vue | 2 +- .../list/components/ClusterPassword.vue | 4 +- .../components/list/components/DeleteKeys.vue | 2 +- .../list/components/ExtractKeys.vue | 2 +- .../list/components/list/components/Purge.vue | 2 +- .../components/list/hooks/useRedisData.ts | 4 +- .../master-failover/pages/page1/Index.vue | 2 +- .../proxy-scale-down/pages/page1/Index.vue | 10 +- .../proxy-scale-up/pages/page1/Index.vue | 12 +- .../pages/page1/Index.vue | 2 +- .../structure-instance/pages/page1/Index.vue | 2 +- .../resource-pool/dirty-machines/Index.vue | 6 +- .../src/views/resource-pool/list/Index.vue | 4 +- .../list/components/ImportHostBtn.vue | 4 +- .../list/components/batch-setting/Index.vue | 6 +- .../components/ResourceSpecStorage.vue | 2 +- .../list/components/import-host/Index.vue | 2 +- .../import-host/components/FormPanel.vue | 4 +- .../components/select-host-panel/Index.vue | 2 +- .../components/HostEmpty.vue | 2 +- .../com-factory/components/BkCloudIds.vue | 2 +- .../com-factory/components/DeviceClass.vue | 4 +- .../com-factory/components/DiskType.vue | 4 +- .../com-factory/components/ForBizs.vue | 2 +- .../com-factory/components/MountPoint.vue | 4 +- .../com-factory/components/ResourceTypes.vue | 2 +- .../com-factory/components/SpecId.vue | 2 +- .../com-factory/components/Subzones.vue | 2 +- .../search-box/components/field-config.ts | 14 +- .../components/CollectSearchParams.vue | 3 +- .../src/views/resource-pool/record/Index.vue | 4 +- .../record/components/HostDetail.vue | 6 +- .../list/components/SpecCreate.vue | 2 +- .../list/components/SpecList.vue | 5 +- .../add-mnt/pages/page1/Index.vue | 2 +- .../components/RenderData/RenderHost.vue | 10 +- .../page1/components/RenderData/RenderNet.vue | 4 +- .../spider-manage/apply/CreateModule.vue | 4 +- .../capacity-change/pages/page1/Index.vue | 2 +- .../RenderData/RenderResourceSpec.vue | 4 +- .../checksum/pages/page1/Index.vue | 2 +- .../db-backup/pages/page1/Index.vue | 2 +- .../RenderData/RenderBackupLocal.vue | 4 +- .../pages/page1/components/TargetCluster.vue | 4 +- .../db-clear/pages/page1/Index.vue | 2 +- .../db-rename/pages/page1/Index.vue | 2 +- .../db-table-backup/pages/page1/Index.vue | 2 +- .../RenderData/RenderBackupLocal.vue | 4 +- .../components/RenderData/RenderHost.vue | 3 +- .../flashback/pages/page1/Index.vue | 4 +- .../list-instance/components/list/Index.vue | 4 +- .../list/components/list/Index.vue | 24 +- .../list/components/CapacityChange.vue | 2 +- .../components/list/components/ScaleUp.vue | 2 +- .../components/list/components/Shrink.vue | 2 +- .../master-failover/pages/page1/Index.vue | 2 +- .../pages/page1/components/BatchEntry.vue | 2 +- .../master-slave-swap/pages/page1/Index.vue | 2 +- .../pages/page1/components/BatchEntry.vue | 2 +- .../components/target-cluster/Index.vue | 4 +- .../partition-manage/components/Operation.vue | 4 +- .../pages/page1/Index.vue | 10 +- .../pages/page1/components/BatchEntry.vue | 3 +- .../pages/page1/Index.vue | 2 +- .../components/RenderData/RenderCluster.vue | 4 +- .../proxy-scale-down/pages/page1/Index.vue | 6 +- .../proxy-scale-up/pages/page1/Index.vue | 6 +- .../proxy-slave-apply/pages/page1/Index.vue | 6 +- .../pages/page1/components/Row.vue | 4 +- .../spider-manage/rollback-record/Index.vue | 2 +- .../rollback/pages/page1/Index.vue | 2 +- .../steps/step1/components/TargetCluster.vue | 2 +- .../components/sql-file/local-file/Index.vue | 2 +- .../sql-file/manual-input/Index.vue | 2 +- .../sql-execute/steps/step2/Index.vue | 2 +- .../steps/step2/hooks/useFlowStatus.ts | 4 +- .../sql-execute/steps/step2/hooks/useLog.ts | 2 +- .../src/views/staff-setting/index.vue | 2 +- .../demand-factory/bigdata/DetailsES.vue | 2 +- .../demand-factory/bigdata/DetailsHDFS.vue | 2 +- .../bigdata/DetailsInfluxDB.vue | 2 +- .../demand-factory/bigdata/DetailsKafka.vue | 2 +- .../demand-factory/bigdata/DetailsPulsar.vue | 2 +- .../mysql/TargetClusterPreview.vue | 2 +- .../mysql/import-sql-file/Index.vue | 14 +- .../demand-factory/redis/AddSlave.vue | 6 +- .../redis/ClusterCapacityUpdate.vue | 6 +- .../redis/ClusterShardUpdate.vue | 6 +- .../redis/ClusterTypeUpdate.vue | 7 +- .../demand-factory/redis/DBReplace.vue | 6 +- .../demand-factory/redis/DataCopy.vue | 4 +- .../demand-factory/redis/DataStructure.vue | 6 +- .../demand-factory/redis/Details.vue | 2 +- .../demand-factory/redis/MasterFailover.vue | 4 +- .../demand-factory/redis/ProxyScaleDown.vue | 7 +- .../demand-factory/redis/ProxyScaleUp.vue | 6 +- .../demand-factory/redis/RollbackDataCopy.vue | 4 +- .../demand-factory/spider/AddNodes.vue | 6 +- .../demand-factory/spider/CheckSum.vue | 4 +- .../demand-factory/spider/Destroy.vue | 4 +- .../demand-factory/spider/Disable.vue | 4 +- .../demand-factory/spider/Enable.vue | 4 +- .../demand-factory/spider/Flashback.vue | 4 +- .../demand-factory/spider/FullBackup.vue | 4 +- .../demand-factory/spider/MNTApply.vue | 4 +- .../demand-factory/spider/MNTDestroy.vue | 5 +- .../demand-factory/spider/NodeRebalance.vue | 6 +- .../demand-factory/spider/ReduceNodes.vue | 7 +- .../demand-factory/spider/RenameDatabase.vue | 4 +- .../demand-factory/spider/Rollback.vue | 4 +- .../demand-factory/spider/SlaveApply.vue | 6 +- .../demand-factory/spider/SlaveDestroy.vue | 4 +- .../demand-factory/spider/TableBackup.vue | 4 +- .../spider/TargetClusterPreview.vue | 2 +- .../spider/TruncateDatabase.vue | 4 +- .../common/components/flow-content/Index.vue | 2 +- .../components/ContentInnerFlow.vue | 2 +- .../views/tickets/common/hooks/logCounts.ts | 2 +- .../common/hooks/useTargetClusterData.ts | 12 +- .../my-tickets/components/details/Index.vue | 2 +- .../details/components/flow/Index.vue | 2 +- .../my-tickets/components/list/Index.vue | 5 +- .../tickets/my-todos/components/List.vue | 9 +- .../my-todos/components/details/Index.vue | 2 +- .../details/components/flow/Index.vue | 2 +- .../components/flow/components/Approve.vue | 2 +- .../components/flow/components/MySqlFlows.vue | 2 +- .../components/flow/components/RedisFlows.vue | 2 +- .../list/components/FileContent.vue | 3 +- .../list/hooks/useVersionFiles.ts | 8 +- 330 files changed, 2637 insertions(+), 1096 deletions(-) create mode 100644 dbm-ui/frontend/src/services/source/cmdb.ts rename dbm-ui/frontend/src/services/source/{dbAdmin.ts => dbadmin.ts} (78%) create mode 100644 dbm-ui/frontend/src/services/source/dbbase.ts create mode 100644 dbm-ui/frontend/src/services/source/dbdirty.ts create mode 100644 dbm-ui/frontend/src/services/source/dbha.ts create mode 100644 dbm-ui/frontend/src/services/source/dbresourceResource.ts create mode 100644 dbm-ui/frontend/src/services/source/dbresourceSpec.ts create mode 100644 dbm-ui/frontend/src/services/source/iam.ts create mode 100644 dbm-ui/frontend/src/services/source/infras.ts rename dbm-ui/frontend/src/services/source/{resources.ts => mysql.ts} (87%) create mode 100644 dbm-ui/frontend/src/services/source/package.ts create mode 100644 dbm-ui/frontend/src/services/source/profile.ts rename dbm-ui/frontend/src/services/source/{resourceRedis.ts => redis.ts} (51%) rename dbm-ui/frontend/src/services/source/{resourceSpider.ts => spider.ts} (56%) create mode 100644 dbm-ui/frontend/src/services/source/storage.ts create mode 100644 dbm-ui/frontend/src/services/source/taskflow.ts rename dbm-ui/frontend/src/services/source/{resourceTendbha.ts => tendbha.ts} (59%) rename dbm-ui/frontend/src/services/source/{resourceTendbsingle.ts => tendbsingle.ts} (58%) create mode 100644 dbm-ui/frontend/src/services/source/ticket.tsx create mode 100644 dbm-ui/frontend/src/services/source/user.ts create mode 100644 dbm-ui/frontend/src/services/source/version.ts diff --git a/dbm-ui/frontend/src/components/apply-items/BackendQPSSpec.vue b/dbm-ui/frontend/src/components/apply-items/BackendQPSSpec.vue index db726ec4e8..7b53877fee 100644 --- 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 index 1510e95672..9d179e14a7 100644 --- 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 index 4cc8f26522..53b34c8768 100644 --- 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 index 0d654e85f1..67d35eaa11 100644 --- a/dbm-ui/frontend/src/components/apply-items/ClusterAlias.vue +++ b/dbm-ui/frontend/src/components/apply-items/ClusterAlias.vue @@ -29,7 +29,7 @@ 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 index 66ac1b7f26..4c8caea64c 100644 --- 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 @@ 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 index fb943b54b6..cbfcf4469b 100644 --- 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 @@ - diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/ProxyScaleUp.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/ProxyScaleUp.vue index bab41c891b..9f69d68194 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/ProxyScaleUp.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/ProxyScaleUp.vue @@ -24,8 +24,8 @@ import { useRequest } from 'vue-request'; import ResourceSpecModel from '@services/model/resource-spec/resourceSpec'; - import { listClusterList } from '@services/redis/toolbox'; - import { getResourceSpecList } from '@services/resourceSpec'; + import { getResourceSpecList } from '@services/source/dbresourceSpec'; + import { getRedisList } from '@services/source/redis'; import type { RedisProxyScaleUpDetails, TicketDetails } from '@services/types/ticket'; import { useGlobalBizs } from '@stores'; @@ -76,7 +76,7 @@ }, ]; - const { loading } = useRequest(listClusterList, { + const { loading } = useRequest(getRedisList, { defaultParams: [{ bk_biz_id: currentBizId }], onSuccess: async (result) => { if (result.results.length < 1) { diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/RollbackDataCopy.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/RollbackDataCopy.vue index 856475134f..1b962d0a24 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/RollbackDataCopy.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/redis/RollbackDataCopy.vue @@ -42,7 +42,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { listClusterList } from '@services/redis/toolbox'; + import { getRedisList } from '@services/source/redis'; import type { RedisRollbackDataCopyDetails, TicketDetails } from '@services/types/ticket'; import { useGlobalBizs } from '@stores'; @@ -115,7 +115,7 @@ }, ]; - const { loading } = useRequest(listClusterList, { + const { loading } = useRequest(getRedisList, { defaultParams: [{ bk_biz_id: currentBizId }], onSuccess: async (result) => { if (result.results.length < 1) { diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/AddNodes.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/AddNodes.vue index fee18f3d49..7674071de8 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/AddNodes.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/AddNodes.vue @@ -24,8 +24,8 @@ import { useRequest } from 'vue-request'; import ResourceSpecModel from '@services/model/resource-spec/resourceSpec'; - import { getResourceSpecList } from '@services/resourceSpec'; - import { getList } from '@services/spider'; + import { getResourceSpecList } from '@services/source/dbresourceSpec'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderAddNodesDeatils, TicketDetails } from '@services/types/ticket'; interface Props { @@ -74,7 +74,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: async (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/CheckSum.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/CheckSum.vue index 8943519509..7816c2039e 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/CheckSum.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/CheckSum.vue @@ -62,7 +62,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderCheckSumDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -136,7 +136,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Destroy.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Destroy.vue index 33a5b3b2f4..9c8318cb55 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Destroy.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Destroy.vue @@ -44,7 +44,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderDestroyDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -70,7 +70,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Disable.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Disable.vue index dc374b5df9..edeae8b775 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Disable.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Disable.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderDisableDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -49,7 +49,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Enable.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Enable.vue index 8342a5bbfb..e5845d3a6a 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Enable.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Enable.vue @@ -44,7 +44,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderEnableDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -70,7 +70,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue index f7296f589f..cc0fc38e8f 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderFlashbackDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -85,7 +85,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/FullBackup.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/FullBackup.vue index 3c579e2e49..d992480dda 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/FullBackup.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/FullBackup.vue @@ -48,7 +48,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderFullBackupDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -80,7 +80,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTApply.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTApply.vue index d14a7af62e..62c66fce65 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTApply.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTApply.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderMNTApplyDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -56,7 +56,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTDestroy.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTDestroy.vue index ce0c8eacac..7d00f57694 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTDestroy.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/MNTDestroy.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderMNTDestroyDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -55,7 +55,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; @@ -80,4 +80,3 @@ }); - diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/NodeRebalance.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/NodeRebalance.vue index 3524bcb626..2387977f76 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/NodeRebalance.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/NodeRebalance.vue @@ -55,8 +55,8 @@ import { useRequest } from 'vue-request'; import ResourceSpecModel from '@services/model/resource-spec/resourceSpec'; - import { getResourceSpecList } from '@services/resourceSpec'; - import { getList } from '@services/spider'; + import { getResourceSpecList } from '@services/source/dbresourceSpec'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderNodeRebalanceDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -105,7 +105,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: async (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/ReduceNodes.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/ReduceNodes.vue index 8772a195ef..73a7190918 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/ReduceNodes.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/ReduceNodes.vue @@ -24,8 +24,8 @@ import { useRequest } from 'vue-request'; import ResourceSpecModel from '@services/model/resource-spec/resourceSpec'; - import { getResourceSpecList } from '@services/resourceSpec'; - import { getList } from '@services/spider'; + import { getResourceSpecList } from '@services/source/dbresourceSpec'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderReduceNodesDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -73,7 +73,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: async (r) => { if (r.results.length < 1) { return; @@ -119,4 +119,3 @@ }); - diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/RenameDatabase.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/RenameDatabase.vue index a24e3ad375..eacd973a65 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/RenameDatabase.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/RenameDatabase.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderRenameDatabaseDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -61,7 +61,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Rollback.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Rollback.vue index 38f5e9414b..bc457ecb01 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Rollback.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Rollback.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderRollbackDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -85,7 +85,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveApply.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveApply.vue index f2245a3255..f3051516cc 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveApply.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveApply.vue @@ -24,8 +24,8 @@ import { useRequest } from 'vue-request'; import ResourceSpecModel from '@services/model/resource-spec/resourceSpec'; - import { getResourceSpecList } from '@services/resourceSpec'; - import { getList } from '@services/spider'; + import { getResourceSpecList } from '@services/source/dbresourceSpec'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderSlaveApplyDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -67,7 +67,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: async (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveDestroy.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveDestroy.vue index b34c490aef..d4b891ca11 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveDestroy.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/SlaveDestroy.vue @@ -44,7 +44,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderSlaveDestroyDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -70,7 +70,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue index 0e7137d24d..dc11393a47 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderTableBackupDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -79,7 +79,7 @@ }, ]; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TargetClusterPreview.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TargetClusterPreview.vue index 4ad38eeafb..cd7e6440f3 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TargetClusterPreview.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TargetClusterPreview.vue @@ -50,7 +50,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getModules } from '@services/common'; + import { getModules } from '@services/source/cmdb'; import type { MysqlAuthorizationDetails, TicketDetails, diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TruncateDatabase.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TruncateDatabase.vue index 2e7cb9d721..163d4da12c 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TruncateDatabase.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TruncateDatabase.vue @@ -23,7 +23,7 @@ import { useI18n } from 'vue-i18n'; import { useRequest } from 'vue-request'; - import { getList } from '@services/spider'; + import { getSpiderList } from '@services/source/spider'; import type { SpiderTruncateDatabaseDetails, TicketDetails } from '@services/types/ticket'; interface Props { @@ -86,7 +86,7 @@ drop_database: t('删除整库_dropdatabase'), }; - const { loading } = useRequest(getList, { + const { loading } = useRequest(getSpiderList, { onSuccess: (r) => { if (r.results.length < 1) { return; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue b/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue index 80476a328d..ace39532dd 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/flow-content/Index.vue @@ -116,7 +116,7 @@