From 749d83e00f4ffe9b3a2cc3a76e72529c4b46f42d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 25 Oct 2023 19:21:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=91=E9=80=81mml=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B430=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/configManage/configParam.ts | 6 +++++-
 src/api/mmlManage/neOperate.ts      | 1 +
 src/api/mmlManage/omcOperate.ts     | 1 +
 src/api/mmlManage/udmOperate.ts     | 6 ++----
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/api/configManage/configParam.ts b/src/api/configManage/configParam.ts
index a3c529c3..31289c48 100644
--- a/src/api/configManage/configParam.ts
+++ b/src/api/configManage/configParam.ts
@@ -374,11 +374,15 @@ 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,
   });
   // 解析数据
   if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {
     const v = result.data.data[0];
-    if (v && v.toLowerCase().includes('ok')) {
+    const str = v.toLowerCase();
+    if (str.indexOf('ok') !== -1) {
+      delete result.data;
+    } else if (str.indexOf('success') !== -1) {
       delete result.data;
     } else {
       return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR };
diff --git a/src/api/mmlManage/neOperate.ts b/src/api/mmlManage/neOperate.ts
index 8a4351fc..a4c79df4 100644
--- a/src/api/mmlManage/neOperate.ts
+++ b/src/api/mmlManage/neOperate.ts
@@ -43,6 +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,
   });
   // 解析数据
   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 342d6a4c..ed005f85 100644
--- a/src/api/mmlManage/omcOperate.ts
+++ b/src/api/mmlManage/omcOperate.ts
@@ -37,6 +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,
   });
   // 解析数据
   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 966c31e6..ab7fdbae 100644
--- a/src/api/mmlManage/udmOperate.ts
+++ b/src/api/mmlManage/udmOperate.ts
@@ -31,15 +31,13 @@ export async function getMMLByUDM() {
  * @param cmdStr 命令串
  * @returns
  */
-export async function sendMMlByUDM(
-  neId: string,
-  cmdStr: string
-) {
+export async function sendMMlByUDM(neId: string, cmdStr: string) {
   // 发起请求
   const result = await request({
     url: `/api/rest/operationManagement/v1/elementType/UDM/objectType/mml?ne_id=${neId}`,
     method: 'post',
     data: { mml: [cmdStr] },
+    timeout: 30_1000,
   });
   // 解析数据
   if (result.code === RESULT_CODE_SUCCESS && Array.isArray(result.data.data)) {