合并

.gitignore

@@ -101,3 +101,15 @@ 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
+/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
+/WebApplication1/bin/Debug/net6.0/appsettings.json

24Hour/24Hour.csproj

@@ -8,8 +8,8 @@
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<UserSecretsId>e485308c-2f05-470b-b0a4-68f1ec2b3412</UserSecretsId>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<AssemblyVersion>1.0.1.27</AssemblyVersion>
+		<AssemblyVersion>1.0.2.5</AssemblyVersion>
-		<Version>1.0.1.27</Version>
+		<Version>1.0.2.5</Version>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

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
@@ -79,12 +81,69 @@ namespace _24Hour.Controllers.Common
             var data = await _db.Queryable<App_Sys_UserModel>()
                 .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;
         }
         /// <summary>
+        /// 获取当前登录人员的单位下所有的律师信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("GetLawyerByUnitCodeWithFilter")]
+        public async Task<Result<IEnumerable<App_Sys_UserModel>>> GetLawyerByUnitCodeWithFilter(string filter)
+        {
+            var res = new Result<IEnumerable<App_Sys_UserModel>>();
+
+            var data = await _db.Queryable<App_Sys_UserModel>()
+                .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;
+            return res;
+        }
+        /// <summary>
+        /// 修改律师事务所统一信用代码
+        /// </summary>
+        /// <param name="lawyerid"></param>
+        /// <param name="sccCode"></param>
+        /// <returns></returns>
+        [HttpGet("ChangeSccCodeByLawyer")]
+        public async Task<Result> ChangeSccCodeByLawyer(string lawyerid, string sccCode)
+        {
+            var lawyer = await _db.Queryable<App_Sys_UserModel>().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("更新失败");
+                    }
+                }
+
+            }
+        }
+        /// <summary>
         /// 修改内网律师信息
         /// </summary>
         /// <param name="input"></param>
@@ -107,7 +166,6 @@ namespace _24Hour.Controllers.Common
                     {
                         result.IsSucceed = true;
                         result.result = "修改成功";
-
                     }
                 }
                 else
@@ -194,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;
@@ -371,6 +430,9 @@ namespace _24Hour.Controllers.Common
                 {
                     return Result.Error("当前预约信息已被分配");
                 }
+                lawsvc.objectstr = dto.casename;
+
+
                 var entity = mapper.Map<LawyerArchives>(dto);
                 entity.Id = Guid.NewGuid().ToString();
                 entity.createrId = _userdata.Id;
@@ -383,6 +445,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)
                 {
@@ -865,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号";
@@ -935,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,
@@ -962,7 +1033,6 @@ namespace _24Hour.Controllers.Common
                     Zbls = "",
                     Lxdh = "",
                     Lxdz = ""
-
                 });
                 if (registerinforequest.IsSucceed == true)
                 {
@@ -1739,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();
@@ -1749,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
@@ -1757,6 +1829,7 @@ namespace _24Hour.Controllers.Common
                                 x.identityphoto,
                                 x.departmentPhoto,
                                 x.unitCode,
+                                x.identity
                             })
                             .IgnoreColumns(ignoreAllNullColumns: true)
                             .ExecuteCommandAsync();
@@ -1815,7 +1888,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();
@@ -1834,6 +1907,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
@@ -2070,7 +2144,113 @@ namespace _24Hour.Controllers.Common
 
             return result;
         }
+        [HttpPost]
+        [Route("SyncLawyerInfoFromTwentySys")]
+        public async Task<Result> 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<App_Sys_UserModel>()
+                        .Where(x => ids.Contains(x.cardId))
+                        .ToList();
+                    var addlist = new List<App_Sys_UserModel>();
+                    var editlist = new List<App_Sys_UserModel>();
+
+                    foreach (var item in lawyers)
+                    {
+                        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;
+                            editentity.departmentName = item.departmentName;
+                            editentity.identitycardId = item.identitycardId;
+                            editentity.identity = "律师";
+                            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
         {

24Hour/Controllers/Common/LawyerservicesController.cs

@@ -170,6 +170,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)

24Hour/Controllers/LoginController.cs

@@ -448,7 +448,6 @@ namespace _24Hour.Controllers
             }
             else
             {
-
                 ret.IsSucceed = false;
                 ret.Message = "微信未授权，请先注册账号！";
             }
@@ -679,12 +678,14 @@ namespace _24Hour.Controllers
                 var datea = await _db.Queryable<App_Sys_UserModel>().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();
