diff --git a/24Hour/Controllers/LoginController.cs b/24Hour/Controllers/LoginController.cs index 93e01c1..dde056f 100644 --- a/24Hour/Controllers/LoginController.cs +++ b/24Hour/Controllers/LoginController.cs @@ -523,28 +523,6 @@ namespace _24Hour.Controllers } return ret; } - - /// - /// download file for video repot module - /// - /// - [HttpGet] - [Route("download")] - [CustomCorsActionFilterAttribute] - public IActionResult DownloadFile(string filepath) - { - var fileaddr = Path.Combine(Environment.CurrentDirectory, "wwwroot"); - fileaddr += filepath; - if (System.IO.File.Exists(fileaddr) == false) - { - return new BadRequestResult(); - } - return new FileStreamResult(new FileStream(path: fileaddr, FileMode.Open), "application/octet-stream") - { - FileDownloadName = Path.GetFileName(fileaddr), - }; - } - } diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs index d72deab..e24b3d2 100644 --- a/24Hour/Controllers/system/SystemControllerController.cs +++ b/24Hour/Controllers/system/SystemControllerController.cs @@ -1,9 +1,11 @@ using com.sun.xml.@internal.ws.api.model; using Elight.Entity; +using Elight.Entity.SystemModel; using Elight.Logic; using Elight.Logic.SystemModel; using Elight.Utility; using Elight.Utility.Code; +using Elight.Utility.Encrypt; using Elight.Utility.Extensions; using Elight.Utility.logs; using javax.xml.crypto; @@ -160,7 +162,7 @@ namespace _24Hour.Controllers.system UserModel.createusername = _userdata.name; UserModel.usertype = 0; //默认密码 - UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"mr123456").ToLower(); + UserModel.Password = string.IsNullOrEmpty(UserModel.Password) ? Elight.Utility.Encrypt.Md5.Encrypt32($"mr123456").ToLower() : Elight.Utility.Encrypt.Md5.Encrypt32(UserModel.Password).ToLower(); var num = await _db.Insertable(UserModel).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) @@ -177,6 +179,53 @@ namespace _24Hour.Controllers.system } _logs.WriteSysLogadd("用户管理", "添加系统用户信息", result, _db); return result; + } + + /// + /// 修改密码 + /// + /// + /// + [HttpPost] + [Route("UpdatePass")] + public async Task UpdateUser(UpdatePassModel UserModel) + { + try + { + var model = await _db.Queryable().Where(x => x.Id== UserModel.Id).FirstAsync(); + if (model == null) + { + result.IsSucceed = false; + result.result = "数据不存在"; + } + var Passmd5 = Md5.Encrypt32(UserModel.OldPassword).ToLower(); + var newpass = Md5.Encrypt32(UserModel.Password).ToLower(); + if (Passmd5 != model.Password) + { + result.IsSucceed = false; + result.Message = "账号或密码错误！"; + return result; + } + + model.Password= newpass; + + _db.BeginTran(); + var num = await _db.Updateable(model).UpdateColumns(it => new { it.Password }).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; } /// @@ -190,8 +239,20 @@ namespace _24Hour.Controllers.system { try { - _db.BeginTran(); - var num = await _db.Updateable(UserModel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + var model = await _db.Queryable().Where(x => x.Id== UserModel.Id).FirstAsync(); + if (model != null) + { + model.unitCode=UserModel.unitCode; + model.department=UserModel.department; + model.name=UserModel.name; + model.sex=UserModel.sex; + model.duties=UserModel.duties; + model.phone=UserModel.phone; + model.cardId=UserModel.cardId; + } + _db.BeginTran(); + var num = await _db.Updateable(model).UpdateColumns(it => new { it.unitCode, it.department, it.name, it.sex, it.duties, it.phone, it.cardId }).ExecuteCommandAsync(); + //var num = await _db.Updateable(UserModel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { diff --git a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user index 57a28e4..8e0c906 100644 --- a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\24小时发布 - True|2023-07-01T16:23:44.4442673Z;True|2023-07-01T23:42:35.7302162+08:00;True|2023-07-01T23:24:47.4663991+08:00;True|2023-07-01T22:22:56.9799185+08:00;True|2023-07-01T22:04:26.8941882+08:00;True|2023-07-01T21:40:11.5842496+08:00;True|2023-07-01T21:12:07.0048729+08:00;True|2023-07-01T18:55:25.7547257+08:00;True|2023-07-01T15:55:14.1686837+08:00;True|2023-07-01T15:52:20.6931207+08:00;True|2023-07-01T15:16:19.0847303+08:00;True|2023-07-01T14:32:30.7938970+08:00;True|2023-07-01T14:11:46.9198753+08:00;True|2023-07-01T13:52:41.7443973+08:00;True|2023-07-01T12:05:00.1914915+08:00;True|2023-07-01T11:35:15.2688362+08:00;True|2023-07-01T11:15:50.0622714+08:00;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; + True|2023-07-01T19:22:32.2918206Z;True|2023-07-02T02:25:58.6238404+08:00;True|2023-07-02T02:21:25.4053957+08:00;True|2023-07-02T02:09:02.6137949+08:00;True|2023-07-02T00:23:44.4442673+08:00;True|2023-07-01T23:42:35.7302162+08:00;True|2023-07-01T23:24:47.4663991+08:00;True|2023-07-01T22:22:56.9799185+08:00;True|2023-07-01T22:04:26.8941882+08:00;True|2023-07-01T21:40:11.5842496+08:00;True|2023-07-01T21:12:07.0048729+08:00;True|2023-07-01T18:55:25.7547257+08:00;True|2023-07-01T15:55:14.1686837+08:00;True|2023-07-01T15:52:20.6931207+08:00;True|2023-07-01T15:16:19.0847303+08:00;True|2023-07-01T14:32:30.7938970+08:00;True|2023-07-01T14:11:46.9198753+08:00;True|2023-07-01T13:52:41.7443973+08:00;True|2023-07-01T12:05:00.1914915+08:00;True|2023-07-01T11:35:15.2688362+08:00;True|2023-07-01T11:15:50.0622714+08:00;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; \ No newline at end of file diff --git a/Elight.Entity/SystemModel/UpdatePassModel.cs b/Elight.Entity/SystemModel/UpdatePassModel.cs new file mode 100644 index 0000000..4ee8e45 --- /dev/null +++ b/Elight.Entity/SystemModel/UpdatePassModel.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.Text; +using System.Threading.Tasks; + +namespace Elight.Entity.SystemModel +{ + public class UpdatePassModel + { + /// + /// + /// + [DataMember] + public string Id { get; set; } + + /// + /// 旧密码 + /// + [DataMember] + public string OldPassword { get; set; } + + /// + /// 新密码 + /// + [DataMember] + public string Password { get; set; } + } +} diff --git a/Elight.Logic/Job/QuartzHostedService.cs b/Elight.Logic/Job/QuartzHostedService.cs index 33d2b1a..ee9a9fc 100644 --- a/Elight.Logic/Job/QuartzHostedService.cs +++ b/Elight.Logic/Job/QuartzHostedService.cs @@ -1,4 +1,5 @@ using Elight.Utility; +using Elight.Utility.logs; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Quartz; @@ -28,38 +29,44 @@ namespace Elight.Logic.Job public async Task StartAsync(CancellationToken cancellationToken) { - IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken); - scheduler.JobFactory = _jobFactory; - #region 每33秒执行 - IJobDetail job3 = JobBuilder.Create() - .WithIdentity("job3", SchedulerConstants.DefaultGroup) - .Build(); - var trigger3 = TriggerBuilder.Create() - .WithIdentity("trigger3") // 给任务一个名字 - .StartAt(DateTime.Now) // 设置任务开始时间 - .ForJob("job3", SchedulerConstants.DefaultGroup) //给任务指定一个分组 - .WithCronSchedule("*/20 * * * * ?") - .UsingJobData("k", 321) - .Build(); - await scheduler.ScheduleJob(job3, trigger3, cancellationToken); - await scheduler.Start(cancellationToken); - #endregion - #region 每33秒执行 - IJobDetail job = JobBuilder.Create() - .WithIdentity("job", SchedulerConstants.DefaultGroup) - .Build(); - var trigger = TriggerBuilder.Create() - .WithIdentity("trigger") // 给任务一个名字 - .StartAt(DateTime.Now) // 设置任务开始时间 - .ForJob("job", SchedulerConstants.DefaultGroup) //给任务指定一个分组 - .WithCronSchedule("*/20 * * * * ?") - .UsingJobData("k", 321) - .Build(); - await scheduler.ScheduleJob(job, trigger, cancellationToken); - await scheduler.Start(cancellationToken); + try + { + IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken); + scheduler.JobFactory = _jobFactory; + #region 每33秒执行 + IJobDetail job3 = JobBuilder.Create() + .WithIdentity("job3", SchedulerConstants.DefaultGroup) + .Build(); + var trigger3 = TriggerBuilder.Create() + .WithIdentity("trigger3") // 给任务一个名字 + .StartAt(DateTime.Now) // 设置任务开始时间 + .ForJob("job3", SchedulerConstants.DefaultGroup) //给任务指定一个分组 + .WithCronSchedule("*/20 * * * * ?") + .UsingJobData("k", 321) + .Build(); + await scheduler.ScheduleJob(job3, trigger3, cancellationToken); + await scheduler.Start(cancellationToken); + #endregion + #region 每33秒执行 + IJobDetail job = JobBuilder.Create() + .WithIdentity("job", SchedulerConstants.DefaultGroup) + .Build(); + var trigger = TriggerBuilder.Create() + .WithIdentity("trigger") // 给任务一个名字 + .StartAt(DateTime.Now) // 设置任务开始时间 + .ForJob("job", SchedulerConstants.DefaultGroup) //给任务指定一个分组 + .WithCronSchedule("*/20 * * * * ?") + .UsingJobData("k", 321) + .Build(); + await scheduler.ScheduleJob(job, trigger, cancellationToken); + await scheduler.Start(cancellationToken); + } + catch (Exception ex) + { + LogService.WriteLog(ex.Message+"___"+ex.InnerException, "同步程序错误"); + } #endregion } - public async Task StopAsync(CancellationToken cancellationToken) { IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken);