From 094900f921a0575baf1d8be2c67de3bf67f91b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Thu, 2 Nov 2023 00:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=94=A8=E4=BB=A5=E5=9C=A8=E7=A6=BB=E7=BA=BF=E6=97=B6?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F2.0=E7=B3=BB=E7=BB=9F=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/TwentySystemProxyClient.cs | 44 +++++++++++++++++++++++++------ 24Hour/appsettings.json | 3 ++- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/24Hour/TwentySystemProxyClient.cs b/24Hour/TwentySystemProxyClient.cs index 3416f1f..74a6009 100644 --- a/24Hour/TwentySystemProxyClient.cs +++ b/24Hour/TwentySystemProxyClient.cs @@ -10,9 +10,11 @@ namespace _24Hour public class TwentySystemProxyClient { private readonly HttpClient httpCliet; - public TwentySystemProxyClient(HttpClient _httpCliet) + private readonly IConfiguration configuration; + public TwentySystemProxyClient(HttpClient _httpCliet, IConfiguration _configuration) { this.httpCliet = _httpCliet; + this.configuration = _configuration; httpCliet.DefaultRequestHeaders.Add("Accept", "application/json"); httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample"); @@ -33,8 +35,20 @@ namespace _24Hour }.ConvertToGetParam(); try { - var request = await httpCliet.GetAsync($"/TwentySystem/GetCaseInfo{param}"); - var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var response = await Task.Run(async () => + { + var connectionString = configuration.GetSection("CaseTwenty:UseOfflineData").Value; + if (connectionString=="false") + { + var request = await httpCliet.GetAsync($"/TwentySystem/GetCaseInfo{param}"); + var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + return response; + } + else + { + return await File.ReadAllTextAsync(Path.Combine(Environment.CurrentDirectory,"caselist.txt")); + } + }); if (string.IsNullOrEmpty(response) == false) { var data = response.ConvertToModel>>(); @@ -59,7 +73,7 @@ namespace _24Hour { PageCount = 0, PageIndex = 0, - PageSize = 0, + PageSize = 0, RowsCount = 0, }, new List()); } @@ -89,12 +103,26 @@ namespace _24Hour bmsah = bmsah, dwbm = dwbm }.ConvertToGetParam(); - var request = await httpCliet.GetAsync($"/TwentySystem/GetJZXX{param}"); - var json = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + + + var json = await Task.Run(async() => + { + var connectionString = configuration.GetSection("CaseTwenty:UseOfflineData").Value; + if (connectionString == "false") + { + var request = await httpCliet.GetAsync($"/TwentySystem/GetJZXX{param}"); + var jsonstr = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + return jsonstr; + } + else + { + return await File.ReadAllTextAsync(Path.Combine(Environment.CurrentDirectory, "jzlist.txt")); + } + }); var res = json.ConvertToModel>(); if (res.IsSucceed == true) { - if (res.result==null) + if (res.result == null) { result.IsSucceed = false; result.Message = "卷宗目录为空"; @@ -108,7 +136,7 @@ namespace _24Hour return result; } convert.Id = Guid.NewGuid().ToString(); - if (convert?.jzml?.Any()==true) + if (convert?.jzml?.Any() == true) { await Task.Delay(5); foreach (var ml in convert.jzml) diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index e592234..9b0711c 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -52,7 +52,8 @@ "miniprogram_state": "trial" }, "CaseTwenty": { - "SysAddress": "http://127.0.0.1:5194" + "SysAddress": "http://127.0.0.1:5194", + "UseOfflineData": "true" }, "SyncDataFromJiguang": { "enable": "false"