From 3fb1fd85419c7e98caee7bf4a37893e7ce96ada7 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 5 Dec 2023 15:12:09 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9EditLawyerDepartmentPho?= =?UTF-8?q?to=20EditLawyerIdentityphoto=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SystemControllerController.cs | 546 +++++++++--------- 1 file changed, 276 insertions(+), 270 deletions(-) diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs index be5ef01..90049a8 100644 --- a/24Hour/Controllers/system/SystemControllerController.cs +++ b/24Hour/Controllers/system/SystemControllerController.cs @@ -678,18 +678,18 @@ namespace _24Hour.Controllers.system /// /// /// - [HttpGet] + [HttpPost] [Route("EditLawyerDepartmentPhoto")] - public async Task EditLawyerDepartmentPhoto(string photo,string lawyerid) + public async Task EditLawyerDepartmentPhoto(EditLawyerInput input) { try { _db.BeginTran(); - var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == lawyerid).ToListAsync(); + var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id ==input.lawyerid).ToListAsync(); userlist.ForEach(q => { //头像地址 - q.departmentPhoto = photo; + q.departmentPhoto = input.photo.ConvertToJsonStr(); }); var num = await _db.Updateable(userlist).ExecuteCommandAsync(); _db.CommitTran(); @@ -709,273 +709,279 @@ namespace _24Hour.Controllers.system _logs.WriteSysLogadd("用户管理", "用户部门证件替换", result, _db); return result; } - /// - /// 根据律师id修改律师职业证图片 - /// - /// - /// - /// - [HttpGet] - [Route("EditLawyerIdentityphoto")] - public async Task EditLawyerIdentityphoto(string photo, string lawyerid) - { - try - { - _db.BeginTran(); - var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == lawyerid).ToListAsync(); - userlist.ForEach(q => - { - //头像地址 - q.identityphoto = photo; - }); - var num = await _db.Updateable(userlist).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; - } - /// - /// 修改身份证件 Identityphoto - /// - /// - /// - [HttpGet] - [Route("EditIdentityphoto")] - public async Task EditIdentityphoto(string photo) - { - try - { - _db.BeginTran(); - var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); - userlist.ForEach(q => - { - //头像地址 - q.identityphoto = photo; - }); - var num = await _db.Updateable(userlist).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; - } - /// - /// 修改身份证 cardIdphoto - /// - /// - /// - [HttpGet] - [Route("EditCardIdphoto")] - public async Task EditCardIdphoto(string photo) + public class EditLawyerInput { - try - { - _db.BeginTran(); - var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); - userlist.ForEach(q => - { - //头像地址 - q.cardIdphoto = photo; - }); - var num = await _db.Updateable(userlist).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; - } - - /// - /// app--认证接口 - /// - /// 用户Id - /// 审核状态：0：通过，1：不通过 - /// 审核描述 - /// 律师信息审核认证 - [HttpGet] - [Route("Examine")] - public async Task Examine(string Id, int status, string describe) - { - try - { - _db.BeginTran(); - var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); - userlist.ForEach(q => - { - q.audit = status; - q.describe = describe; - }); - var num = await _db.Updateable(userlist).ExecuteCommandAsync(); - _db.CommitTran(); - if (num > 0) - { - result.IsSucceed = true; - result.result = status == 0 ? "认证通过" : "认证不通过"; - } - } - catch (System.Exception ex) - { - _db.RollbackTran(); - result.IsSucceed = false; - result.Message = ex.Message; - LogService.WriteLog(ex, "用户头像替换"); - } - _logs.WriteSysLogadd("用户管理", "用户头像替换", result, _db); - return result; - } - #endregion - - #region 角色管理 - /// - /// 角色分页查询 - /// - /// - /// - [HttpPost] - [Route("QueryRole")] - public async Task QueryRole(App_Sys_RoleInput roledata) - { - RefAsync totalNumber = 0;//总数据 - var list = await _db.Queryable() - .WhereIF(roledata.name.NotNull(), q => q.name.Contains(roledata.name)) - .WhereIF(roledata.unitCode.NotNull(), q => q.unitCode.Contains(roledata.unitCode)) - .WhereIF(_userdata.phone != "admin", x => x.userId == _userdata.Id) - .Where(q => q.IsDeleted == 0).ToPageListAsync(roledata.PageIndex, roledata.PageSize, totalNumber); - roledata.RowsCount = totalNumber; - var data = new QueryResult(roledata, list); - result.IsSucceed = true; - result.result = data; - return result; - } - - /// - /// 添加角色 - /// - /// - /// - [HttpPost] - [Route("AddRole")] - public async Task AddRole(App_Sys_RoleModel Roledata) - { - try - { - _db.BeginTran(); - Roledata.Id = Guid.NewGuid().ToString(); - Roledata.userId = _userdata.Id.ToString(); - Roledata.username = _userdata.name; - var num = await _db.Insertable(Roledata).ExecuteCommandAsync(); - _db.CommitTran(); - if (num > 0) - { - result.IsSucceed = true; - result.result = "添加成功"; - } - } - catch (System.Exception ex) - { - _db.RollbackTran(); - result.IsSucceed = false; - result.Message = ex.Message; - } - _logs.WriteSysLogadd("角色管理", "添加角色信息", result, _db); - return result; - } - - /// - /// 修改角色 - /// - /// - /// - [HttpPost] - [Route("UpdateRole")] - public async Task UpdateRole(App_Sys_RoleModel Roledata) - { - try - { - _db.BeginTran(); - var num = await _db.Updateable(Roledata).UpdateColumns(it => new { it.name }).ExecuteCommandAsync(); - _db.CommitTran(); - if (num > 0) - { - result.IsSucceed = true; - result.result = "修改成功"; - } - } - catch (System.Exception ex) - { - _db.RollbackTran(); - result.IsSucceed = false; - result.Message = ex.Message; - } - _logs.WriteSysLogadd("角色管理", "修改角色信息", result, _db); - return result; - } - - /// - /// 删除角色 - /// - /// - /// - [HttpPost] - [Route("DeleteRole")] - public async Task DeleteRole(CurrencyDelete Currency) - { - try - { - _db.BeginTran(); - var userlist = await _db.Queryable().In(q => q.Id, Currency.id).ToListAsync(); - userlist.ForEach(q => - { - q.IsDeleted = 1; - }); - var num = await _db.Updateable(userlist).ExecuteCommandAsync(); - _db.CommitTran(); - if (num > 0) - { - result.IsSucceed = true; - result.result = "删除成功"; - } - } - catch (System.Exception ex) - { - _db.RollbackTran(); - result.IsSucceed = false; - result.Message = ex.Message; - } + public string[] photo { get; set; } + public string lawyerid { get; set; } + } + + /// + /// 根据律师id修改律师职业证图片 + /// + /// + /// + /// + [HttpPost] + [Route("EditLawyerIdentityphot")] + public async Task EditLawyerIdentityphoto(EditLawyerInput input) + { + try + { + _db.BeginTran(); + var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id ==input.lawyerid).ToListAsync(); + userlist.ForEach(q => + { + //头像地址 + q.identityphoto =input.photo.ConvertToJsonStr(); + }); + var num = await _db.Updateable(userlist).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; + } + /// + /// 修改身份证件 Identityphoto + /// + /// + /// + [HttpGet] + [Route("EditIdentityphoto")] + public async Task EditIdentityphoto(string photo) + { + try + { + _db.BeginTran(); + var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); + userlist.ForEach(q => + { + //头像地址 + q.identityphoto = photo; + }); + var num = await _db.Updateable(userlist).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; + } + /// + /// 修改身份证 cardIdphoto + /// + /// + /// + [HttpGet] + [Route("EditCardIdphoto")] + public async Task EditCardIdphoto(string photo) + { + try + { + _db.BeginTran(); + var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == _userdata.Id).ToListAsync(); + userlist.ForEach(q => + { + //头像地址 + q.cardIdphoto = photo; + }); + var num = await _db.Updateable(userlist).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; + } + + /// + /// app--认证接口 + /// + /// 用户Id + /// 审核状态：0：通过，1：不通过 + /// 审核描述 + /// 律师信息审核认证 + [HttpGet] + [Route("Examine")] + public async Task Examine(string Id, int status, string describe) + { + try + { + _db.BeginTran(); + var userlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); + userlist.ForEach(q => + { + q.audit = status; + q.describe = describe; + }); + var num = await _db.Updateable(userlist).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = status == 0 ? "认证通过" : "认证不通过"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + LogService.WriteLog(ex, "用户头像替换"); + } + _logs.WriteSysLogadd("用户管理", "用户头像替换", result, _db); + return result; + } + #endregion + + #region 角色管理 + /// + /// 角色分页查询 + /// + /// + /// + [HttpPost] + [Route("QueryRole")] + public async Task QueryRole(App_Sys_RoleInput roledata) + { + RefAsync totalNumber = 0;//总数据 + var list = await _db.Queryable() + .WhereIF(roledata.name.NotNull(), q => q.name.Contains(roledata.name)) + .WhereIF(roledata.unitCode.NotNull(), q => q.unitCode.Contains(roledata.unitCode)) + .WhereIF(_userdata.phone != "admin", x => x.userId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToPageListAsync(roledata.PageIndex, roledata.PageSize, totalNumber); + roledata.RowsCount = totalNumber; + var data = new QueryResult(roledata, list); + result.IsSucceed = true; + result.result = data; + return result; + } + + /// + /// 添加角色 + /// + /// + /// + [HttpPost] + [Route("AddRole")] + public async Task AddRole(App_Sys_RoleModel Roledata) + { + try + { + _db.BeginTran(); + Roledata.Id = Guid.NewGuid().ToString(); + Roledata.userId = _userdata.Id.ToString(); + Roledata.username = _userdata.name; + var num = await _db.Insertable(Roledata).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "添加成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("角色管理", "添加角色信息", result, _db); + return result; + } + + /// + /// 修改角色 + /// + /// + /// + [HttpPost] + [Route("UpdateRole")] + public async Task UpdateRole(App_Sys_RoleModel Roledata) + { + try + { + _db.BeginTran(); + var num = await _db.Updateable(Roledata).UpdateColumns(it => new { it.name }).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "修改成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } + _logs.WriteSysLogadd("角色管理", "修改角色信息", result, _db); + return result; + } + + /// + /// 删除角色 + /// + /// + /// + [HttpPost] + [Route("DeleteRole")] + public async Task DeleteRole(CurrencyDelete Currency) + { + try + { + _db.BeginTran(); + var userlist = await _db.Queryable().In(q => q.Id, Currency.id).ToListAsync(); + userlist.ForEach(q => + { + q.IsDeleted = 1; + }); + var num = await _db.Updateable(userlist).ExecuteCommandAsync(); + _db.CommitTran(); + if (num > 0) + { + result.IsSucceed = true; + result.result = "删除成功"; + } + } + catch (System.Exception ex) + { + _db.RollbackTran(); + result.IsSucceed = false; + result.Message = ex.Message; + } _logs.WriteSysLogadd("角色管理", "删除角色信息", result, _db); return result; } From f26bb659f208527e1fd784a64d6af0b1d4c1aa71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 15:12:54 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index f13b865..718182a 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -14,6 +14,7 @@ using Elight.Utility.Extensions; using Elight.Utility.logs; using java.io; using java.lang; +using java.nio.file; using java.time; using javax.xml.crypto; using Microsoft.AspNetCore.Authorization; @@ -33,6 +34,7 @@ using static _24Hour.TwentySystemProxyClient; using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion; using static NPOI.HSSF.Util.HSSFColor; using Exception = System.Exception; +using Path = System.IO.Path; using User = Elight.Utility.User; namespace _24Hour.Controllers.Common @@ -2070,7 +2072,87 @@ namespace _24Hour.Controllers.Common return result; } + [HttpPost] + [Route("SyncLawyerInfoFromTwentySys")] + public async Task SyncLawyerInfoFromTwentySys() + { + var data = await twentyClient.GetAllLsList(); + if (data.IsSucceed == true) + { + if (data?.result?.content?.Any() == true) + { + var datas = data.result.content + .Where(x => x.zjlxmc == "律师执业证") + .Select(x => new App_Sys_UserModel + { + Id = Guid.NewGuid().ToString(), + name = x?.sqrxm, + phone = x?.lxdh?.ToString(), + departmentName = x?.szlssws, + identitycardId = x?.zjhm, + cardId = x?.jmsfzh, + unitCode = _userdata?.unitCode, + createtime = DateTime.Now, + createuserId = _userdata?.createuserId, + createusername = _userdata?.name, + identity = "律师", + usertype = 1, + audit = 0, + isdeactivate = 0, + IsDeleted = 0, + }).ToList(); + var lawyers = datas + .GroupBy(x => new + { + x.cardId + }) + .Select(x => x.FirstOrDefault()) + .ToList(); + var ids = lawyers.Select(x => x.cardId).ToList(); + var lawyerindb = _db.Queryable() + .Where(x => ids.Contains(x.cardId)) + .ToList(); + var addlist = new List(); + var editlist = new List(); + + foreach (var item in lawyers) + { + var editentity = lawyerindb.FirstOrDefault(x => x.cardId == item.cardId); + if (editentity == null) + { + addlist.Add(item); + } + else + { + editentity.unitCode = _userdata.unitCode; + editentity.phone = item.phone; + editentity.phone = item.phone; + editentity.departmentName = item.departmentName; + editentity.identitycardId = item.identitycardId; + editentity.identity = item.identitycardId; + editentity.usertype = 1; + editentity.audit = 0; + editentity.isdeactivate = 0; + editentity.IsDeleted = 0; + editlist.Add(editentity); + } + } + _db.BeginTran(); + var num = await _db.Insertable(addlist).ExecuteCommandAsync(); + var nums = await _db.Updateable(editlist).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + _db.CommitTran(); + result.result = new + { + updated = nums, + added = num + }; + } + } + + + return result; + } public class DecodeQRDataModel { From 3688a161b1b2eb6668a75973d85d325c9eea6a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:05:44 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=85=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E6=9B=B4=E6=96=B0=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/Common/LawyerArchivesController.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 718182a..3e5f300 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -373,6 +373,9 @@ namespace _24Hour.Controllers.Common { return Result.Error("当前预约信息已被分配"); } + lawsvc.objectstr = dto.casename; + + var entity = mapper.Map(dto); entity.Id = Guid.NewGuid().ToString(); entity.createrId = _userdata.Id; @@ -385,6 +388,7 @@ namespace _24Hour.Controllers.Common _db.BeginTran(); _db.Updateable(lawsvc).UpdateColumns(x => x.IsAssigned).ExecuteCommand(); var num = await _db.Insertable(entity).ExecuteCommandAsync(); + await _db.Updateable(lawsvc).UpdateColumns(x => x.objectstr).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { From f359249885cb589f00dc51cbe93dae5c3175529f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:15:20 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E5=86=85=E7=BD=91=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=92=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=88=86=E9=85=8D=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/Common/LawyerservicesController.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index 8da81de..1edd36e 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -157,6 +157,8 @@ namespace _24Hour.Controllers.Common Lawyerdata.Id = Guid.NewGuid().ToString(); Lawyerdata.state = 1; Lawyerdata.unitCode = _userdata.unitCode; + Lawyerdata.IsAssigned = false; + Lawyerdata.creationtime = DateTime.Now; var num = await _db.Insertable(Lawyerdata).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) From ab0c81a6df9ff4ce72615dd9a6d3a99aad0e5d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:15:50 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/TwentySystemProxyClient.cs | 50 ++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/24Hour/TwentySystemProxyClient.cs b/24Hour/TwentySystemProxyClient.cs index 5c54610..8cdc244 100644 --- a/24Hour/TwentySystemProxyClient.cs +++ b/24Hour/TwentySystemProxyClient.cs @@ -53,7 +53,7 @@ namespace _24Hour var response = await Task.Run(async () => { - + if (UseOfflineData == "true") { var json = "{\"data\":{\"endRow\":1,\"firstPage\":1,\"hasNextPage\":false,\"isFirstPage\":true,\"isLastPage\":true,\"lastPage\":1,\"list\":[{\"bmsah\":\"安北检刑诉受[2023]410503000002号\",\"gjdm\":\"9911180200001\",\"gjmc\":\"中国\",\"mzdm\":\"9912180100001\",\"mzmc\":\"汉族\",\"xbdm\":\"9909180000001\",\"xbmc\":\"男性\",\"xm\":\"李四\",\"zjhm\":\"410502199606164872\",\"zjlxdm\":\"9910180300001\",\"zjlxmc\":\"居民身份证\",\"zrrbm\":\"4105030323000001\",\"zrrlxdm\":\"0009000900001\",\"zrrlxmc\":\"嫌疑人\"}],\"navigateFirstPage\":1,\"navigateLastPage\":1,\"navigatePages\":8,\"navigatepageNums\":[1],\"nextPage\":0,\"pageNum\":1,\"pageSize\":20,\"pages\":1,\"prePage\":0,\"size\":1,\"startRow\":1,\"total\":1},\"code\":\"0\",\"success\":true,\"message\":\"操作成功\"}"; @@ -84,13 +84,41 @@ namespace _24Hour result.IsSucceed = false; result.Message = data?.message ?? "操作失败"; } - if (UseOfflineData=="true") + if (UseOfflineData == "true") { result.Message = "操作成功(测试数据)"; } return result; } + public async Task> GetAllLsList() + { + var response = await Task.Run(async () => + { + var request = await httpCliet.GetAsync($"/TwentySystem/GetAllLsList"); + return await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + }); + var data = response.ConvertToAnonymousType(new + { + message = default(string), + success = default(bool), + code = default(string), + data = default(FindSqrxxDto) + }); + Result result = new Result(); + if (data?.success == true) + { + result.IsSucceed = true; + result.Message = "操作成功"; + result.result = data?.data; + } + else + { + result.IsSucceed = false; + result.Message = data?.message ?? "操作失败"; + } + return result; + } public async Task> QueryLsList(string ProposerZJHM) { var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value; @@ -100,7 +128,7 @@ namespace _24Hour }.ConvertToGetParam(); var response = await Task.Run(async () => { - + if (UseOfflineData == "true") { var json = "{\"data\":{\"content\":[{\"cjsj\":\"2021-01-12T16:12:34.004+0800\",\"djdwbm\":\"410403\",\"djdwmc\":\"卫东区院\",\"jmsfzh\":\"123345666777778\",\"lxdh\":null,\"lxdz\":null,\"sfsc\":\"N\",\"sjbsbh\":\"8cdbeb3ce3da483780b4e1acf60677e0\",\"sjly\":\"3\",\"sqrbh\":\"42b84c481b734f52b37d5b99157057f4\",\"sqrlxdm\":\"1403187300001\",\"sqrlxmc\":\"辩护人\",\"sqrsfdm\":\"1404187300003\",\"sqrsfmc\":\"律师\",\"sqrxm\":\"张能能\",\"szlssws\":\"河南千会律师事务所\",\"tyshxydm\":null,\"zbls\":null,\"zhxgsj\":\"2021-01-21T15:10:51.982+0800\",\"zjhm\":\"123445788876677\",\"zjlxdm\":\"9910180300010\",\"zjlxmc\":\"律师执业证\",\"zyzh\":null}],\"empty\":false,\"first\":true,\"last\":true,\"number\":0,\"numberOfElements\":1,\"pageable\":{\"offset\":0,\"pageNumber\":0,\"pageSize\":20,\"paged\":true,\"unpaged\":false,\"sort\":{\"empty\":false,\"sorted\":true,\"unsorted\":false}},\"size\":20,\"sort\":{\"empty\":false,\"sorted\":true,\"unsorted\":false},\"totalPages\":1,\"totalElements\":1},\"code\":\"0\",\"success\":true,\"message\":\"操作成功\"}"; @@ -131,7 +159,7 @@ namespace _24Hour result.IsSucceed = false; result.Message = data?.message ?? "操作失败"; } - if (UseOfflineData=="true") + if (UseOfflineData == "true") { result.Message = "操作成功(测试数据)"; } @@ -140,7 +168,7 @@ namespace _24Hour public async Task> ApplyMarKing(ApplyMarKingDto dto) { var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value; - + var response = await Task.Run(async () => { @@ -152,7 +180,7 @@ namespace _24Hour else { var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/ApplyMarKing", dto); - var res= await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var res = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); return res; } }); @@ -162,7 +190,7 @@ namespace _24Hour public async Task Arrange(ArrangeDto dto) { var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value; - + var response = await Task.Run(async () => { @@ -183,8 +211,8 @@ namespace _24Hour return response.ConvertToModel(); } - - public async Task>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size) + + public async Task>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size) { Result> Result = new(); var param = new @@ -270,7 +298,7 @@ namespace _24Hour var json = await Task.Run(async () => { - + if (connectionString == "false") { var request = await httpCliet.GetAsync($"/TwentySystem/GetJZXX{param}"); @@ -323,7 +351,7 @@ namespace _24Hour result.IsSucceed = false; result.Message = res.Message; } - + return result; } From f8305e71477646988454418ffed58723283fae70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:16:35 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 24Hour/bgqyj.cn.pfx | Bin 4642 -> 0 bytes 2 files changed, 2 insertions(+) delete mode 100644 24Hour/bgqyj.cn.pfx diff --git a/.gitignore b/.gitignore index 316c38e..feae340 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,5 @@ dkms.conf /Dto/obj/project.assets.json /Dto/obj/project.nuget.cache /WebApplication1/obj/Release/net6.0/WebApplication1.csproj.AssemblyReference.cache +/24Hour/Properties/PublishProfiles/twentyfoursvc.pubxml +/24Hour/Properties/PublishProfiles/twentyfoursvc.pubxml.user diff --git a/24Hour/bgqyj.cn.pfx b/24Hour/bgqyj.cn.pfx deleted file mode 100644 index 03b71d9e4866c9290993799ca74905c4ce096bf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4642 zcmY+HWl$81x5kNG8eEVDfu$vvrPHNLTw)0+>0CkqX~AXb6hV6F4k_vGE&%~0UP@XT zl)CtI6|@reF=0|_=BgbYCN!kE32(#-^lgF}E7j3Qxa z!6l!~%^1|rfl|Ayz6<>wC!{$X6sN%jVC{s{Pb72oYE{IrH*wAfe(cRx>y_wn0-c{b zq4vrmm}4t2?aoK-C%F#FpBO3M7kvmUP}uvKh4_hwYGgM>$z#!hNGJ;NVeBH8TSrY# zKGkjb7z_8lB162Tx*nu&+Wt&7utFbWnv>Ji*WND?)Su&59J~4>%8qdJU{7O^0U3gY zZT6LfBC=}9#*ChnGj{GxneNI}EWerTsF6Wn@j}64oig#hUlLs!zNUU3%M#I7S& zX*QmHMCkR?2wGaLSF$-;vSoS4x^lL_XL~fOws!05AF8APRmBfR6CXj8=^k0K#s9<` zKsxh+C^9>&e>^<$>flIi_REx2mGF1-#o;{IsW93($Z z*ptrvt#$cXt~uXDUiYdB!&=FD>1jV+UuTrf;dGxfCDO?!!3E1AI{yrQps>+fiU>^a zH-C|k$fmrYSAMT+KcAAf5e=%<#h*x`hvrlyTEHf1H=9 z(&^}n3UEl2EPVuD6rJ^Q8do&-5aOD`G#gs6JZn&KC(RKN$(xk5L8$s>?BRGJHMvKn z#HQ{)&8UCK6SNv5lTNm7;4x3;G9>X~ddL?qFIr=HO`Ji1-|&x{!c=1t$1}<(fXSMX z?AtQg+s}ckK*oR{cH4X?p+&B4pH4YF4LmZ}w%*Wh%#D+CGdnz=XqLDWzqeL+ZZ6co z8zvYCCk5JV7r%T~m((q(Ei{ArqcP7W@3x*k{b-%-qmg1`(IqY)xxh7)eL2`S{m|?| z@-VxCU7!gB=BqJC$Hj6fx0F6t9$QI#NXq1z__0?=5Ffd^5K-9R4jxtsDm{EUN+iHz zH3(-&5G!hp$`(N3uvv}Uhg+(@8F8Rt^TE9M@kd}TEqU9^(3O8p<)t?H>cJRdiM;3{ zLHOG*Hv>M`r{#>H>1d|I>yuC7cB`>jMRXeqsuDF8>|e8nh>Q{^=WS;Yc~6UcKn#Rpk@u=VdLP=S2** zu3Ia>jMVk5I+r0>5u5IKuCgt6FNElAH z0L4!0=)gd^@7JrP%t-4lk3Nv8@6SY2ggu5PEx4|0f&O?MPh}!~WFyH+19t3!sO}q< z5kxGr=f<^g-7-R>=)jIXgfVXdf;MlDM6%B|(KL*IZxQzBR4l0bbb&#Oa^wkEvbyAZ zWAYPB7cyJeZh}P zeuwbW0)})m2B38e^_9&)T{yT^#Ym9F{U~d7Ak0~hZ?rCcRjFB;Z0IEa;<|KNl{}5H z*!@Pt?Mc!ClklQQ3P&vDTY31KnilI>Iz=N$x!`74eB;lZ|=K=#rSG zdPS8|;pAkpOVH7o%vav)CPt6dE3g6YY3x5DQ)YqBljw~Itme~dgyi;GBW?0lV5HP{ zs^;VjkZH}V&>H!ek0<1J0Gi8{3PF2yz5;MjzMk_%a(@J09qhe*leq<-W85jfPacjv z_=@`zw}sa9y&r}InktBL`nBu*((hG3(u@UCg)FsJg8xq$CWWnzvP&c%ah7D+!i=VN zIH%}*c~!I4c8HW4r5zamPIlh&Ad4%A&txpw9%u z#oe=m=`QUAd*PA;KQ|()^Bcu~L0Azdn?L|9GCtVSKVAn^P*05FtlG!>{S*ftJI_rL zGgeq;n^>NEy-Z)Lxu*RPsUJ)f0AW$q(OsNf?itS&^mzVAP~5MGiQarfNI}r8$o~de zqEJ03>yr*_3^DHM>B}A!xq7K9x`R$hHt1`FiRs?gbTXy58RBfmzTP}s-EJrHSISH9 z4>ZM27}Saku|~?!_*%Ef$MG0*lwZA%Eb(l>q`&T>Z7Bvno=VyCPcn?Q_y+H>yVepJ zCfKc?CW9Qe{gEn}o|=R6OMt6a8pcIliJU5pEob`XkMuxN;v4||htJO|3yidPE|Qb{ z#z4oO!?|=+X16Vx6bNzA5V^D<)idA4TTMK!qkRu0tfmj>Nd4cz38dav$i}?6@);{K zPyaw6Ut47Bqj8=!IlJukpWaXM`_Wf|I@Npwa{2_mLJ*gXk^;PUPNcx8kNPK0Kab>ZrIoHJlbe@ zo1QWCLE&m%+qlW~52=Xd-}7JfU(Jd?ej6NJg7H-!uw`~0S}O+8ggG?Jo=xJvB4tE} zsX56UIa`~s-FqpgF1jV!gD5_g6%YRyTl%@1;AIarEviX1rbV~z3e#&Hq}XIqsC7i7 z%~7ozVr4CC>STww+xouvT+5h88@qlzD4#R|v7%8bx77*liJzI=Cq1(NiG zLBk=zTy6k+23pF2l3P$LWqz0VauON$9ha`g$Lvk`K7ewCFtn|iom#d z?T_3OP}|G?7_hn9O+O})2h-#Qbqor=Fue2N^xKc@T5Ow_Mdd3J8-m=57n9{@w0o&f zJygt?>?qmif&EC4c;!mG>V7;@cX`5jI8ayI2avEl zqv6LSG=g~6Ok`T#;!bdatjM(F)Jgd z^Mrevfgwm{!H8-Qs8rxYh6nNsHU%Ene+4)y9UFMVk|JtTNJ~HORoMUJ8KMHE__Gv< z5?YASL3cG;Xejih3%7yhQdCzc5*bCjLd^$t1^}IC0|W)M`aeLCg97RSP(b)!S@UnH z;t~H3UJzm9Z@>5-T2XwK2mIbC4i|*f zaURAE-L^M+pvjuPH!#U2E>Od&{^j-W2a@)VV<6?MeW6X%M7ZDZv8uVv8}YCE;s$hh}hbwSF-4|(5nm=pD-RCAbMBJ3 z2f6|E1sDz80ZSNx2md#gd?~oU%ZEuJVW#Mb>O)(^<~->yxZ&<5dbq4u*7Mz&LIL5E zK#eYw=IWQA` zr-7+F2S?xOtST}IhKy*Ws7Go#RP)j*A_i{4MWC8ybmRSJeN{}S06Mn`IWhULQR)=W z#=OZcPJ43|?i6z(DC6);cvbrgoinYPwlB2S$3bJQiCtwG-^^)=B~J;rr8u!JB;Q_@ zFz-ntq3|2Ia_oIzI|b$&m%A}OIYPD2`Mf$-HbktZb-A+SYNkOwJ-5JV;kPpL( zO}%WM73EThNmS#rfTyb1dKA$Y-DWskC4X4E^PT~B=Q}OxP7WI)*RG6Rjocz{Jm4FJ9Z$Ox z#W;sqR=u=Y>XYa+UxoD%HN3RwPoKHa2tFQJ*HCRx4c@Ti#3?p;q&(=rcf6sN_N-VX zN17EP)8jYl#qjWRLSpx5`_Jh04UuZ?-t~Lpf*@_K@6`6opon#`YR5m3@5bJqiSvX) z=6n^ljQTWOmA}}_7LgD5P1{!^#@0%HR_vImJdF9?PR_$9Sl9}vLtwAgYfbgQTqbtk zIthG8yWbKGuV_?Zt7mEcs&M13-t&#s*^!xfyZN|%N{;tCvx)M3`mh;CWmkheU%Y22 zRnmy~vwlHki`)y9Xdx8{^Z$NFLP{YDCJ>etmOa*MEMF`qECDQQELRBIzXMc4)BwtK zzT@95KJ!i6f-h6H`sEt_S_geU5E5LSE# RxeNga-i(F{`8>>H{tH}g!P@`; From 7b2fbf3921360e35eafd184944e7fd5b13f709ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:16:49 +0800 Subject: [PATCH 07/30] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=80=BC1.0.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/24Hour.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj index f18a9ae..6a7338f 100644 --- a/24Hour/24Hour.csproj +++ b/24Hour/24Hour.csproj @@ -8,8 +8,8 @@ True e485308c-2f05-470b-b0a4-68f1ec2b3412 Linux - 1.0.1.27 - 1.0.1.27 + 1.0.2.1 + 1.0.2.1 From 8ee5b735a151d676565feebe3b0425fe1cda5c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:17:02 +0800 Subject: [PATCH 08/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=20=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/build/dockerbuild.txt | 89 ++++++++++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 19 deletions(-) diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt index 01ac230..437a899 100644 --- a/24Hour/build/dockerbuild.txt +++ b/24Hour/build/dockerbuild.txt @@ -1,6 +1,6 @@ create images -docker build -t twentyfoursvc:1.0.1.2 . - +docker build -t twentyfoursvc:1.0.2.1 . +docker save -o d://twentyfoursvc.1.0.2.1.tar twentyfoursvc:1.0.2.1 docker on windows for fake data create container docker run --name twentyfoursvc -p 8098:8098 -v D://dockerconfigs/24hourconfig/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime -d twentyfoursvc:1.0.1.5 @@ -8,12 +8,11 @@ docker run --name twentyfoursvc -p 8098:8098 -v D://dockerconfigs/24hourconfig/a docker on linux with network bridge -create birdge: -docker network create twentytotwneyfour +docker network create -d bridge twentytotwneyfour for 24hourserver docker run \ ---name twentyfoursvc \ +--name twentyfoursvc1.0.2.1 \ -p 8098:8098 \ -v /home/24hour/logs:/app/logs \ -v /home/24hour/wwwroot:/app/wwwroot \ @@ -23,48 +22,72 @@ docker run \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ --d twentyfoursvc:1.0.1.5 +-d twentyfoursvc:1.0.2.1 -docker run ---name twentyfoursvc --p 8098:8098 --v /home/24hour/config/appsettings.json:/app/appsettings.json --v /etc/localtime:/etc/localtime ---restart=always --d twentyfoursvc:1.0.1.5 -for 2.0 proxyclient -docker run --name twentysysproxy -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.1 docker load -i twentyfoursvc1019.tar -docker run --name twentyfoursvc1019 \ +docker run --name twentyfoursvc1.0.1.27 \ -p 8098:8098 \ -v /home/24hour/config/appsettings.json:/app/appsettings.json \ -v /home/24hour/config/log4net.config:/app/log4net.config \ -v /home/24hour/wwwroot:/app/wwwroot \ -v /home/24hour/logs:/app/logs \ -v /etc/localtime:/etc/localtime \ ---restart=always -d twentyfoursvc:1.0.1.9 +--restart=always -d twentyfoursvc:1.0.1.27 -docker run --name twentyfoursvc1.0.1.9 \ +docker run --name twentyfoursvc1.0.1.18 \ -p 8098:8098 \ -v /home/24hour/config/appsettings.json:/app/appsettings.json \ -v /home/24hour/config/log4net.config:/app/log4net.config \ -v /home/24hour/wwwroot:/app/wwwroot \ -v /home/24hour/logs:/app/logs \ -v /etc/localtime:/etc/localtime \ +/ +-e ASPNETCORE_Kestrel__Certificates__Default__Password='123456' \ +-e ASPNETCORE_Kestrel__Certificates__Default__Path='/app/dotnetmvc.pfx' \ +-e ASPNETCORE_HTTPS_PORT=8443 +-w '/app' \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ ---restart=always -d twentyfoursvc:1.0.1.9 +--restart=always -d twentyfoursvc:1.0.1.18 + + +docker run -d --name dotnetmvc \ + -e ASPNETCORE_URLS='http://0.0.0.0:80;https://0.0.0.0:443' \ + -e ASPNETCORE_HTTPS_PORT=8443 \ + -e ASPNETCORE_Kestrel__Certificates__Default__Password='123456' \ + -e ASPNETCORE_Kestrel__Certificates__Default__Path='/app/dotnetmvc.pfx' \ + + -p 8080:80 \ + -p 8443:443 \ + -v /opt/www/mymvcsystem:/app/ \ + -d mcr.microsoft.com/dotnet/aspnet:3.1 + dotnet 'MySystem.dll' + + + + + + + + + + + + + + + @@ -108,6 +131,22 @@ docker run --rm -it -p 8000:80 -p 8098:443 +docker pull mcr.microsoft.com/dotnet/samples:aspnetapp +docker run --rm -it \ +--name twentyfoursvc.1.0.1.18 \ +-p 8098:8098 \ +-p 443:8099 \ +-e ASPNETCORE_URLS="https://+;http://+" \ +-e ASPNETCORE_HTTPS_PORT=8001 \ +-e ASPNETCORE_Kestrel__Certificates__Default__Password="l8717f1v9q7h" \ +-e ASPNETCORE_Kestrel__Certificates__Default__Path=bgqyj.cn.pfx \ +-v /home/24hour/config/appsettings.json:/app/appsettings.json \ +-v /home/24hour/config/log4net.config:/app/log4net.config \ +-v /home/24hour/wwwroot:/app/wwwroot \ +-v /home/24hour/logs:/app/logs \ +-v /home/24hour/https/bgqyj.cn.pfx:/app/bgqyj.cn.pfx \ +-v /etc/localtime:/etc/localtime \ +-d twentyfoursvc:1.0.1.18 @@ -131,8 +170,20 @@ docker run --rm -it -p 8000:80 -p 8098:443 +docker run +--name twentyfoursvc +-p 8098:8098 +-v /home/24hour/config/appsettings.json:/app/appsettings.json +-v /etc/localtime:/etc/localtime +--restart=always +-d twentyfoursvc:1.0.1.5 +docker build -t twentysysproxy:1.0.1.3 . +docker save -o d://twentysysproxy.1.0.1.3.tar twentysysproxy:1.0.1.3 +docker load -i twentysysproxy.1.0.1.3.tar +for 2.0 proxyclient +docker run --name twentysysproxy.1.0.1.3 -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.0.1.3 From 5b11d9f1876bad42b758b8b396702d53edbeb5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:20:18 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9git=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../Debug/net6.0/WebApplication1.deps.json | 151 ------------------ 2 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json diff --git a/.gitignore b/.gitignore index feae340..036d2e8 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ dkms.conf /WebApplication1/obj/Release/net6.0/WebApplication1.csproj.AssemblyReference.cache /24Hour/Properties/PublishProfiles/twentyfoursvc.pubxml /24Hour/Properties/PublishProfiles/twentyfoursvc.pubxml.user +/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json diff --git a/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json b/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json deleted file mode 100644 index 0960ebd..0000000 --- a/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json +++ /dev/null @@ -1,151 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "WebApplication1/1.0.1.0": { - "dependencies": { - "Dto": "1.0.0", - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.18.1", - "Newtonsoft.Json": "13.0.3", - "Swashbuckle.AspNetCore": "6.0.0" - }, - "runtime": { - "WebApplication1.dll": {} - } - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": {}, - "Microsoft.OpenApi/1.2.3": { - "runtime": { - "lib/netstandard2.0/Microsoft.OpenApi.dll": { - "assemblyVersion": "1.2.3.0", - "fileVersion": "1.2.3.0" - } - } - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {}, - "Newtonsoft.Json/13.0.3": { - "runtime": { - "lib/net6.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.3.27908" - } - } - }, - "Swashbuckle.AspNetCore/6.0.0": { - "dependencies": { - "Microsoft.Extensions.ApiDescription.Server": "3.0.0", - "Swashbuckle.AspNetCore.Swagger": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.0.0" - } - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "dependencies": { - "Microsoft.OpenApi": "1.2.3" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.0.0" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Dto/1.0.0": { - "runtime": { - "Dto.dll": {} - } - } - } - }, - "libraries": { - "WebApplication1/1.0.1.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LH4OE/76F6sOCslif7+Xh3fS/wUUrE5ryeXAMcoCnuwOQGT5Smw0p57IgDh/pHgHaGz/e+AmEQb7pRgb++wt0w==", - "path": "microsoft.extensions.apidescription.server/3.0.0", - "hashPath": "microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512" - }, - "Microsoft.OpenApi/1.2.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==", - "path": "microsoft.openapi/1.2.3", - "hashPath": "microsoft.openapi.1.2.3.nupkg.sha512" - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RtNQEQQ/bgaxzrsZEkPB+/DFaUgNiq8GtZz/R4lt+mKXPcEvEuawlbl0PB1s7ND9kvkUVZtMphPxE9Ma1VGiFg==", - "path": "microsoft.visualstudio.azure.containers.tools.targets/1.18.1", - "hashPath": "microsoft.visualstudio.azure.containers.tools.targets.1.18.1.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==", - "path": "newtonsoft.json/13.0.3", - "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512" - }, - "Swashbuckle.AspNetCore/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VxukQYrUrxNUWQocOxmxua/4fZOPBdGCLSaoZYRNthZae0UXB+fzjTBTlj24fZEQrP+QTnsRwSygN9jNBqm/hg==", - "path": "swashbuckle.aspnetcore/6.0.0", - "hashPath": "swashbuckle.aspnetcore.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-onkGK5eDFmyNy605E5ZaT5oXEGsQJz2UEKsUOqYCZRBC2Fi6MbByUl+qznyl3pZ9/4nTvukUjt9+v28qvJPk/Q==", - "path": "swashbuckle.aspnetcore.swagger/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swagger.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RXY21STD/yo4Uzy1L5GoRrEQQWoOosw0QBYo572VwcjePmpV1yFFHsTeThlMNBWKoTt6xadIdSjZj0FmDFYL2A==", - "path": "swashbuckle.aspnetcore.swaggergen/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggergen.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VusRaCFt2As3SXBJmUOGA40IGr6ao+vsvDi7jbCS4AFx69kUUm8zxIHeJVqGov3w4lQowVxv8gmonRXDRh1FvQ==", - "path": "swashbuckle.aspnetcore.swaggerui/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggerui.6.0.0.nupkg.sha512" - }, - "Dto/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file From ed6c14703919b6b9361aef154dead6e790b56be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:21:01 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9git=E8=BF=BD=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 10 +- .../PublishProfiles/FolderProfile.pubxml.user | 11 -- .../Release/net6.0/WebApplication1.deps.json | 140 ------------------ .../bin/Release/net6.0/appsettings.json | 14 -- .../net6.0/publish/WebApplication1.deps.json | 140 ------------------ .../Release/net6.0/publish/appsettings.json | 14 -- .../PubTmp/Out/WebApplication1.deps.json | 140 ------------------ .../net6.0/PubTmp/Out/appsettings.json | 14 -- ...pplication1.csproj.CoreCompileInputs.cache | 1 - 9 files changed, 9 insertions(+), 475 deletions(-) delete mode 100644 WebApplication1/Properties/PublishProfiles/FolderProfile.pubxml.user delete mode 100644 WebApplication1/bin/Release/net6.0/WebApplication1.deps.json delete mode 100644 WebApplication1/bin/Release/net6.0/appsettings.json delete mode 100644 WebApplication1/bin/Release/net6.0/publish/WebApplication1.deps.json delete mode 100644 WebApplication1/bin/Release/net6.0/publish/appsettings.json delete mode 100644 WebApplication1/obj/Release/net6.0/PubTmp/Out/WebApplication1.deps.json delete mode 100644 WebApplication1/obj/Release/net6.0/PubTmp/Out/appsettings.json delete mode 100644 WebApplication1/obj/Release/net6.0/WebApplication1.csproj.CoreCompileInputs.cache diff --git a/.gitignore b/.gitignore index 036d2e8..ca538d0 100644 --- a/.gitignore +++ b/.gitignore @@ -103,4 +103,12 @@ dkms.conf /WebApplication1/obj/Release/net6.0/WebApplication1.csproj.AssemblyReference.cache /24Hour/Properties/PublishProfiles/twentyfoursvc.pubxml /24Hour/Properties/PublishProfiles/twentyfoursvc.pubxml.user -/WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json +/WebApplication1/bin +/WebApplication1/bin/Release/net6.0/appsettings.json +/WebApplication1/bin/Release/net6.0/publish/appsettings.json +/WebApplication1/bin/Release/net6.0/publish/WebApplication1.deps.json +/WebApplication1/bin/Release/net6.0/WebApplication1.deps.json +/WebApplication1/obj/Release/net6.0/PubTmp/Out/appsettings.json +/WebApplication1/obj/Release/net6.0/PubTmp/Out/WebApplication1.deps.json +/WebApplication1/obj/Release/net6.0/WebApplication1.csproj.CoreCompileInputs.cache +/WebApplication1/Properties/PublishProfiles/FolderProfile.pubxml.user diff --git a/WebApplication1/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebApplication1/Properties/PublishProfiles/FolderProfile.pubxml.user deleted file mode 100644 index 7eb595d..0000000 --- a/WebApplication1/Properties/PublishProfiles/FolderProfile.pubxml.user +++ /dev/null @@ -1,11 +0,0 @@ - - - - - <_PublishTargetUrl>C:\Users\callm\source\repos\24Hour.Service\WebApplication1\bin\Release\net6.0\publish\ - True|2023-11-01T10:41:19.1109757Z;True|2023-11-01T18:39:07.4539146+08:00;True|2023-11-01T18:16:01.9167676+08:00;True|2023-11-01T18:15:52.7184209+08:00; - - - \ No newline at end of file diff --git a/WebApplication1/bin/Release/net6.0/WebApplication1.deps.json b/WebApplication1/bin/Release/net6.0/WebApplication1.deps.json deleted file mode 100644 index a198b2e..0000000 --- a/WebApplication1/bin/Release/net6.0/WebApplication1.deps.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "WebApplication1/1.0.1.0": { - "dependencies": { - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.18.1", - "Newtonsoft.Json": "13.0.3", - "Swashbuckle.AspNetCore": "6.0.0" - }, - "runtime": { - "WebApplication1.dll": {} - } - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": {}, - "Microsoft.OpenApi/1.2.3": { - "runtime": { - "lib/netstandard2.0/Microsoft.OpenApi.dll": { - "assemblyVersion": "1.2.3.0", - "fileVersion": "1.2.3.0" - } - } - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {}, - "Newtonsoft.Json/13.0.3": { - "runtime": { - "lib/net6.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.3.27908" - } - } - }, - "Swashbuckle.AspNetCore/6.0.0": { - "dependencies": { - "Microsoft.Extensions.ApiDescription.Server": "3.0.0", - "Swashbuckle.AspNetCore.Swagger": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.0.0" - } - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "dependencies": { - "Microsoft.OpenApi": "1.2.3" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.0.0" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - } - } - }, - "libraries": { - "WebApplication1/1.0.1.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LH4OE/76F6sOCslif7+Xh3fS/wUUrE5ryeXAMcoCnuwOQGT5Smw0p57IgDh/pHgHaGz/e+AmEQb7pRgb++wt0w==", - "path": "microsoft.extensions.apidescription.server/3.0.0", - "hashPath": "microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512" - }, - "Microsoft.OpenApi/1.2.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==", - "path": "microsoft.openapi/1.2.3", - "hashPath": "microsoft.openapi.1.2.3.nupkg.sha512" - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RtNQEQQ/bgaxzrsZEkPB+/DFaUgNiq8GtZz/R4lt+mKXPcEvEuawlbl0PB1s7ND9kvkUVZtMphPxE9Ma1VGiFg==", - "path": "microsoft.visualstudio.azure.containers.tools.targets/1.18.1", - "hashPath": "microsoft.visualstudio.azure.containers.tools.targets.1.18.1.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==", - "path": "newtonsoft.json/13.0.3", - "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512" - }, - "Swashbuckle.AspNetCore/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VxukQYrUrxNUWQocOxmxua/4fZOPBdGCLSaoZYRNthZae0UXB+fzjTBTlj24fZEQrP+QTnsRwSygN9jNBqm/hg==", - "path": "swashbuckle.aspnetcore/6.0.0", - "hashPath": "swashbuckle.aspnetcore.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-onkGK5eDFmyNy605E5ZaT5oXEGsQJz2UEKsUOqYCZRBC2Fi6MbByUl+qznyl3pZ9/4nTvukUjt9+v28qvJPk/Q==", - "path": "swashbuckle.aspnetcore.swagger/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swagger.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RXY21STD/yo4Uzy1L5GoRrEQQWoOosw0QBYo572VwcjePmpV1yFFHsTeThlMNBWKoTt6xadIdSjZj0FmDFYL2A==", - "path": "swashbuckle.aspnetcore.swaggergen/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggergen.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VusRaCFt2As3SXBJmUOGA40IGr6ao+vsvDi7jbCS4AFx69kUUm8zxIHeJVqGov3w4lQowVxv8gmonRXDRh1FvQ==", - "path": "swashbuckle.aspnetcore.swaggerui/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggerui.6.0.0.nupkg.sha512" - } - } -} \ No newline at end of file diff --git a/WebApplication1/bin/Release/net6.0/appsettings.json b/WebApplication1/bin/Release/net6.0/appsettings.json deleted file mode 100644 index aea7b3c..0000000 --- a/WebApplication1/bin/Release/net6.0/appsettings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - - "AllowedHosts": "*", - "Configs": { - "SystemIp": "143.120.5.25", - "Port": "8080" - } -} diff --git a/WebApplication1/bin/Release/net6.0/publish/WebApplication1.deps.json b/WebApplication1/bin/Release/net6.0/publish/WebApplication1.deps.json deleted file mode 100644 index a198b2e..0000000 --- a/WebApplication1/bin/Release/net6.0/publish/WebApplication1.deps.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "WebApplication1/1.0.1.0": { - "dependencies": { - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.18.1", - "Newtonsoft.Json": "13.0.3", - "Swashbuckle.AspNetCore": "6.0.0" - }, - "runtime": { - "WebApplication1.dll": {} - } - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": {}, - "Microsoft.OpenApi/1.2.3": { - "runtime": { - "lib/netstandard2.0/Microsoft.OpenApi.dll": { - "assemblyVersion": "1.2.3.0", - "fileVersion": "1.2.3.0" - } - } - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {}, - "Newtonsoft.Json/13.0.3": { - "runtime": { - "lib/net6.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.3.27908" - } - } - }, - "Swashbuckle.AspNetCore/6.0.0": { - "dependencies": { - "Microsoft.Extensions.ApiDescription.Server": "3.0.0", - "Swashbuckle.AspNetCore.Swagger": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.0.0" - } - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "dependencies": { - "Microsoft.OpenApi": "1.2.3" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.0.0" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - } - } - }, - "libraries": { - "WebApplication1/1.0.1.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LH4OE/76F6sOCslif7+Xh3fS/wUUrE5ryeXAMcoCnuwOQGT5Smw0p57IgDh/pHgHaGz/e+AmEQb7pRgb++wt0w==", - "path": "microsoft.extensions.apidescription.server/3.0.0", - "hashPath": "microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512" - }, - "Microsoft.OpenApi/1.2.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==", - "path": "microsoft.openapi/1.2.3", - "hashPath": "microsoft.openapi.1.2.3.nupkg.sha512" - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RtNQEQQ/bgaxzrsZEkPB+/DFaUgNiq8GtZz/R4lt+mKXPcEvEuawlbl0PB1s7ND9kvkUVZtMphPxE9Ma1VGiFg==", - "path": "microsoft.visualstudio.azure.containers.tools.targets/1.18.1", - "hashPath": "microsoft.visualstudio.azure.containers.tools.targets.1.18.1.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==", - "path": "newtonsoft.json/13.0.3", - "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512" - }, - "Swashbuckle.AspNetCore/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VxukQYrUrxNUWQocOxmxua/4fZOPBdGCLSaoZYRNthZae0UXB+fzjTBTlj24fZEQrP+QTnsRwSygN9jNBqm/hg==", - "path": "swashbuckle.aspnetcore/6.0.0", - "hashPath": "swashbuckle.aspnetcore.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-onkGK5eDFmyNy605E5ZaT5oXEGsQJz2UEKsUOqYCZRBC2Fi6MbByUl+qznyl3pZ9/4nTvukUjt9+v28qvJPk/Q==", - "path": "swashbuckle.aspnetcore.swagger/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swagger.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RXY21STD/yo4Uzy1L5GoRrEQQWoOosw0QBYo572VwcjePmpV1yFFHsTeThlMNBWKoTt6xadIdSjZj0FmDFYL2A==", - "path": "swashbuckle.aspnetcore.swaggergen/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggergen.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VusRaCFt2As3SXBJmUOGA40IGr6ao+vsvDi7jbCS4AFx69kUUm8zxIHeJVqGov3w4lQowVxv8gmonRXDRh1FvQ==", - "path": "swashbuckle.aspnetcore.swaggerui/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggerui.6.0.0.nupkg.sha512" - } - } -} \ No newline at end of file diff --git a/WebApplication1/bin/Release/net6.0/publish/appsettings.json b/WebApplication1/bin/Release/net6.0/publish/appsettings.json deleted file mode 100644 index aea7b3c..0000000 --- a/WebApplication1/bin/Release/net6.0/publish/appsettings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - - "AllowedHosts": "*", - "Configs": { - "SystemIp": "143.120.5.25", - "Port": "8080" - } -} diff --git a/WebApplication1/obj/Release/net6.0/PubTmp/Out/WebApplication1.deps.json b/WebApplication1/obj/Release/net6.0/PubTmp/Out/WebApplication1.deps.json deleted file mode 100644 index a198b2e..0000000 --- a/WebApplication1/obj/Release/net6.0/PubTmp/Out/WebApplication1.deps.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "WebApplication1/1.0.1.0": { - "dependencies": { - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "1.18.1", - "Newtonsoft.Json": "13.0.3", - "Swashbuckle.AspNetCore": "6.0.0" - }, - "runtime": { - "WebApplication1.dll": {} - } - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": {}, - "Microsoft.OpenApi/1.2.3": { - "runtime": { - "lib/netstandard2.0/Microsoft.OpenApi.dll": { - "assemblyVersion": "1.2.3.0", - "fileVersion": "1.2.3.0" - } - } - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": {}, - "Newtonsoft.Json/13.0.3": { - "runtime": { - "lib/net6.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.3.27908" - } - } - }, - "Swashbuckle.AspNetCore/6.0.0": { - "dependencies": { - "Microsoft.Extensions.ApiDescription.Server": "3.0.0", - "Swashbuckle.AspNetCore.Swagger": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerGen": "6.0.0", - "Swashbuckle.AspNetCore.SwaggerUI": "6.0.0" - } - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "dependencies": { - "Microsoft.OpenApi": "1.2.3" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.0.0" - }, - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "runtime": { - "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.0.0" - } - } - } - } - }, - "libraries": { - "WebApplication1/1.0.1.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.ApiDescription.Server/3.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LH4OE/76F6sOCslif7+Xh3fS/wUUrE5ryeXAMcoCnuwOQGT5Smw0p57IgDh/pHgHaGz/e+AmEQb7pRgb++wt0w==", - "path": "microsoft.extensions.apidescription.server/3.0.0", - "hashPath": "microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512" - }, - "Microsoft.OpenApi/1.2.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Nug3rO+7Kl5/SBAadzSMAVgqDlfGjJZ0GenQrLywJ84XGKO0uRqkunz5Wyl0SDwcR71bAATXvSdbdzPrYRYKGw==", - "path": "microsoft.openapi/1.2.3", - "hashPath": "microsoft.openapi.1.2.3.nupkg.sha512" - }, - "Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.18.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RtNQEQQ/bgaxzrsZEkPB+/DFaUgNiq8GtZz/R4lt+mKXPcEvEuawlbl0PB1s7ND9kvkUVZtMphPxE9Ma1VGiFg==", - "path": "microsoft.visualstudio.azure.containers.tools.targets/1.18.1", - "hashPath": "microsoft.visualstudio.azure.containers.tools.targets.1.18.1.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==", - "path": "newtonsoft.json/13.0.3", - "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512" - }, - "Swashbuckle.AspNetCore/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VxukQYrUrxNUWQocOxmxua/4fZOPBdGCLSaoZYRNthZae0UXB+fzjTBTlj24fZEQrP+QTnsRwSygN9jNBqm/hg==", - "path": "swashbuckle.aspnetcore/6.0.0", - "hashPath": "swashbuckle.aspnetcore.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.Swagger/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-onkGK5eDFmyNy605E5ZaT5oXEGsQJz2UEKsUOqYCZRBC2Fi6MbByUl+qznyl3pZ9/4nTvukUjt9+v28qvJPk/Q==", - "path": "swashbuckle.aspnetcore.swagger/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swagger.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerGen/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RXY21STD/yo4Uzy1L5GoRrEQQWoOosw0QBYo572VwcjePmpV1yFFHsTeThlMNBWKoTt6xadIdSjZj0FmDFYL2A==", - "path": "swashbuckle.aspnetcore.swaggergen/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggergen.6.0.0.nupkg.sha512" - }, - "Swashbuckle.AspNetCore.SwaggerUI/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VusRaCFt2As3SXBJmUOGA40IGr6ao+vsvDi7jbCS4AFx69kUUm8zxIHeJVqGov3w4lQowVxv8gmonRXDRh1FvQ==", - "path": "swashbuckle.aspnetcore.swaggerui/6.0.0", - "hashPath": "swashbuckle.aspnetcore.swaggerui.6.0.0.nupkg.sha512" - } - } -} \ No newline at end of file diff --git a/WebApplication1/obj/Release/net6.0/PubTmp/Out/appsettings.json b/WebApplication1/obj/Release/net6.0/PubTmp/Out/appsettings.json deleted file mode 100644 index aea7b3c..0000000 --- a/WebApplication1/obj/Release/net6.0/PubTmp/Out/appsettings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - - "AllowedHosts": "*", - "Configs": { - "SystemIp": "143.120.5.25", - "Port": "8080" - } -} diff --git a/WebApplication1/obj/Release/net6.0/WebApplication1.csproj.CoreCompileInputs.cache b/WebApplication1/obj/Release/net6.0/WebApplication1.csproj.CoreCompileInputs.cache deleted file mode 100644 index 190d39c..0000000 --- a/WebApplication1/obj/Release/net6.0/WebApplication1.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -1aab1d47053209a50c128993feed61e455baf1b5 From a71338cd4c927667fa34680c752d1fff54fef57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:21:16 +0800 Subject: [PATCH 11/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E7=9A=84=E5=BE=8B=E5=B8=88?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TwentySystemController.cs | 22 +++++++++++++++++++ WebApplication1/Program.cs | 6 ++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/WebApplication1/Controllers/TwentySystemController.cs b/WebApplication1/Controllers/TwentySystemController.cs index 97754a0..7f28f2a 100644 --- a/WebApplication1/Controllers/TwentySystemController.cs +++ b/WebApplication1/Controllers/TwentySystemController.cs @@ -567,6 +567,28 @@ namespace WebApplication1.Controllers } return SqrDto; } + [HttpGet] + public async Task> GetAllLsList() + { + ResultDataDto result = new ResultDataDto(); + ///Ϣ + var findSqrxx = new + { + gjz = "", + pageNum = 0, + pageSize = 200000 + }; + var sqrrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/findSqrxx", findSqrxx); + var sqrRuslt = await sqrrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); + var SqrDto = JsonConvert.DeserializeObject>(sqrRuslt); + if (SqrDto.success == false && SqrDto.code != "0" && SqrDto.data.content.Count == 0) + { + result.success = false; + result.message = "ʦݲ"; + return result; + } + return SqrDto; + } /// /// Ǽ diff --git a/WebApplication1/Program.cs b/WebApplication1/Program.cs index 64b30ad..e1f75d7 100644 --- a/WebApplication1/Program.cs +++ b/WebApplication1/Program.cs @@ -14,10 +14,10 @@ var app = builder.Build(); // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { - app.UseSwagger(); - app.UseSwaggerUI(); -} +} +app.UseSwagger(); +app.UseSwaggerUI(); app.UseAuthorization(); From 92198382d6ab8edaa0cf66d963e0e0247ccd63b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 5 Dec 2023 16:21:34 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=80=BC1.0.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebApplication1/WebApplication1.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebApplication1/WebApplication1.csproj b/WebApplication1/WebApplication1.csproj index 17d6856..bca398a 100644 --- a/WebApplication1/WebApplication1.csproj +++ b/WebApplication1/WebApplication1.csproj @@ -6,8 +6,8 @@ enable ae1f7aa6-e320-4393-ac3f-984b92923499 Linux - 1.0.1.0 - 1.0.1.0 + 1.0.1.3 + 1.0.1.3 From c64f579390decd190f20e9b280b92853ea3e2fbc Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 5 Dec 2023 20:50:30 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E4=BA=BA=E5=91=98=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 3e5f300..1ec9a7f 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -81,6 +81,26 @@ namespace _24Hour.Controllers.Common var data = await _db.Queryable() .Where(x => x.unitCode == _userdata.unitCode && x.IsDeleted == 0 && x.isdeactivate == 0) .Where(x => x.identity == "律师") + .Take(500) + .ToListAsync(); + res.IsSucceed = true; + res.result = data; + return res; + } + /// + /// 获取当前登录人员的单位下所有的律师信息 + /// + /// + [HttpGet("GetLawyerByUnitCodeWithFilter")] + public async Task>> GetLawyerByUnitCodeWithFilter(string filter) + { + var res = new Result>(); + + var data = await _db.Queryable() + .Where(x => x.unitCode == _userdata.unitCode && x.IsDeleted == 0 && x.isdeactivate == 0) + .WhereIF(string.IsNullOrEmpty(filter) == false, x => x.cardId.Contains(filter) || x.identitycardId.Contains(filter) || x.name.Contains(filter) || x.departmentName.Contains(filter)) + .Where(x => x.identity == "律师") + .Take(100) .ToListAsync(); res.IsSucceed = true; res.result = data; From ca2bb8cccc30be81fa4fd25a6cc0098d48520993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Wed, 6 Dec 2023 09:17:34 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=80=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 1ec9a7f..37475d9 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -2145,10 +2145,36 @@ namespace _24Hour.Controllers.Common var editentity = lawyerindb.FirstOrDefault(x => x.cardId == item.cardId); if (editentity == null) { + if (item?.cardId.Length >= 18) + { + var sexdd = StringExtension.GetGenderByIdCard(item?.cardId); + if (sexdd) + { + item.sex = 0; + } + else + { + item.sex = 1; + } + } addlist.Add(item); } else { + if (item?.cardId.Length>=18) + { + var sexdd = StringExtension.GetGenderByIdCard(item?.cardId); + if (sexdd) + { + editentity.sex = 0; + } + else + { + editentity.sex = 1; + } + } + + editentity.unitCode = _userdata.unitCode; editentity.phone = item.phone; editentity.phone = item.phone; From 0ae9c1ca1ea81ad35215462f4597afd57df7efa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Wed, 6 Dec 2023 09:20:25 +0800 Subject: [PATCH 15/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=20appid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/WechatMessagerClient.cs | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/24Hour/WechatMessagerClient.cs b/24Hour/WechatMessagerClient.cs index 2650006..106b124 100644 --- a/24Hour/WechatMessagerClient.cs +++ b/24Hour/WechatMessagerClient.cs @@ -31,10 +31,11 @@ namespace _24Hour /// 小程序secretID /// private string secid = "e752e4fba67526eca21313a18c96a58f"; - public WechatMessagerClient(HttpClient _httpCliet, IConfiguration configuration) + private readonly ILogger logger; + public WechatMessagerClient(HttpClient _httpCliet, IConfiguration configuration, ILogger _logger) { this.httpCliet = _httpCliet; - + this.logger = _logger; httpCliet.DefaultRequestHeaders.Add("Accept", "application/json"); httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample"); httpCliet.DefaultRequestHeaders.ConnectionClose = true; @@ -43,6 +44,10 @@ namespace _24Hour appid = $"{configuration.GetSection("Wechat:appid").Value}"; secret = $"{configuration.GetSection("Wechat:secret").Value}"; secid = $"{configuration.GetSection("Wechat:secid").Value}"; + + logger.LogInformation($"appid {appid}"); + logger.LogInformation($"secret {secret}"); + logger.LogInformation($"secid {secid}"); } public async Task GetOpenId(string code) { @@ -74,7 +79,7 @@ namespace _24Hour /// 律师预约微信消息提醒，成功 /// /// - public bool wxts(string? useropenId, string? name, string? unit, DateTime? datetime, string? matter,string? attention) + public bool wxts(string? useropenId, string? name, string? unit, DateTime? datetime, string? matter, string? attention) { try { @@ -104,23 +109,23 @@ namespace _24Hour string posturl = $"{url}{token}";//发送地址 var thing4 = matter; var thing5 = attention; - if (!string.IsNullOrEmpty(matter) && matter.Length>20) - thing4 = matter.Substring(0, 17)+"..."; + if (!string.IsNullOrEmpty(matter) && matter.Length > 20) + thing4 = matter.Substring(0, 17) + "..."; if (!string.IsNullOrEmpty(attention) && attention.Length > 20) thing5 = attention.Substring(0, 17) + "..."; msg = new { touser = useropenId, template_id = "mRfzPnc_3JuV9cPhjKrRL3jX1C_JJoBGYtqEnbfadRM", - page= "pages/selfService/reception/reception", - miniprogram_state= $"{_configuration.GetSection("Wechat:miniprogram_state").Value}", - lang ="zh_CN", + page = "pages/selfService/reception/reception", + miniprogram_state = $"{_configuration.GetSection("Wechat:miniprogram_state").Value}", + lang = "zh_CN", data = new { //name1 = new { value = $"{name}"},// - thing2 = new { value = $"{unit}"},// - date3 = new { value = $"{datetime:yyyy年MM月dd日 HH:mm}"},// - thing4 = new { value = $"{thing4}"},// + thing2 = new { value = $"{unit}" },// + date3 = new { value = $"{datetime:yyyy年MM月dd日 HH:mm}" },// + thing4 = new { value = $"{thing4}" },// thing5 = new { value = $"{thing5}", color = "#173177" },// }, }; @@ -145,7 +150,7 @@ namespace _24Hour /// 律师预约微信消息提醒，失败 /// /// - public bool sbwxts(string? useropenId,string? name,string? unit,DateTime? datetime,string? matter,string? reason) + public bool sbwxts(string? useropenId, string? name, string? unit, DateTime? datetime, string? matter, string? reason) { try { @@ -174,7 +179,7 @@ namespace _24Hour object msg = null; string posturl = $"{url}{token}";//发送地址 var thing4 = matter; - if (!string.IsNullOrEmpty(matter)&&matter.Length > 20) + if (!string.IsNullOrEmpty(matter) && matter.Length > 20) thing4 = matter.Substring(0, 17) + "..."; var thing5 = reason; if (!string.IsNullOrEmpty(reason) && reason.Length > 20) From 8ea9403d41c1600b858b4c2cb18a29f88604a023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Wed, 6 Dec 2023 09:20:40 +0800 Subject: [PATCH 16/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F=E5=88=A4=E6=96=AD=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=80=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Utility/Extensions/StringExtension.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Elight.Utility/Extensions/StringExtension.cs b/Elight.Utility/Extensions/StringExtension.cs index cf9d417..0d4e96d 100644 --- a/Elight.Utility/Extensions/StringExtension.cs +++ b/Elight.Utility/Extensions/StringExtension.cs @@ -18,6 +18,15 @@ namespace Elight.Utility.Extensions /// CreatedTimed:2022-05-13 06:00 PM public static class StringExtension { + public static bool GetGenderByIdCard(string idCard) + { + if (string.IsNullOrWhiteSpace(idCard)) + { + return false; + } + return Convert.ToBoolean(int.Parse(idCard.Substring(16, 1)) % 2); + } + /// /// 判断字符串是否为Null、空 /// From c37d848af4abb478ee0e8d57e8cc37adb03f6146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Wed, 6 Dec 2023 09:21:05 +0800 Subject: [PATCH 17/30] =?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.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/24Hour.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj index 6a7338f..d052d32 100644 --- a/24Hour/24Hour.csproj +++ b/24Hour/24Hour.csproj @@ -8,8 +8,8 @@ True e485308c-2f05-470b-b0a4-68f1ec2b3412 Linux - 1.0.2.1 - 1.0.2.1 + 1.0.2.2 + 1.0.2.2 From c1061dbbfc7eba00c2438b4754d3f4597076ba33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Wed, 6 Dec 2023 09:21:16 +0800 Subject: [PATCH 18/30] =?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.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebApplication1/WebApplication1.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebApplication1/WebApplication1.csproj b/WebApplication1/WebApplication1.csproj index bca398a..6e3e579 100644 --- a/WebApplication1/WebApplication1.csproj +++ b/WebApplication1/WebApplication1.csproj @@ -6,8 +6,8 @@ enable ae1f7aa6-e320-4393-ac3f-984b92923499 Linux - 1.0.1.3 - 1.0.1.3 + 1.0.1.4 + 1.0.1.4 From 76bdc39320bfe8ffb282a0cc2145917591efb973 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 6 Dec 2023 14:59:31 +0800 Subject: [PATCH 19/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80=E4=BF=A1?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E5=89=8D=E7=AB=AF=E8=B0=83=E7=94=A8=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BA=BA=E5=91=98=E6=97=B6=E6=8C=87=E5=AE=9A=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E4=B8=BA=E5=BE=8B=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 37475d9..052b6e3 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -107,6 +107,43 @@ namespace _24Hour.Controllers.Common return res; } /// + /// 修改律师事务所统一信用代码 + /// + /// + /// + /// + [HttpGet("ChangeSccCodeByLawyer")] + public async Task ChangeSccCodeByLawyer(string lawyerid, string sccCode) + { + var lawyer = await _db.Queryable().Where(x => x.Id == lawyerid).FirstAsync(); + if (lawyer == null) + { + return Result.Error("数据不存在"); + } + else + { + if (lawyer.departmentUnifiedSocialCreditCode == sccCode) + { + return Result.Success("数据无需修改"); + } + else + { + lawyer.departmentUnifiedSocialCreditCode = sccCode; + + var num = await _db.Updateable(lawyer).UpdateColumns(x => x.departmentUnifiedSocialCreditCode).ExecuteCommandAsync(); + if (num>0) + { + return Result.Success("更新成功"); + } + else + { + return Result.Error("更新失败"); + } + } + + } + } + /// /// 修改内网律师信息 /// /// @@ -129,7 +166,6 @@ namespace _24Hour.Controllers.Common { result.IsSucceed = true; result.result = "修改成功"; - } } else @@ -216,6 +252,7 @@ namespace _24Hour.Controllers.Common { item.name = lawyerinfo.name; item.sex = lawyerinfo.sex; + item.identity = "律师"; item.phone = lawyerinfo.phone; item.departmentName = lawyerinfo.departmentName; item.cardId = lawyerinfo.cardId; @@ -2161,7 +2198,7 @@ namespace _24Hour.Controllers.Common } else { - if (item?.cardId.Length>=18) + if (item?.cardId.Length >= 18) { var sexdd = StringExtension.GetGenderByIdCard(item?.cardId); if (sexdd) @@ -2173,14 +2210,14 @@ namespace _24Hour.Controllers.Common editentity.sex = 1; } } - + editentity.unitCode = _userdata.unitCode; editentity.phone = item.phone; editentity.phone = item.phone; editentity.departmentName = item.departmentName; editentity.identitycardId = item.identitycardId; - editentity.identity = item.identitycardId; + editentity.identity = "律师"; editentity.usertype = 1; editentity.audit = 0; editentity.isdeactivate = 0; From 929af096e2d40525a71dae1c125f6361221b1656 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 6 Dec 2023 15:00:32 +0800 Subject: [PATCH 20/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/build/dockerbuild.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt index 437a899..8f8c76f 100644 --- a/24Hour/build/dockerbuild.txt +++ b/24Hour/build/dockerbuild.txt @@ -30,14 +30,14 @@ docker run \ docker load -i twentyfoursvc1019.tar -docker run --name twentyfoursvc1.0.1.27 \ +docker run --name twentyfoursvc1.0.2.2 \ -p 8098:8098 \ -v /home/24hour/config/appsettings.json:/app/appsettings.json \ -v /home/24hour/config/log4net.config:/app/log4net.config \ -v /home/24hour/wwwroot:/app/wwwroot \ -v /home/24hour/logs:/app/logs \ -v /etc/localtime:/etc/localtime \ ---restart=always -d twentyfoursvc:1.0.1.27 +--restart=always -d twentyfoursvc:1.0.2.2 From 792837d67e8557446dd83258e5053a0ef80af4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Wed, 6 Dec 2023 15:01:08 +0800 Subject: [PATCH 21/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/build/dockerbuild.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt index 437a899..a25201c 100644 --- a/24Hour/build/dockerbuild.txt +++ b/24Hour/build/dockerbuild.txt @@ -1,6 +1,6 @@ create images -docker build -t twentyfoursvc:1.0.2.1 . -docker save -o d://twentyfoursvc.1.0.2.1.tar twentyfoursvc:1.0.2.1 +docker build -t twentyfoursvc:1.0.2.2 . +docker save -o d://twentyfoursvc.1.0.2.2.tar twentyfoursvc:1.0.2.2 docker on windows for fake data create container docker run --name twentyfoursvc -p 8098:8098 -v D://dockerconfigs/24hourconfig/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime -d twentyfoursvc:1.0.1.5 @@ -12,7 +12,7 @@ docker network create -d bridge twentytotwneyfour for 24hourserver docker run \ ---name twentyfoursvc1.0.2.1 \ +--name twentyfoursvc1.0.2.2 \ -p 8098:8098 \ -v /home/24hour/logs:/app/logs \ -v /home/24hour/wwwroot:/app/wwwroot \ @@ -22,7 +22,7 @@ docker run \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ --d twentyfoursvc:1.0.2.1 +-d twentyfoursvc:1.0.2.2 @@ -178,12 +178,12 @@ docker run --restart=always -d twentyfoursvc:1.0.1.5 -docker build -t twentysysproxy:1.0.1.3 . -docker save -o d://twentysysproxy.1.0.1.3.tar twentysysproxy:1.0.1.3 -docker load -i twentysysproxy.1.0.1.3.tar +docker build -t twentysysproxy:1.0.1.4 . +docker save -o d://twentysysproxy.1.0.1.4.tar twentysysproxy:1.0.1.4 +docker load -i twentysysproxy.1.0.1.4.tar for 2.0 proxyclient -docker run --name twentysysproxy.1.0.1.3 -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.0.1.3 +docker run --name twentysysproxy.1.0.1.4 -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.0.1.4 From da0557edefad1501cc04340ffd92879d43b378c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Wed, 6 Dec 2023 15:01:29 +0800 Subject: [PATCH 22/30] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E4=BF=A1=E6=81=AF=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/Common/LawyerArchivesController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 37475d9..9773aa3 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -1841,7 +1841,7 @@ namespace _24Hour.Controllers.Common lawyersvc.legalAidPhoto = legalAidPhotos; lawyersvc.relationshipProofPhoto = relationshipProofPhotos; lawyersvc.otherPhoto = otherPhotos; - + lawyersvc.IsAssigned = false; _db.BeginTran(); var num = await _db.Insertable(lawyersvc).ExecuteCommandAsync(); _db.CommitTran(); @@ -1860,6 +1860,7 @@ namespace _24Hour.Controllers.Common svc.legalAidPhoto = legalAidPhotos; svc.relationshipProofPhoto = relationshipProofPhotos; svc.otherPhoto = otherPhotos; + svc.IsAssigned = false; _db.BeginTran(); var num = await _db.Updateable(svc) .UpdateColumns(x => new From 0594697a81b0ea6ca770bc4238bad3b67ae2d2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Thu, 7 Dec 2023 13:54:41 +0800 Subject: [PATCH 23/30] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Common/LawyerArchivesController.cs | 2 +- 24Hour/Controllers/LoginController.cs | 2 -- 24Hour/WechatMessagerClient.cs | 14 +++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 351e74d..66808ad 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -131,7 +131,7 @@ namespace _24Hour.Controllers.Common lawyer.departmentUnifiedSocialCreditCode = sccCode; var num = await _db.Updateable(lawyer).UpdateColumns(x => x.departmentUnifiedSocialCreditCode).ExecuteCommandAsync(); - if (num>0) + if (num > 0) { return Result.Success("更新成功"); } diff --git a/24Hour/Controllers/LoginController.cs b/24Hour/Controllers/LoginController.cs index 3d731a6..c8b6bb3 100644 --- a/24Hour/Controllers/LoginController.cs +++ b/24Hour/Controllers/LoginController.cs @@ -410,7 +410,6 @@ namespace _24Hour.Controllers } else { - ret.IsSucceed = false; ret.Message = "΢δȨע˺ţ"; } @@ -664,7 +663,6 @@ namespace _24Hour.Controllers ret.Message = $"ûδȨ޷¼ϵԱ"; return ret; } - } return ret; } diff --git a/24Hour/WechatMessagerClient.cs b/24Hour/WechatMessagerClient.cs index 106b124..0294221 100644 --- a/24Hour/WechatMessagerClient.cs +++ b/24Hour/WechatMessagerClient.cs @@ -44,10 +44,6 @@ namespace _24Hour appid = $"{configuration.GetSection("Wechat:appid").Value}"; secret = $"{configuration.GetSection("Wechat:secret").Value}"; secid = $"{configuration.GetSection("Wechat:secid").Value}"; - - logger.LogInformation($"appid {appid}"); - logger.LogInformation($"secret {secret}"); - logger.LogInformation($"secid {secid}"); } public async Task GetOpenId(string code) { @@ -116,7 +112,7 @@ namespace _24Hour msg = new { touser = useropenId, - template_id = "mRfzPnc_3JuV9cPhjKrRL3jX1C_JJoBGYtqEnbfadRM", + template_id = "XgrMTq1gwDfMJI6vN0jsSEv3xGy7v3amh0JMWj4SnAY", page = "pages/selfService/reception/reception", miniprogram_state = $"{_configuration.GetSection("Wechat:miniprogram_state").Value}", lang = "zh_CN", @@ -129,7 +125,9 @@ namespace _24Hour thing5 = new { value = $"{thing5}", color = "#173177" },// }, }; + logger.LogInformation($"发送审核成功通知 参数{msg.ConvertToJsonStr()} url {url}"); var re = HttpHelper.Post(posturl, msg); + logger.LogInformation($"发送审核成功通知 结果：{re}"); if (re.Jsonstr("errcode") == "0") return true; return false; @@ -161,7 +159,7 @@ namespace _24Hour if (string.IsNullOrEmpty(token)) { - string geturl = $"https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wx48108a0c98a3dab0&secret=e752e4fba67526eca21313a18c96a58f"; + string geturl = $"https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={appid}&secret={secid}"; var re1 = HttpHelper.Get(geturl); if (re1.Jsonstr("errcode") == null) { @@ -187,7 +185,7 @@ namespace _24Hour msg = new { touser = useropenId, - template_id = "sPbZd6ro14L4uCR_TyDlB_nKKBq-iSvVBlOCmtTDDt0", + template_id = "bfA-t5EN4pkQzAOS17SRPRKvmMteaJt0kw3YKIcovIQ", page = "pages/selfService/reception/reception", miniprogram_state = $"{_configuration.GetSection("Wechat:miniprogram_state").Value}", lang = "zh_CN", @@ -200,7 +198,9 @@ namespace _24Hour thing5 = new { value = $"{thing5}" },//事由 }, }; + logger.LogInformation($"发送审核成功通知 参数{msg.ConvertToJsonStr()} url {url}"); var re = HttpHelper.Post(posturl, msg); + logger.LogInformation($"发送审核通知 结果：{re}"); if (re.Jsonstr("errcode") == "0") return true; return false; From 0be442d16678ffab8ffbf01bfb73b4cac0505d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 11 Dec 2023 09:36:51 +0800 Subject: [PATCH 24/30] =?UTF-8?q?=E5=9B=9E=E4=BC=A02.0=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=B8=8A=E4=BC=A0=E5=BE=8B=E5=B8=88=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=BE=8B?= =?UTF-8?q?=E5=B8=88=E4=BF=A1=E6=81=AF=E6=97=B6=E5=B0=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E4=BF=A1=E6=81=AF=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?=E5=BE=8B=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Common/LawyerArchivesController.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 66808ad..8051975 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -928,6 +928,10 @@ namespace _24Hour.Controllers.Common var permissibleStartTime = lawyerArchives.permissibleStartTime?.ToString("yyyy-MM-dd"); var permissibleEndTime = lawyerArchives.permissibleEndTime?.ToString("yyyy-MM-dd"); + var jmsfzh = lawyer.cardId; + var szlssws = lawyer.departmentName; + var tyshxydm = lawyer.departmentUnifiedSocialCreditCode; + //if (true) //{ // bmsah = "安北检刑诉受[2023]410503000002号"; @@ -998,8 +1002,12 @@ namespace _24Hour.Controllers.Common return result; } #endregion + var registerinforequest = await Register(new RegisterDto() { + DepartMentNameSccCode= tyshxydm, + DepartMentName = szlssws, + CardId = jmsfzh, Bmsah = bmsah, UnitCode = UnitCode, UnitName = UnitName, @@ -1025,7 +1033,6 @@ namespace _24Hour.Controllers.Common Zbls = "", Lxdh = "", Lxdz = "" - }); if (registerinforequest.IsSucceed == true) { @@ -1802,6 +1809,7 @@ namespace _24Hour.Controllers.Common userim.identityphoto = files; userim.departmentPhoto = departments; userim.unitCode = _userdata.unitCode; + userim.identity = "律师"; _db.BeginTran(); var num = await _db.Insertable(userim).ExecuteCommandAsync(); _db.CommitTran(); @@ -1812,6 +1820,7 @@ namespace _24Hour.Controllers.Common user.identityphoto = files; user.departmentPhoto = departments; user.unitCode = _userdata.unitCode; + user.identity = "律师"; _db.BeginTran(); var num = await _db.Updateable(user) .UpdateColumns(x => new @@ -1820,6 +1829,7 @@ namespace _24Hour.Controllers.Common x.identityphoto, x.departmentPhoto, x.unitCode, + x.identity }) .IgnoreColumns(ignoreAllNullColumns: true) .ExecuteCommandAsync(); From 3ca68d6977ede974a4a111664fb72cba3ef03300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 11 Dec 2023 09:37:31 +0800 Subject: [PATCH 25/30] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=9C=A8=E4=B8=80=E4=BD=93=E6=9C=BA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E7=9A=84=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/LoginController.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/24Hour/Controllers/LoginController.cs b/24Hour/Controllers/LoginController.cs index c8b6bb3..6368aec 100644 --- a/24Hour/Controllers/LoginController.cs +++ b/24Hour/Controllers/LoginController.cs @@ -640,12 +640,14 @@ namespace _24Hour.Controllers var datea = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.cardId == cardId).FirstAsync(); if (datea == null) { + var unitcode = _configuration.GetSection("CaseTwenty:UnitCode").Value; var UserModel = new App_Sys_UserModel(); _db.BeginTran(); UserModel.Id = Guid.NewGuid().ToString(); UserModel.cardId = cardId; UserModel.name = name; UserModel.usertype = 1; + UserModel.unitCode = unitcode; string cardIdpwa = UserModel.cardId.Substring(UserModel.cardId.Length - 6); //Ĭ֤λ UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{cardIdpwa}").ToLower(); From 2ef80ea605da44436221e1fbb4a81b83d09f5887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 11 Dec 2023 09:51:41 +0800 Subject: [PATCH 26/30] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=8B=E5=B8=88?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=20=E4=BA=8B=E5=8A=A1=E6=89=80?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=20=E4=BA=8B=E5=8A=A1=E6=89=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dto/RegisterDto.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Dto/RegisterDto.cs b/Dto/RegisterDto.cs index 453f141..6ed163d 100644 --- a/Dto/RegisterDto.cs +++ b/Dto/RegisterDto.cs @@ -96,5 +96,19 @@ namespace Dto /// 律师联系地址 /// public string Lxdz { get; set; } + + /// + /// 律师身份证号码 + /// + public string CardId { get; set; } + /// + /// 律师事务所名称 + /// + public string DepartMentName { get; set; } + /// + /// 律师事务所统一信用代码 + /// + public string DepartMentNameSccCode { get; set; } + } } From 17f1a3f62cf6687cae8c75b437082ba1e2c2c032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 11 Dec 2023 09:52:10 +0800 Subject: [PATCH 27/30] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E7=B3=BB=E7=BB=9F=E6=89=BE=E4=B8=8D=E5=88=B0=E8=AF=A5?= =?UTF-8?q?=E5=BE=8B=E5=B8=88=EF=BC=8C=E5=B0=B1=E8=87=AA=E5=8A=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BE=8B=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TwentySystemController.cs | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/WebApplication1/Controllers/TwentySystemController.cs b/WebApplication1/Controllers/TwentySystemController.cs index 7f28f2a..7efdbde 100644 --- a/WebApplication1/Controllers/TwentySystemController.cs +++ b/WebApplication1/Controllers/TwentySystemController.cs @@ -743,18 +743,33 @@ namespace WebApplication1.Controllers var sqrrequest = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlDj/findSqrxx", findSqrxx); var sqrRuslt = await sqrrequest.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); var SqrDto = JsonConvert.DeserializeObject>(sqrRuslt); + var sqrdtodata = () => + { + var data = new ContentDto(); + data.sqrbh = ""; + data.djdwbm = dto.UnitCode; + data.djdwmc = dto.UnitName; + data.jmsfzh = dto.CardId; + data.szlssws = dto.DepartMentName; + data.tyshxydm = dto.DepartMentNameSccCode; + data.sqrlxdm = "1403187300001"; + data.sqrlxmc = "绤"; + data.sqrsfdm = "1404187300003"; + data.sqrsfmc = "ʦ"; + data.zjhm = dto.ProposerZJHM; + data.zjlxdm = "9910180300010"; + data.zjlxmc = "ʦִҵ֤"; + return data; + }; + ContentDto sqrModel; if (SqrDto.success == false && SqrDto.code != "0" && SqrDto.data.content.Count == 0) { - result.IsSucceed = false; - result.Message = "ʦݲ"; - return result; + sqrModel = sqrdtodata(); } - var sqrModel = SqrDto.data.content.Where(x => x.zjhm == dto.ProposerZJHM).FirstOrDefault(); + sqrModel = SqrDto.data.content.Where(x => x.zjhm == dto.ProposerZJHM).FirstOrDefault(); if (sqrModel == null) { - result.IsSucceed = false; - result.Message = "ʦݲ"; - return result; + sqrModel = sqrdtodata(); } SaveBhdlDjxxDto saveBhdlDjxxDto = new SaveBhdlDjxxDto() From 130ff5492dc8dbe90117af956e1b38e14bc18571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 11 Dec 2023 09:52:46 +0800 Subject: [PATCH 28/30] =?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.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 24Hour/24Hour.csproj | 4 ++-- .../bin/Debug/net6.0/appsettings.json | 21 ------------------- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 WebApplication1/bin/Debug/net6.0/appsettings.json diff --git a/.gitignore b/.gitignore index ca538d0..fc4d2ce 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ dkms.conf /WebApplication1/obj/Release/net6.0/PubTmp/Out/WebApplication1.deps.json /WebApplication1/obj/Release/net6.0/WebApplication1.csproj.CoreCompileInputs.cache /WebApplication1/Properties/PublishProfiles/FolderProfile.pubxml.user +/WebApplication1/bin/Debug/net6.0/appsettings.json diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj index d052d32..ae95f9a 100644 --- a/24Hour/24Hour.csproj +++ b/24Hour/24Hour.csproj @@ -8,8 +8,8 @@ True e485308c-2f05-470b-b0a4-68f1ec2b3412 Linux - 1.0.2.2 - 1.0.2.2 + 1.0.2.5 + 1.0.2.5 diff --git a/WebApplication1/bin/Debug/net6.0/appsettings.json b/WebApplication1/bin/Debug/net6.0/appsettings.json deleted file mode 100644 index 0c711ca..0000000 --- a/WebApplication1/bin/Debug/net6.0/appsettings.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - - "AllowedHosts": "*", - "Configs": { - "SystemIp": "143.120.5.25", - "Port": "8080" - }, - "Kestrel": { - "Endpoints": { - "Http": { - "Url": "http://localhost:5194" - } - } - } -} From e51f0e5f5aa52b82388ed5cdda0f10dcae779130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 11 Dec 2023 09:52:59 +0800 Subject: [PATCH 29/30] =?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.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/appsettings.json | 6 +++--- 24Hour/build/dockerbuild.txt | 26 ++++++++++++++---------- Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs | 7 +++---- WebApplication1/WebApplication1.csproj | 4 ++-- WebApplication1/appsettings.json | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index 63a1bc6..4f7e7c7 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -53,9 +53,9 @@ }, "CaseTwenty": { "SysAddress": "http://127.0.0.1:5194", - "UseOfflineData": "true", - "UnitCode": 410503, - "UnitName": "北关区院" + "UseOfflineData": "false", + "UnitCode": 130129, + "UnitName": "赞皇区检" }, "SyncDataFromJiguang": { "enable": "false" diff --git a/24Hour/build/dockerbuild.txt b/24Hour/build/dockerbuild.txt index a8b59cf..9bcb86b 100644 --- a/24Hour/build/dockerbuild.txt +++ b/24Hour/build/dockerbuild.txt @@ -1,6 +1,6 @@ create images -docker build -t twentyfoursvc:1.0.2.2 . -docker save -o d://twentyfoursvc.1.0.2.2.tar twentyfoursvc:1.0.2.2 +docker build -t twentyfoursvc:1.0.2.4 . +docker save -o d://twentyfoursvc.1.0.2.5.tar twentyfoursvc:1.0.2.5 docker on windows for fake data create container docker run --name twentyfoursvc -p 8098:8098 -v D://dockerconfigs/24hourconfig/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime -d twentyfoursvc:1.0.1.5 @@ -12,7 +12,7 @@ docker network create -d bridge twentytotwneyfour for 24hourserver docker run \ ---name twentyfoursvc1.0.2.2 \ +--name twentyfoursvc1.0.2.5 \ -p 8098:8098 \ -v /home/24hour/logs:/app/logs \ -v /home/24hour/wwwroot:/app/wwwroot \ @@ -22,7 +22,11 @@ docker run \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ --d twentyfoursvc:1.0.2.2 +-d twentyfoursvc:1.0.2.5 + + + +docker run --name twentyfoursvc1.0.2.3 -d twentyfoursvc:1.0.2.3 @@ -44,7 +48,7 @@ docker run --name twentyfoursvc1.0.2.2 \ -docker run --name twentyfoursvc1.0.1.18 \ +docker run --name twentyfoursvc1.0.2.3 \ -p 8098:8098 \ -v /home/24hour/config/appsettings.json:/app/appsettings.json \ -v /home/24hour/config/log4net.config:/app/log4net.config \ @@ -59,7 +63,7 @@ docker run --name twentyfoursvc1.0.1.18 \ --link mysql \ --network twentytotwneyfour \ --network-alias twentyfour \ ---restart=always -d twentyfoursvc:1.0.1.18 +--restart=always -d twentyfoursvc:1.0.2.3 docker run -d --name dotnetmvc \ @@ -168,7 +172,7 @@ docker run --rm -it \ - +2.0代理 docker run --name twentyfoursvc @@ -178,12 +182,12 @@ docker run --restart=always -d twentyfoursvc:1.0.1.5 -docker build -t twentysysproxy:1.0.1.4 . -docker save -o d://twentysysproxy.1.0.1.4.tar twentysysproxy:1.0.1.4 -docker load -i twentysysproxy.1.0.1.4.tar +docker build -t twentysysproxy:1.0.1.5 . +docker save -o d://twentysysproxy.1.0.1.5.tar twentysysproxy:1.0.1.5 +docker load -i twentysysproxy.1.0.1.5.tar for 2.0 proxyclient -docker run --name twentysysproxy.1.0.1.4 -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.0.1.4 +docker run --name twentysysproxy.1.0.1.5 -p 5194:5194 -v /home/twentysysproxy/config/appsettings.json:/app/appsettings.json -v /etc/localtime:/etc/localtime --restart=always --link mysql --network twentytotwneyfour --network-alias twentyproxy -d twentysysproxy:1.0.1.5 diff --git a/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs b/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs index 571a848..66a2324 100644 --- a/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs +++ b/Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs @@ -1,10 +1,9 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// This code was generated by a tool. // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ diff --git a/WebApplication1/WebApplication1.csproj b/WebApplication1/WebApplication1.csproj index 6e3e579..bcc8be4 100644 --- a/WebApplication1/WebApplication1.csproj +++ b/WebApplication1/WebApplication1.csproj @@ -6,8 +6,8 @@ enable ae1f7aa6-e320-4393-ac3f-984b92923499 Linux - 1.0.1.4 - 1.0.1.4 + 1.0.1.5 + 1.0.1.5 diff --git a/WebApplication1/appsettings.json b/WebApplication1/appsettings.json index 0c711ca..6f34a30 100644 --- a/WebApplication1/appsettings.json +++ b/WebApplication1/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "Configs": { - "SystemIp": "143.120.5.25", + "SystemIp": "143.16.40.6", "Port": "8080" }, "Kestrel": { From 94acfe69e5d28fd607de6da1293a58e17133d4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 11 Dec 2023 09:59:40 +0800 Subject: [PATCH 30/30] =?UTF-8?q?=E5=B0=86=E6=B6=88=E6=81=AF=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E7=9A=84=E6=A8=A1=E6=9D=BFid=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/WechatMessagerClient.cs | 10 ++++++++-- 24Hour/appsettings.json | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/24Hour/WechatMessagerClient.cs b/24Hour/WechatMessagerClient.cs index 0294221..bc380f3 100644 --- a/24Hour/WechatMessagerClient.cs +++ b/24Hour/WechatMessagerClient.cs @@ -31,6 +31,8 @@ namespace _24Hour /// 小程序secretID /// private string secid = "e752e4fba67526eca21313a18c96a58f"; + private string TemplateIdSuccess { get; set; } = ""; + private string TemplateIdFail { get; set; } = ""; private readonly ILogger logger; public WechatMessagerClient(HttpClient _httpCliet, IConfiguration configuration, ILogger _logger) { @@ -44,6 +46,8 @@ namespace _24Hour appid = $"{configuration.GetSection("Wechat:appid").Value}"; secret = $"{configuration.GetSection("Wechat:secret").Value}"; secid = $"{configuration.GetSection("Wechat:secid").Value}"; + TemplateIdSuccess = $"{configuration.GetSection("Wechat:templateIdSuccess").Value}"; + TemplateIdFail = $"{configuration.GetSection("Wechat:templateIdFail").Value}"; } public async Task GetOpenId(string code) { @@ -112,7 +116,8 @@ namespace _24Hour msg = new { touser = useropenId, - template_id = "XgrMTq1gwDfMJI6vN0jsSEv3xGy7v3amh0JMWj4SnAY", + //兼容北关区模板id，那边的配置文件没有模板id的字段 + template_id = string.IsNullOrEmpty(TemplateIdSuccess) ? "XgrMTq1gwDfMJI6vN0jsSEv3xGy7v3amh0JMWj4SnAY" : TemplateIdSuccess, page = "pages/selfService/reception/reception", miniprogram_state = $"{_configuration.GetSection("Wechat:miniprogram_state").Value}", lang = "zh_CN", @@ -185,7 +190,8 @@ namespace _24Hour msg = new { touser = useropenId, - template_id = "bfA-t5EN4pkQzAOS17SRPRKvmMteaJt0kw3YKIcovIQ", + //兼容北关区模板id，那边的配置文件没有模板id的字段 + template_id = string.IsNullOrEmpty(TemplateIdFail) ? "bfA-t5EN4pkQzAOS17SRPRKvmMteaJt0kw3YKIcovIQ" : TemplateIdFail, page = "pages/selfService/reception/reception", miniprogram_state = $"{_configuration.GetSection("Wechat:miniprogram_state").Value}", lang = "zh_CN", diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index 4f7e7c7..2716add 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -49,7 +49,9 @@ "appid": "wx48108a0c98a3dab0", "secret": "e752e4fba67526eca21313a18c96a58f", "secid": "e752e4fba67526eca21313a18c96a58f", - "miniprogram_state": "trial" + "miniprogram_state": "trial", + "templateIdSuccess": "XgrMTq1gwDfMJI6vN0jsSEv3xGy7v3amh0JMWj4SnAY", + "templateIdFail": "bfA-t5EN4pkQzAOS17SRPRKvmMteaJt0kw3YKIcovIQ" }, "CaseTwenty": { "SysAddress": "http://127.0.0.1:5194",