From 12499e78eab9829bac0af89a3211e1130dd61064 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 22 Nov 2023 19:33:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=B7=E6=B1=82=E7=BB=93=E6=9E=9Cmsg?= =?UTF-8?q?=E5=8F=96=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/configManage/config.ts | 4 ++-- src/api/configManage/configParam.ts | 8 ++++---- src/api/configManage/softwareManage.ts | 8 ++++---- src/api/faultManage/faultSetting.ts | 8 ++++---- src/api/logManage/logSet.ts | 14 +++++++------- src/api/mmlManage/mmlSet.ts | 4 ++-- src/api/monitor/session.ts | 4 ++-- src/api/tool/file.ts | 11 ++++++----- 8 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/api/configManage/config.ts b/src/api/configManage/config.ts index 373127da..a51c9cc0 100644 --- a/src/api/configManage/config.ts +++ b/src/api/configManage/config.ts @@ -3,7 +3,7 @@ import { RESULT_CODE_SUCCESS, RESULT_MSG_ERROR, } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; +import { language, request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; /** @@ -48,7 +48,7 @@ export async function updateConfig(tag: string, data: Record) { delete result.data; return result; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } } return result; diff --git a/src/api/configManage/configParam.ts b/src/api/configManage/configParam.ts index 70ac43ca..c7c9a2f4 100644 --- a/src/api/configManage/configParam.ts +++ b/src/api/configManage/configParam.ts @@ -4,8 +4,8 @@ import { RESULT_MSG_ERROR, RESULT_MSG_SUCCESS, } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; -import { parseFirstLower, parseObjLineToHump } from '@/utils/parse-utils'; +import { language, request } from '@/plugins/http-fetch'; +import { parseObjLineToHump } from '@/utils/parse-utils'; /** * 查询配置参数标签栏 @@ -335,7 +335,7 @@ export async function getParamConfigInfoForm( result.data.data = dataArray; // 无数据时，用于新增 - result.data.dataRule = { title: `Index-0`, key: 0, record : ruleArr} ; + result.data.dataRule = { title: `Index-0`, key: 0, record: ruleArr }; } return result; } @@ -457,7 +457,7 @@ export async function updateNeConfigReload(neType: string, neId: string) { } else if (str.indexOf('success') !== -1) { delete result.data; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } } return result; diff --git a/src/api/configManage/softwareManage.ts b/src/api/configManage/softwareManage.ts index 862683d8..592c28b4 100644 --- a/src/api/configManage/softwareManage.ts +++ b/src/api/configManage/softwareManage.ts @@ -3,7 +3,7 @@ import { RESULT_CODE_SUCCESS, RESULT_MSG_ERROR, } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; +import { language, request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; /** @@ -117,7 +117,7 @@ export async function sendNeSoftware(data: Record) { delete result.data; return result; } - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } /** @@ -136,7 +136,7 @@ export async function runNeSoftware(data: Record) { delete result.data; return result; } - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } /** @@ -155,7 +155,7 @@ export async function backNeSoftware(data: Record) { delete result.data; return result; } - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } /** diff --git a/src/api/faultManage/faultSetting.ts b/src/api/faultManage/faultSetting.ts index 5ac505ed..4b2d1c3e 100644 --- a/src/api/faultManage/faultSetting.ts +++ b/src/api/faultManage/faultSetting.ts @@ -4,7 +4,7 @@ import { RESULT_MSG_ERROR, RESULT_MSG_SUCCESS, } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; +import { language, request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; /** @@ -63,7 +63,7 @@ export async function getAlarmSet() { } } if (Object.keys(resultData).length === 0) { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR, data: {} }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: {} }; } return { code: RESULT_CODE_SUCCESS, @@ -117,7 +117,7 @@ export async function updateAlarmSet(data: Record) { } // 无变更时 if (resultNum === 0) { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR, data: 0 }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: 0 }; } return { code: RESULT_CODE_SUCCESS, @@ -183,7 +183,7 @@ export async function updateForwardSet(data: Record) { delete result.data; return result; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } } return result; diff --git a/src/api/logManage/logSet.ts b/src/api/logManage/logSet.ts index 21a00ff9..c75bb727 100644 --- a/src/api/logManage/logSet.ts +++ b/src/api/logManage/logSet.ts @@ -4,7 +4,7 @@ import { RESULT_MSG_ERROR, RESULT_MSG_SUCCESS, } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; +import { language, request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; /** @@ -53,7 +53,7 @@ export async function getLogSet() { } } if (Object.keys(resultData).length === 0) { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR, data: {} }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: {} }; } return { @@ -100,7 +100,7 @@ export async function updateLogSet(data: Record) { } // 无变更时 if (resultNum === 0) { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR, data: 0 }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: 0 }; } return { code: RESULT_CODE_SUCCESS, @@ -161,7 +161,7 @@ export async function updateFtpLogSet(data: Record) { delete result.data; return result; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } } return result; @@ -216,7 +216,7 @@ export async function updateRemoteOut(data: Record) { delete result.data; return result; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } } return result; @@ -249,7 +249,7 @@ export async function exportLog(query: Record) { order begin_time,end_time`; } if (!querySQL) { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR, data: [] }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: [] }; } // 发起请求 const result = await request({ @@ -286,7 +286,7 @@ export async function backupLog(logType: string) { result.data = v; return result; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR, data: 0 }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language], data: 0 }; } } return result; diff --git a/src/api/mmlManage/mmlSet.ts b/src/api/mmlManage/mmlSet.ts index 14c613c1..9b3957c5 100644 --- a/src/api/mmlManage/mmlSet.ts +++ b/src/api/mmlManage/mmlSet.ts @@ -3,7 +3,7 @@ import { RESULT_CODE_SUCCESS, RESULT_MSG_ERROR, } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; +import { language, request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; /** @@ -55,7 +55,7 @@ export async function updateOperationSet(data: Record) { delete result.data; return result; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } } return result; diff --git a/src/api/monitor/session.ts b/src/api/monitor/session.ts index 78077818..3863a896 100644 --- a/src/api/monitor/session.ts +++ b/src/api/monitor/session.ts @@ -3,7 +3,7 @@ import { RESULT_CODE_SUCCESS, RESULT_MSG_ERROR, } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; +import { language, request } from '@/plugins/http-fetch'; import { parseObjLineToHump } from '@/utils/parse-utils'; /** @@ -86,7 +86,7 @@ export async function logoutSession(id: string) { delete result.data; return result; } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } } return result; diff --git a/src/api/tool/file.ts b/src/api/tool/file.ts index 6d454b17..0a7f9ec6 100644 --- a/src/api/tool/file.ts +++ b/src/api/tool/file.ts @@ -1,4 +1,5 @@ -import { request } from '@/plugins/http-fetch'; +import { RESULT_CODE_ERROR, RESULT_CODE_SUCCESS, RESULT_MSG_ERROR } from '@/constants/result-constants'; +import { request, language } from '@/plugins/http-fetch'; import { encode } from 'js-base64'; /** @@ -37,7 +38,7 @@ export async function downloadFileChunk( async function sendRequest() { const range = `bytes=${start}-${end}`; const res = await downloadFile(filePath, range); - if (res.code === 200 && res.status === 206) { + if (res.code === RESULT_CODE_SUCCESS && res.status === 206) { // 总大小 const contentRange = res.headers.get('content-range') || '0/0'; totalSize = parseInt(contentRange.split('/')[1]); @@ -109,7 +110,7 @@ export async function uploadFileChunk( // 检查是否已上传部分数据块 const resCheck = await chunkCheck(fileIdentifier, name); - if (resCheck.code !== 200) { + if (resCheck.code !== RESULT_CODE_SUCCESS) { return resCheck; } @@ -130,7 +131,7 @@ export async function uploadFileChunk( formData.append('identifier', fileIdentifier); const resUpload = await chunkUpload(formData); - if (resUpload.code === 200) { + if (resUpload.code === RESULT_CODE_SUCCESS) { uploadedSize += chunk.size; uploadProgress = (uploadedSize / size) * 100; console.log(`上传进度：${uploadProgress}%`); @@ -144,7 +145,7 @@ export async function uploadFileChunk( if (uploadedSize === size) { return await chunkMerge(fileIdentifier, name, subPath); } - return { code: 500, msg: '上传出错，请重试' }; + return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; } /**