From a017f6a3f5b24637b99a38dbc0855785c6a2ebff Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期一, 20 四月 2026 11:01:32 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Core/Util/HttpClientHelper.cs | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/Util/HttpClientHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/Util/HttpClientHelper.cs"
index cd7019e..bb11df5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/Util/HttpClientHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/Util/HttpClientHelper.cs"
@@ -9,6 +9,7 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
using WIDESEA_Core.Helper;
namespace WIDESEA_Core.Util
@@ -85,10 +86,7 @@
{
try
{
- TResponse? response = JsonSerializer.Deserialize<TResponse>(result.Content, new JsonSerializerOptions
- {
- PropertyNameCaseInsensitive = true
- });
+ TResponse? response = JsonConvert.DeserializeObject<TResponse>(result.Content);
if (response != null)
{
result.Data = response;
@@ -129,10 +127,7 @@
{
try
{
- TResponse? response = JsonSerializer.Deserialize<TResponse>(result.Content, new JsonSerializerOptions
- {
- PropertyNameCaseInsensitive = true
- });
+ TResponse? response = JsonConvert.DeserializeObject<TResponse>(result.Content);
if (response != null)
{
result.Data = response;
@@ -175,7 +170,8 @@
try
{
response = await requestFunc(client);
- break;
+ if (response.StatusCode == System.Net.HttpStatusCode.OK)
+ break;
}
catch (Exception ex) when (retry < config.MaxRetryCount)
{
--
Gitblit v1.9.3