From b46ca975530168de06970e84c36c40029e789132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Tue, 22 Oct 2024 16:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=AF=81=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ets/http/HttpHelper.ts        | 15 ++++-----------
 src/main/ets/utils/ToolsHelper.ets     |  1 +
 src/main/ets/utils/ToolsHelperForTS.ts | 10 ++++++++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/ets/http/HttpHelper.ts b/src/main/ets/http/HttpHelper.ts
index 52aa5bb..24d23a0 100644
--- a/src/main/ets/http/HttpHelper.ts
+++ b/src/main/ets/http/HttpHelper.ts
@@ -2,6 +2,7 @@ import { ArrayList, HashMap } from '@kit.ArkTS';
 import http from '@ohos.net.http';
 import { SZYXLocalStorageHelper } from '../utils/SZYXLocalStorageHelper';
 import { SZYXLocalStorageKeys } from '../utils/SZYXLocalStorageKeys';
+import { ToolsHelperForTS } from '../utils/ToolsHelperForTS';
 
 
 type HttpParamsGet = {
@@ -311,7 +312,7 @@ export class HttpHelper {
     if (query) {
       let q = query
       if (typeof query === 'object') {
-        q = this.classToRecord(query)
+        q = ToolsHelperForTS.classToRecord(query)
       }
       u = `${u}${u.indexOf('?') < 0 ? '?' : u.endsWith('$') ? '' : '&'}`
       Object.entries(q).forEach((row) => {
@@ -331,7 +332,7 @@ export class HttpHelper {
     let u = ''
     let q = data
     if (typeof data === 'object') {
-      q = this.classToRecord(data)
+      q = ToolsHelperForTS.classToRecord(data)
     }
     Object.entries(q).forEach((row) => {
       if (row[1]) {
@@ -342,13 +343,5 @@ export class HttpHelper {
     return u
   }
 
-  private classToRecord(obj: Object): Record<string, string> {
-    const record: Record<string, string> = {} as Record<string, string>;
-    for (const key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        record[key] = obj[key];
-      }
-    }
-    return record;
-  }
+
 }
\ No newline at end of file
diff --git a/src/main/ets/utils/ToolsHelper.ets b/src/main/ets/utils/ToolsHelper.ets
index c262352..98766db 100644
--- a/src/main/ets/utils/ToolsHelper.ets
+++ b/src/main/ets/utils/ToolsHelper.ets
@@ -334,4 +334,5 @@ export class ToolsHelper {
     }
     return ToolsHelper.uniqueIdMap.get(fun)!;
   }
+
 }
\ No newline at end of file
diff --git a/src/main/ets/utils/ToolsHelperForTS.ts b/src/main/ets/utils/ToolsHelperForTS.ts
index e41f77c..da0da04 100644
--- a/src/main/ets/utils/ToolsHelperForTS.ts
+++ b/src/main/ets/utils/ToolsHelperForTS.ts
@@ -17,4 +17,14 @@ export class ToolsHelperForTS {
     }
     return myMap;
   }
+
+  public static  classToRecord(obj: Object): Record<string, string> {
+    const record: Record<string, string> = {} as Record<string, string>;
+    for (const key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        record[key] = obj[key];
+      }
+    }
+    return record;
+  }
 }
\ No newline at end of file