@@ -702,7 +703,6 @@ namespace _24Hour.Controllers
                     ret.Message = $"用户未授权无法登录，请联系管理员！";
                     return ret;
                 }
-
             }
             return ret;
         }

24Hour/Controllers/system/SystemControllerController.cs

@@ -729,18 +729,18 @@ namespace _24Hour.Controllers.system
         /// <param name="photo"></param>
         /// <param name="lawyerid"></param>
         /// <returns></returns>
-        [HttpGet]
+        [HttpPost]
         [Route("EditLawyerDepartmentPhoto")]
-        public async Task<Result> EditLawyerDepartmentPhoto(string photo,string lawyerid)
+        public async Task<Result> EditLawyerDepartmentPhoto(EditLawyerInput input)
         {
             try
             {
                 _db.BeginTran();
-                var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == lawyerid).ToListAsync();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().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();
@@ -760,24 +760,30 @@ namespace _24Hour.Controllers.system
             _logs.WriteSysLogadd("用户管理", "用户部门证件替换", result, _db);
             return result;
         }
+        public class EditLawyerInput
+        {
+            public string[] photo { get; set; }
+            public string lawyerid { get; set; }
+        }
+
         /// <summary>
         /// 根据律师id修改律师职业证图片
         /// </summary>
         /// <param name="photo"></param>
         /// <param name="lawyerid"></param>
         /// <returns></returns>
-        [HttpGet]
+        [HttpPost]
-        [Route("EditLawyerIdentityphoto")]
+        [Route("EditLawyerIdentityphot")]
-        public async Task<Result> EditLawyerIdentityphoto(string photo, string lawyerid)
+        public async Task<Result> EditLawyerIdentityphoto(EditLawyerInput input)
         {
             try
             {
                 _db.BeginTran();
-                var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id == lawyerid).ToListAsync();
+                var userlist = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.Id ==input.lawyerid).ToListAsync();
                 userlist.ForEach(q =>
                 {
                     //头像地址
-                    q.identityphoto = photo;
+                    q.identityphoto =input.photo.ConvertToJsonStr();
                 });
                 var num = await _db.Updateable(userlist).ExecuteCommandAsync();
                 _db.CommitTran();

24Hour/TwentySystemProxyClient.cs

@@ -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<Result<FindSqrxxDto>> 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<FindSqrxxDto> result = new Result<FindSqrxxDto>();
+            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<Result<FindSqrxxDto>> QueryLsList(string ProposerZJHM)
         {
             var UseOfflineData = configuration.GetSection("CaseTwenty:UseOfflineData").Value;
@@ -131,7 +159,7 @@ namespace _24Hour
                 result.IsSucceed = false;
                 result.Message = data?.message ?? "操作失败";
             }
-            if (UseOfflineData=="true")
+            if (UseOfflineData == "true")
             {
                 result.Message = "操作成功(测试数据)";
             }
@@ -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;
                 }
             });
@@ -184,7 +212,7 @@ namespace _24Hour
         }
 
 
