From 5953113240802cd0545fb94e6c4e6d413ece74cc Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 24 三月 2026 11:50:07 +0800
Subject: [PATCH] WMS新增缺失前端页面并接入路由
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Http/HTTP/HttpClientHelper.cs | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Http/HTTP/HttpClientHelper.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Http/HTTP/HttpClientHelper.cs
index 4b08204..cce0a8c 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Http/HTTP/HttpClientHelper.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Http/HTTP/HttpClientHelper.cs
@@ -10,6 +10,8 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
+using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.HttpEnum;
using WIDESEAWCS_Core.Caches;
namespace WIDESEA_Core
@@ -35,26 +37,31 @@
/// <returns></returns>
public HttpResponseResult Post(string url, string content, string contentType = "application/json", HttpRequestConfig? config = null)
{
- url = _cache.Get(url);
- HttpResponseResult httpResponseResult = ExecuteAsync(async (client) =>
+ HttpResponseResult httpResponseResult = Task.Run(async () =>
{
- var request = new HttpRequestMessage(HttpMethod.Post, url);
- request.Content = new StringContent(content ?? string.Empty, Encoding.UTF8, contentType);
- SetRequestHeaders(request, config?.Headers);
- return await client.SendAsync(request);
- }, config, $"POST {url}").Result;
+ return await ExecuteAsync(async (client) =>
+ {
+ var request = new HttpRequestMessage(HttpMethod.Post, url);
+ request.Content = new StringContent(content ?? string.Empty, Encoding.UTF8, contentType);
+ SetRequestHeaders(request, config?.Headers);
+ return await client.SendAsync(request);
+ }, config, $"POST {url}");
+ }).GetAwaiter().GetResult();
httpResponseResult.ApiUrl = url;
return httpResponseResult;
}
public HttpResponseResult Get(string url, HttpRequestConfig? config = null)
{
- HttpResponseResult httpResponseResult = ExecuteAsync(async (client) =>
+ HttpResponseResult httpResponseResult = Task.Run(async () =>
{
- var request = new HttpRequestMessage(HttpMethod.Get, url);
- SetRequestHeaders(request, config?.Headers);
- return await client.SendAsync(request);
- }, config, $"GET {url}").Result;
+ return await ExecuteAsync(async (client) =>
+ {
+ var request = new HttpRequestMessage(HttpMethod.Get, url);
+ SetRequestHeaders(request, config?.Headers);
+ return await client.SendAsync(request);
+ }, config, $"GET {url}");
+ }).GetAwaiter().GetResult();
httpResponseResult.ApiUrl = url;
return httpResponseResult;
@@ -72,6 +79,7 @@
public HttpResponseResult<TResponse> Post<TResponse>(string url, string content, string contentType = "application/json", HttpRequestConfig? config = null)
{
+ url = BaseAPI.WMSBaseUrl + _cache.Get($"{RedisPrefix.Code}:{RedisName.API}:{url}");
HttpResponseResult httpResponseResult = Post(url, content, contentType, config);
HttpResponseResult<TResponse> result = new HttpResponseResult<TResponse>
@@ -113,6 +121,7 @@
public HttpResponseResult<TResponse> Get<TResponse>(string url, HttpRequestConfig? config = null)
{
+ url = BaseAPI.WMSBaseUrl + _cache.Get(url);
HttpResponseResult httpResponseResult = Get(url, config);
HttpResponseResult<TResponse> result = new HttpResponseResult<TResponse>
--
Gitblit v1.9.3