From 673cffb7665ae94a454c9e332b3a63665e4b3c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 4 Dec 2023 15:24:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/Common/LawyerArchivesController.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 39d3ad3..f13b865 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -854,7 +854,7 @@ namespace _24Hour.Controllers.Common logger.LogInformation($"get lawyerinfo:{lawyer.ConvertToJsonStr()}"); logger.LogInformation($"get departmenginfo:{departmenginfo.ConvertToJsonStr()}"); - var bmsah= lawyerArchives.bmsah; + var bmsah = lawyerArchives.bmsah; var partyIDcard = lawyersvc.partyIDcard; var party = lawyersvc.party; var identitycardId = lawyer.identitycardId; @@ -1871,7 +1871,7 @@ namespace _24Hour.Controllers.Common try { var lawyerarchives = await _db.Queryable() - .In(info => info.Id, ids) + .Where(x => ids.Contains(x.Id)) .ToListAsync(); var userids = lawyerarchives .Select(x => x.createuserId) @@ -1896,7 +1896,10 @@ namespace _24Hour.Controllers.Common { lawyerservices = lawyerarchives, users = users - }.ConvertToJsonStr().ConvertToBase64(); + } + .ConvertToJsonStr() + .ConvertToBase64(); + System.IO.File.WriteAllText(jsonfilepath, jsonstr); //存储预约申请的相关附件 foreach (var item in lawyerarchives) @@ -2068,7 +2071,7 @@ namespace _24Hour.Controllers.Common return result; } - + public class DecodeQRDataModel { public string QRData { get; set; } From c1fe5c7a9f34405756f0b8d8a71f03ee5faf5201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 4 Dec 2023 15:24:33 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=A8=E4=B8=80=E4=B8=AA=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=94=A8=E6=9D=A5=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E5=86=85=E7=BD=91=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerservicesController.cs | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index df45ed6..ba44c9f 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -142,6 +142,37 @@ namespace _24Hour.Controllers.Common _logs.WriteSysLogadd("律师服务", "添加律师服务", result, _db); return result; } + /// + /// 添加律师服务 + /// + /// + /// + [HttpPost] + [Route("AddLawyerInNet")] + public async Task AddLawyerInNet(App_LawyerServicesModel Lawyerdata) + { + try + { + _db.BeginTran(); + Lawyerdata.Id = Guid.NewGuid().ToString(); + var num = await _db.Insertable(Lawyerdata).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "添加成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + LogService.WriteLog(ex, "添加律师服务预约"); + } + _logs.WriteSysLogadd("律师服务", "添加律师服务", result, _db); + return result; + } /// /// 修改律师服务预约 @@ -162,7 +193,7 @@ namespace _24Hour.Controllers.Common result.IsSucceed = true; result.result = "修改成功"; } - } + } catch (System.Exception ex) { _db.RollbackTran(); From 59d8f06a393562a4ec943123bb831deabe794a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 4 Dec 2023 15:24:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/TwentySystemProxyClient.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/24Hour/TwentySystemProxyClient.cs b/24Hour/TwentySystemProxyClient.cs index 7aabd26..5c54610 100644 --- a/24Hour/TwentySystemProxyClient.cs +++ b/24Hour/TwentySystemProxyClient.cs @@ -51,7 +51,6 @@ namespace _24Hour PartyIdCard = PartyIdCard }.ConvertToGetParam(); - var response = await Task.Run(async () => { @@ -109,7 +108,7 @@ namespace _24Hour } else { - var request = await httpCliet.GetAsync($"/TwentySystem/DsrList{bodu}"); + var request = await httpCliet.GetAsync($"/TwentySystem/LsList{bodu}"); return await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); } }); From 14914bc4c66f35ffb6393dc452001a16bf421d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 4 Dec 2023 15:25:15 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=80=A7=20Data?= =?UTF-8?q?Member?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Entity/AppMode/App_LawyerServicesModel.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Elight.Entity/AppMode/App_LawyerServicesModel.cs b/Elight.Entity/AppMode/App_LawyerServicesModel.cs index 8ff2b33..2bf1817 100644 --- a/Elight.Entity/AppMode/App_LawyerServicesModel.cs +++ b/Elight.Entity/AppMode/App_LawyerServicesModel.cs @@ -46,11 +46,12 @@ namespace Elight.Entity /// 访问日期 /// [DataMember] - public DateTime? receptiontime { get; set; } - + public DateTime? receptiontime { get; set; } + /// /// 访问结束时间 /// + [DataMember] public DateTime? receptionEndtime { get; set; } /// From 5153ba33d6da21345602cd2437d6db8aad8990fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 4 Dec 2023 15:25:47 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebApplication1/Controllers/TwentySystemController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebApplication1/Controllers/TwentySystemController.cs b/WebApplication1/Controllers/TwentySystemController.cs index 3afb0a6..97754a0 100644 --- a/WebApplication1/Controllers/TwentySystemController.cs +++ b/WebApplication1/Controllers/TwentySystemController.cs @@ -32,14 +32,14 @@ namespace WebApplication1.Controllers ip = configuration.GetSection("Configs:SystemIp").Value; port = configuration.GetSection("Configs:Port").Value; httpClient = httpClientFactory.CreateClient(); - httpClient.BaseAddress = new Uri("http://143.120.5.116:8080"); // new Uri($"http://{ip}:{port}"); + httpClient.BaseAddress = new Uri($"http://{ip}:{port}"); httpClient.DefaultRequestHeaders.Add("Accept", "application/json"); httpClient.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample"); httpClient.DefaultRequestHeaders.ConnectionClose = true; } [HttpGet] public async Task> GetJZXX(string dwbm, string bmsah) - { + { try { MDossier dossier = new MDossier(dwbm, $"{ip}:{port}"); From c831c4716c39ebb975e2aac0d7328c1565e8eb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 4 Dec 2023 15:26:13 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E8=87=B31.0.1.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/24Hour.csproj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj index c2b3579..ef4b6c0 100644 --- a/24Hour/24Hour.csproj +++ b/24Hour/24Hour.csproj @@ -8,8 +8,8 @@ True e485308c-2f05-470b-b0a4-68f1ec2b3412 Linux - 1.0.1.17 - 1.0.1.17 + 1.0.1.25 + 1.0.1.25 @@ -47,9 +47,6 @@ - - Always - Always From e0e0e2b6c12b68fea7e7ba9e2d1db53fbb28d02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 4 Dec 2023 15:26:32 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=A0=E9=99=A4http=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/appsettings.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index ebd9999..63a1bc6 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -41,20 +41,6 @@ "DomainUrl": "http://localhost:8006", "HubCorUrls": [] }, - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://localhost:8095" - }, - "Https": { - "Url": "https://localhost:8099", - "Certificate": { - "Path": "bgqyj.cn.pfx", - "Password": "l8717f1v9q7h" - } - } - } - }, "Videoaddress": { "rtmp": "rtmp://192.168.0.24:1935/live/", "rtsp": "rtsp://192.168.0.24:8554/live/"