-    public async Task<Result<QueryResult<CaseInfo>>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size)
+        public async Task<Result<QueryResult<CaseInfo>>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size)
         {
             Result<QueryResult<CaseInfo>> Result = new();
             var param = new

24Hour/WechatMessagerClient.cs

@@ -39,10 +39,13 @@ namespace _24Hour
         /// 小程序secretID
         /// </summary>
         private string secid = "e752e4fba67526eca21313a18c96a58f";
-        public WechatMessagerClient(HttpClient _httpCliet, IConfiguration configuration)
+        private string TemplateIdSuccess { get; set; } = "";
+        private string TemplateIdFail { get; set; } = "";
+        private readonly ILogger<WechatMessagerClient> logger;
+        public WechatMessagerClient(HttpClient _httpCliet, IConfiguration configuration, ILogger<WechatMessagerClient> _logger)
         {
             this.httpCliet = _httpCliet;
-
+            this.logger = _logger;
             httpCliet.DefaultRequestHeaders.Add("Accept", "application/json");
             httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample");
             httpCliet.DefaultRequestHeaders.ConnectionClose = true;
@@ -115,7 +118,7 @@ namespace _24Hour
         /// 律师预约微信消息提醒，成功
         /// </summary>
         /// <returns></returns>
-        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
             {
@@ -145,27 +148,30 @@ namespace _24Hour
                     string posturl = $"{url}{token}";//发送地址
                     var thing4 = matter;
                     var thing5 = attention;
-                    if (!string.IsNullOrEmpty(matter) && matter.Length>20)
+                    if (!string.IsNullOrEmpty(matter) && matter.Length > 20)
-                        thing4 = matter.Substring(0, 17)+"...";
+                        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",
+                        //兼容北关区模板id，那边的配置文件没有模板id的字段
-                        page= "pages/selfService/reception/reception",
+                        template_id = string.IsNullOrEmpty(TemplateIdSuccess) ? "XgrMTq1gwDfMJI6vN0jsSEv3xGy7v3amh0JMWj4SnAY" : TemplateIdSuccess,
-                        miniprogram_state= $"{_configuration.GetSection("Wechat:miniprogram_state").Value}",
+                        page = "pages/selfService/reception/reception",
-                    lang ="zh_CN",
+                        miniprogram_state = $"{_configuration.GetSection("Wechat:miniprogram_state").Value}",
+                        lang = "zh_CN",
                         data = new
                         {
                             //name1 = new { value = $"{name}"},//
-                            thing2 = new { value = $"{unit}"},//
+                            thing2 = new { value = $"{unit}" },//
-                            date3 = new { value = $"{datetime:yyyy年MM月dd日 HH:mm}"},//
+                            date3 = new { value = $"{datetime:yyyy年MM月dd日 HH:mm}" },//
-                            thing4 = new { value = $"{thing4}"},//
+                            thing4 = new { value = $"{thing4}" },//
                             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;
@@ -186,7 +192,7 @@ namespace _24Hour
         /// 律师预约微信消息提醒，失败
         /// </summary>
         /// <returns></returns>
-        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
             {
@@ -215,7 +221,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)
@@ -223,7 +229,8 @@ namespace _24Hour
                     msg = new
                     {
                         touser = useropenId,
-                        template_id = "sPbZd6ro14L4uCR_TyDlB_nKKBq-iSvVBlOCmtTDDt0",
+                        //兼容北关区模板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",
@@ -236,7 +243,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;

24Hour/appsettings.json

@@ -49,7 +49,9 @@
     "appid": "wx48108a0c98a3dab0",
     "secret": "e752e4fba67526eca21313a18c96a58f",
     "secid": "e752e4fba67526eca21313a18c96a58f",
-    "miniprogram_state": "trial"
+    "miniprogram_state": "trial",
+    "templateIdSuccess": "XgrMTq1gwDfMJI6vN0jsSEv3xGy7v3amh0JMWj4SnAY",
+    "templateIdFail": "bfA-t5EN4pkQzAOS17SRPRKvmMteaJt0kw3YKIcovIQ"
   },
   "WechatGzh": { //微信公众号
     "appid": "wx1f5c662edbe3b627",
@@ -57,9 +59,9 @@
   },
   "CaseTwenty": {
     "SysAddress": "http://127.0.0.1:5194",
-    "UseOfflineData": "true",
+    "UseOfflineData": "false",
-    "UnitCode": 410503,
+    "UnitCode": 130129,
-    "UnitName": "北关区院"
+    "UnitName": "赞皇区检"
   },
   "SyncDataFromJiguang": {
     "enable": "false"

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.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
@@ -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 -d bridge twentytotwneyfour
-docker network create twentytotwneyfour
 
 for 24hourserver
 docker run \
---name twentyfoursvc \
+--name twentyfoursvc1.0.2.5 \
 -p 8098:8098 \
 -v /home/24hour/logs:/app/logs \
 -v /home/24hour/wwwroot:/app/wwwroot \
@@ -23,48 +22,76 @@ docker run \
 --link mysql \
 --network twentytotwneyfour \
 --network-alias twentyfour \
--d twentyfoursvc:1.0.1.5
+-d twentyfoursvc:1.0.2.5
+
+
+
+docker run --name twentyfoursvc1.0.2.3 -d twentyfoursvc:1.0.2.3
 
 
-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.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.9
+--restart=always -d twentyfoursvc:1.0.2.2
 
 
 
 
 
 
-docker run --name twentyfoursvc1.0.1.9 \
+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 \
 -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.2.3
+
+
+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 +135,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
 
 
 
@@ -129,10 +172,22 @@ docker run --rm -it -p 8000:80 -p 8098:443
 
 
 
+2.0代理
 
+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.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.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
 
 
 

Dto/RegisterDto.cs

@@ -96,5 +96,19 @@ namespace Dto
         /// 律师联系地址
         /// </summary>
         public string Lxdz { get; set; }
+
+        /// <summary>
+        /// 律师身份证号码
+        /// </summary>
+        public string CardId { get; set; }
+        /// <summary>
+        /// 律师事务所名称
+        /// </summary>
+        public string DepartMentName { get; set; }
+        /// <summary>
+        /// 律师事务所统一信用代码
+        /// </summary>
+        public string DepartMentNameSccCode { get; set; }
+        
     }
 }

Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
+//     This code was generated by a tool.
-//     运行时版本:4.0.30319.42000
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     Changes to this file may cause incorrect behavior and will be lost if
-//     重新生成代码，这些更改将会丢失。
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

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);
+        }
+
         /// <summary>
         /// 判断字符串是否为Null、空
         /// </summary>

WebApplication1/Controllers/TwentySystemController.cs

@@ -567,6 +567,28 @@ namespace WebApplication1.Controllers
             }
             return SqrDto;
         }
