From ab15a55d7d1274845333190f42a6827bd8dc8945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Fri, 3 Jan 2025 17:03:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=82=E6=95=B0=E5=8A=A0=E5=AF=86=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/https/TsHttpUtil.js | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/https/TsHttpUtil.js b/src/https/TsHttpUtil.js
index 1604074..9cd7254 100644
--- a/src/https/TsHttpUtil.js
+++ b/src/https/TsHttpUtil.js
@@ -87,8 +87,7 @@ async function req(url, options) {
     }
     return new Promise((resolve, reject) => {
         request(url, {
-            ...dealParamsBody(options),
-            headers: {
+            ...dealParamsBody(options), headers: {
                 ...options.headers, token: Storage.getUserToken() || '',
             },
         })
@@ -123,12 +122,12 @@ async function req(url, options) {
  */
 async function get(url, params = {}, options = {}) {
     let obj = {...params}
-    if(GlobalConfig.getConfig().httpParams){
-            
-        obj = {...params,...GlobalConfig.getConfig().httpParams()};
+    if (GlobalConfig.getConfig().httpParams) {
+
+        obj = {...params, ...GlobalConfig.getConfig().httpParams()};
 
     }
-    return req(url, {...options, method: 'GET', params:obj});
+    return req(url, {...options, method: 'GET', params: obj});
 }
 
 /**
@@ -139,19 +138,15 @@ async function get(url, params = {}, options = {}) {
  */
 async function post(url, data = {}, options = {}) {
 
-    let newData = {}
-    if (Storage.getEncryptBody()) {
-        newData.encryptData = crypto.encrypt(JSON.stringify(data));
-    } else {
-
-        newData = {...data};
-
-        if(GlobalConfig.getConfig().httpParams){
-            
-            newData = {...data,...GlobalConfig.getConfig().httpParams()};
+    let newData = {...data};
+    if (GlobalConfig.getConfig().httpParams) {
+        newData = {...data, ...GlobalConfig.getConfig().httpParams()};
+    }
 
-        }
-    
+    if (Storage.getEncryptBody()) {
+        newData = {
+            'encryptData': crypto.encrypt(JSON.stringify(newData))
+        };
     }
 
     return req(url, {...options, method: 'POST', data: newData});
@@ -170,8 +165,5 @@ async function form(url, data = {}, options = {}) {
 
 
 module.exports = {
-    req,
-    get,
-    post,
-    form,
+    req, get, post, form,
 }