From 0835afa374f7fd450bdde92359d2b65aee626cf6 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 1 Nov 2023 17:53:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E8=B6=85=E6=97=B6=201?= =?UTF-8?q?80=5F1000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/configManage/backupManage.ts | 2 +- src/api/configManage/configParam.ts | 2 +- src/api/configManage/license.ts | 2 +- src/api/configManage/neManage.ts | 10 +++++----- src/api/configManage/softwareManage.ts | 10 +++++----- src/api/index.ts | 2 +- src/api/logManage/logSet.ts | 1 + src/api/mmlManage/neOperate.ts | 2 +- src/api/mmlManage/omcOperate.ts | 2 +- src/api/mmlManage/udmOperate.ts | 2 +- src/api/neUser/auth.ts | 2 +- src/api/neUser/sub.ts | 4 +++- src/api/perfManage/goldTarget.ts | 2 +- src/api/system/user.ts | 1 + src/api/traceManage/pcap.ts | 1 + 15 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/api/configManage/backupManage.ts b/src/api/configManage/backupManage.ts index 46ddb233..2f24563e 100644 --- a/src/api/configManage/backupManage.ts +++ b/src/api/configManage/backupManage.ts @@ -76,6 +76,6 @@ export async function downloadNeBackup(data: Record) { url: `/api/rest/systemManagement/v1/${data.neType}/neBackup/${data.fileName}`, method: 'get', responseType: 'blob', - timeout: 60 * 1000, + timeout: 180_000, }); } diff --git a/src/api/configManage/configParam.ts b/src/api/configManage/configParam.ts index 31289c48..6fd06ea0 100644 --- a/src/api/configManage/configParam.ts +++ b/src/api/configManage/configParam.ts @@ -374,7 +374,7 @@ export async function updateNeConfigReload(neType: string, neId: string) { url: `/api/rest/operationManagement/v1/elementType/${neType}/objectType/mml?ne_id=${neId}`, method: 'post', data: { mml: ['reload'] }, - timeout: 30_1000, + timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { diff --git a/src/api/configManage/license.ts b/src/api/configManage/license.ts index 1e146158..72df32fc 100644 --- a/src/api/configManage/license.ts +++ b/src/api/configManage/license.ts @@ -67,6 +67,6 @@ export function uploadLicense(data: FormData) { method: 'post', data, dataType: 'form-data', - timeout: 60 * 1000, + timeout: 180_000, }); } diff --git a/src/api/configManage/neManage.ts b/src/api/configManage/neManage.ts index 2e052430..d7e7b477 100644 --- a/src/api/configManage/neManage.ts +++ b/src/api/configManage/neManage.ts @@ -154,7 +154,7 @@ export function exportSet(data: Record) { headers: { 'Content-Type': 'application/octet-stream', }, - timeout: 60 * 1000, + timeout: 180_000, }); } @@ -182,7 +182,7 @@ export function importFile(data: Record) { method: 'post', data: obj, dataType, - timeout: 60 * 1000, + timeout: 180_000, }); } @@ -215,7 +215,7 @@ export function startNf(data: Record) { return request({ url: `/api/rest/systemManagement/v1/elementType/${data.neType}/objectType/service/start?neId=${data.neId}`, method: 'post', - timeout: 60 * 1000, + timeout: 180_000, }); } @@ -228,7 +228,7 @@ export function restartNf(data: Record) { return request({ url: `/api/rest/systemManagement/v1/elementType/${data.neType}/objectType/service/restart?neId=${data.neId}`, method: 'post', - timeout: 60 * 1000, + timeout: 180_000, }); } @@ -241,6 +241,6 @@ export function stopNf(data: Record) { return request({ url: `/api/rest/systemManagement/v1/elementType/${data.neType}/objectType/service/stop?neId=${data.neId}`, method: 'post', - timeout: 60 * 1000, + timeout: 180_000, }); } diff --git a/src/api/configManage/softwareManage.ts b/src/api/configManage/softwareManage.ts index d7675676..862683d8 100644 --- a/src/api/configManage/softwareManage.ts +++ b/src/api/configManage/softwareManage.ts @@ -80,7 +80,7 @@ export async function downloadNeSoftware(data: Record) { url: `/api/rest/systemManagement/v1/${data.neType}/software/${data.version}`, method: 'get', responseType: 'blob', - timeout: 60 * 1000, + timeout: 180_000, }); } @@ -97,7 +97,7 @@ export function uploadNeSoftware(data: FormData) { method: 'post', data, dataType: 'form-data', - timeout: 60 * 1000, + timeout: 180_000, }); } @@ -110,7 +110,7 @@ export async function sendNeSoftware(data: Record) { const result = await request({ url: `/api/rest/systemManagement/v1/${data.neType}/software/${data.version}/${data.neId}`, method: 'post', - timeout: 60 * 1000, + timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS) { @@ -129,7 +129,7 @@ export async function runNeSoftware(data: Record) { const result = await request({ url: `/api/rest/systemManagement/v1/${data.neType}/software/${data.version}/${data.neId}`, method: 'put', - timeout: 60 * 1000, + timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS) { @@ -148,7 +148,7 @@ export async function backNeSoftware(data: Record) { const result = await request({ url: `/api/rest/systemManagement/v1/${data.neType}/software/${data.version}/${data.neId}`, method: 'PATCH', - timeout: 60 * 1000, + timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS) { diff --git a/src/api/index.ts b/src/api/index.ts index f8df808d..b1b6f4c4 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -10,7 +10,7 @@ export async function listMain() { const result = await request({ url: '/api/rest/systemManagement/v1/elementType/all/objectType/systemState', method: 'get', - timeout: 30 * 1000, + timeout: 60_000, }); // console.log(result); let realData = result.data.data; diff --git a/src/api/logManage/logSet.ts b/src/api/logManage/logSet.ts index 30fa0177..d09e9278 100644 --- a/src/api/logManage/logSet.ts +++ b/src/api/logManage/logSet.ts @@ -302,6 +302,7 @@ export async function backupDownload(path: string) { url: `/api/rest/fileManagement/v1/path/file?path=${path}`, method: 'get', responseType: 'blob', + timeout: 180_000, }); } diff --git a/src/api/mmlManage/neOperate.ts b/src/api/mmlManage/neOperate.ts index a4c79df4..3222baf4 100644 --- a/src/api/mmlManage/neOperate.ts +++ b/src/api/mmlManage/neOperate.ts @@ -43,7 +43,7 @@ export async function sendMMlByNE( url: `/api/rest/operationManagement/v1/elementType/${neType}/objectType/mml?ne_id=${neId}`, method: 'post', data: { mml: [cmdStr] }, - timeout: 30_1000, + timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { diff --git a/src/api/mmlManage/omcOperate.ts b/src/api/mmlManage/omcOperate.ts index ed005f85..de506f12 100644 --- a/src/api/mmlManage/omcOperate.ts +++ b/src/api/mmlManage/omcOperate.ts @@ -37,7 +37,7 @@ export async function sendMMlByOMC(neId: string, cmdStr: string) { url: `/api/rest/operationManagement/v1/elementType/OMC/objectType/mml?ne_id=${neId}`, method: 'post', data: { mml: [cmdStr] }, - timeout: 30_1000, + timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { diff --git a/src/api/mmlManage/udmOperate.ts b/src/api/mmlManage/udmOperate.ts index ab7fdbae..2370184e 100644 --- a/src/api/mmlManage/udmOperate.ts +++ b/src/api/mmlManage/udmOperate.ts @@ -37,7 +37,7 @@ export async function sendMMlByUDM(neId: string, cmdStr: string) { url: `/api/rest/operationManagement/v1/elementType/UDM/objectType/mml?ne_id=${neId}`, method: 'post', data: { mml: [cmdStr] }, - timeout: 30_1000, + timeout: 180_000, }); // 解析数据 if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) { diff --git a/src/api/neUser/auth.ts b/src/api/neUser/auth.ts index d6a7f003..d18d06ed 100644 --- a/src/api/neUser/auth.ts +++ b/src/api/neUser/auth.ts @@ -51,7 +51,7 @@ export function loadAuth(neId: string) { return request({ url: `/api/rest/udmUserManage/v1/authSave/${neId}`, method: 'post', - timeout: 60 * 1000, + timeout: 180_000, }); } diff --git a/src/api/neUser/sub.ts b/src/api/neUser/sub.ts index e05df4c8..084faecf 100644 --- a/src/api/neUser/sub.ts +++ b/src/api/neUser/sub.ts @@ -11,6 +11,7 @@ export function exportSub(query: Record) { method: 'post', data: query, responseType: 'blob', + timeout: 180_000, }); } @@ -26,6 +27,7 @@ export function importSubData(neId: string, data: FormData) { method: 'post', data, dataType: 'form-data', + timeout: 180_000, }); } @@ -38,7 +40,7 @@ export function loadSub(neId: string) { return request({ url: `/api/rest/udmUserManage/v1/subSave/${neId}`, method: 'post', - timeout: 60 * 1000, + timeout: 180_000, }); } diff --git a/src/api/perfManage/goldTarget.ts b/src/api/perfManage/goldTarget.ts index 20742b3e..e1f1785c 100644 --- a/src/api/perfManage/goldTarget.ts +++ b/src/api/perfManage/goldTarget.ts @@ -44,7 +44,7 @@ export async function listgoldData(query: Record) { totalSQL: totalSQL + querySQL, rowsSQL: rowsSQL + querySQL + sortSql + limtSql, }, - timeout: 30 * 1000, + timeout: 60_000, }); // 解析数据 diff --git a/src/api/system/user.ts b/src/api/system/user.ts index febcce9e..c0a04eb2 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -11,6 +11,7 @@ export function importData(data: FormData) { method: 'post', data, dataType: 'form-data', + timeout: 180_000, }); } diff --git a/src/api/traceManage/pcap.ts b/src/api/traceManage/pcap.ts index 9b3ff45e..05a25c35 100644 --- a/src/api/traceManage/pcap.ts +++ b/src/api/traceManage/pcap.ts @@ -20,6 +20,7 @@ export function tcpdumpPcapDownload(data: Record) { method: 'post', data: data, responseType: 'blob', + timeout: 180_000, }); }