+        [HttpGet]
+        public async Task<ResultDataDto<FindSqrxxDto>> GetAllLsList()
+        {
+            ResultDataDto<FindSqrxxDto> result = new ResultDataDto<FindSqrxxDto>();
+            ///申请人信息
+            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<ResultDataDto<FindSqrxxDto>>(sqrRuslt);
+            if (SqrDto.success == false && SqrDto.code != "0" && SqrDto.data.content.Count == 0)
+            {
+                result.success = false;
+                result.message = "律师数据不存在";
+                return result;
+            }
+            return SqrDto;
+        }
 
         /// <summary>
         /// µÇ¼Ç
@@ -721,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<ResultDataDto<FindSqrxxDto>>(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;
+                    sqrModel = sqrdtodata();
-                    result.Message = "律师数据不存在";
-                    return result;
                 }
-                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;
+                    sqrModel = sqrdtodata();
-                    result.Message = "律师数据不存在";
-                    return result;
                 }
 
                 SaveBhdlDjxxDto saveBhdlDjxxDto = new SaveBhdlDjxxDto()

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();

WebApplication1/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <_PublishTargetUrl>C:\Users\callm\source\repos\24Hour.Service\WebApplication1\bin\Release\net6.0\publish\</_PublishTargetUrl>
-    <History>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;</History>
-    <LastFailureDetails />
-  </PropertyGroup>
-</Project>

WebApplication1/WebApplication1.csproj

@@ -6,8 +6,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>ae1f7aa6-e320-4393-ac3f-984b92923499</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-	  <AssemblyVersion>1.0.1.0</AssemblyVersion>
+	  <AssemblyVersion>1.0.1.5</AssemblyVersion>
-	  <Version>1.0.1.0</Version>
+	  <Version>1.0.1.5</Version>
   </PropertyGroup>
 
   <ItemGroup>

WebApplication1/appsettings.json

@@ -8,7 +8,7 @@
 
   "AllowedHosts": "*",
   "Configs": {
-    "SystemIp": "143.120.5.25",
+    "SystemIp": "143.16.40.6",
     "Port": "8080"
   },
   "Kestrel": {

WebApplication1/bin/Debug/net6.0/WebApplication1.deps.json

@@ -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": ""
-    }
-  }
-}

WebApplication1/bin/Debug/net6.0/appsettings.json

@@ -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"
-      }
-    }
-  }
-}

WebApplication1/bin/Release/net6.0/WebApplication1.deps.json

@@ -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"
-    }
-  }
-}

WebApplication1/bin/Release/net6.0/appsettings.json

@@ -1,14 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  
-  "AllowedHosts": "*",
-  "Configs": {
-    "SystemIp": "143.120.5.25",
-    "Port": "8080"
-  }
-}

WebApplication1/bin/Release/net6.0/publish/WebApplication1.deps.json

@@ -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"
-    }
-  }
-}

WebApplication1/bin/Release/net6.0/publish/appsettings.json

@@ -1,14 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  
-  "AllowedHosts": "*",
-  "Configs": {
-    "SystemIp": "143.120.5.25",
-    "Port": "8080"
-  }
-}

WebApplication1/obj/Release/net6.0/PubTmp/Out/WebApplication1.deps.json

@@ -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"
-    }
-  }
-}

WebApplication1/obj/Release/net6.0/PubTmp/Out/appsettings.json

@@ -1,14 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  
-  "AllowedHosts": "*",
-  "Configs": {
-    "SystemIp": "143.120.5.25",
-    "Port": "8080"
-  }
-}

WebApplication1/obj/Release/net6.0/WebApplication1.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-1aab1d47053209a50c128993feed61e455baf1b5