From d76b0e40e5bb127fd33aa1f7842447a1df0628d5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 22:16:34 +0800
Subject: [PATCH] Update PublicAssmeblyBLL.cs

---
 HDL_ON/DAL/Server/HttpUtil.cs |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index d0b9cf1..2ef648a 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using HDL_ON.Entity;
 using RestSharp;
+using Shared;
 
 namespace HDL_ON.DAL.Server
 {
@@ -44,7 +45,6 @@
         #endregion
 
         #region **********缃戠粶璇锋眰灏佽**********
-
         /// <summary>
         ///  Get  璇锋眰鏈嶅姟鍣ㄦ柟娉�
         /// </summary>
@@ -154,7 +154,7 @@
 
             if(MainPage.NoLoginMode)
             {
-                return new ResponsePackNew() { Code = "0" };
+                return new ResponsePackNew() { Code = "0" ,Data = "" };
             }
             #region HttpWebRequest
             try
@@ -172,6 +172,7 @@
                 RestRequest request = new RestRequest(method);
                 request.Timeout = mTimeout * 1000;
                 request.AddHeader("content-type", "application/json");
+                request.AddHeader("language", Language.CurrentLanguage == "Chinese" ? "cn" : "en");//澧炲姞璇█鏍囪瘑 wxr 2023-03-22 17:03:34
 
                 if (string.IsNullOrEmpty(replaceToken))
                 {
@@ -184,6 +185,7 @@
                 {
                     request.AddHeader("Authorization", replaceToken); 
                 }
+
            
                 if (bodyParameterJson != null)
                 {
@@ -235,7 +237,19 @@
                 }
                 else
                 {
-                    HDL_ON.Utlis.WriteLine($"鎺ュ彛寮傚父:{requestFullUrl} \r\n"+response.ErrorMessage);
+                    HDL_ON.Utlis.WriteLine($"鎺ュ彛寮傚父:{requestFullUrl} \r\n"+response.Content);
+                    if(response.Content!= null)
+                    {
+                        try
+                        {
+                            var pack = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
+                            if (pack != null)
+                            {
+                                return pack;
+                            }
+                        }
+                        catch { }
+                    }
                     return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                 }
 

--
Gitblit v1.8.0