linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

下载文件、修改账号密码

master
林杨 2 years ago
parent
2239fe8435
commit
94a41088cc
5 changed files with 132 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      24Hour/Controllers/LoginController.cs
  2. 67
      24Hour/Controllers/system/SystemControllerController.cs
  3. 2
      24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
  4. 30
      Elight.Entity/SystemModel/UpdatePassModel.cs
  5. 67
      Elight.Logic/Job/QuartzHostedService.cs

22
24Hour/Controllers/LoginController.cs
Unescape View File

@ -523,28 +523,6 @@ namespace _24Hour.Controllers
} }
return ret; return ret;
} }
/// <summary>
/// download file for video repot module
/// </summary>
/// <returns></returns>
[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),
};
}
} }

67
24Hour/Controllers/system/SystemControllerController.cs
Unescape View File

@ -1,9 +1,11 @@
using com.sun.xml.@internal.ws.api.model; using com.sun.xml.@internal.ws.api.model;
using Elight.Entity; using Elight.Entity;
using Elight.Entity.SystemModel;
using Elight.Logic; using Elight.Logic;
using Elight.Logic.SystemModel; using Elight.Logic.SystemModel;
using Elight.Utility; using Elight.Utility;
using Elight.Utility.Code; using Elight.Utility.Code;
using Elight.Utility.Encrypt;
using Elight.Utility.Extensions; using Elight.Utility.Extensions;
using Elight.Utility.logs; using Elight.Utility.logs;
using javax.xml.crypto; using javax.xml.crypto;
@ -160,7 +162,7 @@ namespace _24Hour.Controllers.system
UserModel.createusername = _userdata.name; UserModel.createusername = _userdata.name;
UserModel.usertype = 0; 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(); var num = await _db.Insertable(UserModel).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
@ -177,6 +179,53 @@ namespace _24Hour.Controllers.system
} }
_logs.WriteSysLogadd("用户管理", "添加系统用户信息", result, _db); _logs.WriteSysLogadd("用户管理", "添加系统用户信息", result, _db);
return result; return result;
}
/// <summary>
/// 修改密码
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
[HttpPost]
[Route("UpdatePass")]
public async Task<Result> UpdateUser(UpdatePassModel UserModel)
{
try
{
var model = await _db.Queryable<App_Sys_UserModel>().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;
} }
/// <summary> /// <summary>
@ -190,8 +239,20 @@ namespace _24Hour.Controllers.system
{ {
try try
{ {
_db.BeginTran(); var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id== UserModel.Id).FirstAsync();
var num = await _db.Updateable(UserModel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); 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(); _db.CommitTran();
if (num > 0) if (num > 0)
{ {

2
24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl> <_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl>
<History>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;</History> <History>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;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

30
Elight.Entity/SystemModel/UpdatePassModel.cs
Unescape View File

@ -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
{
/// <summary>
///
/// </summary>
[DataMember]
public string Id { get; set; }
/// <summary>
/// 旧密码
/// </summary>
[DataMember]
public string OldPassword { get; set; }
/// <summary>
/// 新密码
/// </summary>
[DataMember]
public string Password { get; set; }
}
}

67
Elight.Logic/Job/QuartzHostedService.cs
Unescape View File

@ -1,4 +1,5 @@
using Elight.Utility; using Elight.Utility;
using Elight.Utility.logs;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Quartz; using Quartz;
@ -28,38 +29,44 @@ namespace Elight.Logic.Job
public async Task StartAsync(CancellationToken cancellationToken) public async Task StartAsync(CancellationToken cancellationToken)
{ {
IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken); try
scheduler.JobFactory = _jobFactory; {
#region 每33秒执行 IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken);
IJobDetail job3 = JobBuilder.Create<WsJob>() scheduler.JobFactory = _jobFactory;
.WithIdentity("job3", SchedulerConstants.DefaultGroup) #region 每33秒执行
.Build(); IJobDetail job3 = JobBuilder.Create<WsJob>()
var trigger3 = TriggerBuilder.Create() .WithIdentity("job3", SchedulerConstants.DefaultGroup)
.WithIdentity("trigger3") // 给任务一个名字 .Build();
.StartAt(DateTime.Now) // 设置任务开始时间 var trigger3 = TriggerBuilder.Create()
.ForJob("job3", SchedulerConstants.DefaultGroup) //给任务指定一个分组 .WithIdentity("trigger3") // 给任务一个名字
.WithCronSchedule("*/20 * * * * ?") .StartAt(DateTime.Now) // 设置任务开始时间
.UsingJobData("k", 321) .ForJob("job3", SchedulerConstants.DefaultGroup) //给任务指定一个分组
.Build(); .WithCronSchedule("*/20 * * * * ?")
await scheduler.ScheduleJob(job3, trigger3, cancellationToken); .UsingJobData("k", 321)
await scheduler.Start(cancellationToken); .Build();
#endregion await scheduler.ScheduleJob(job3, trigger3, cancellationToken);
#region 每33秒执行 await scheduler.Start(cancellationToken);
IJobDetail job = JobBuilder.Create<YgJob>() #endregion
.WithIdentity("job", SchedulerConstants.DefaultGroup) #region 每33秒执行
.Build(); IJobDetail job = JobBuilder.Create<YgJob>()
var trigger = TriggerBuilder.Create() .WithIdentity("job", SchedulerConstants.DefaultGroup)
.WithIdentity("trigger") // 给任务一个名字 .Build();
.StartAt(DateTime.Now) // 设置任务开始时间 var trigger = TriggerBuilder.Create()
.ForJob("job", SchedulerConstants.DefaultGroup) //给任务指定一个分组 .WithIdentity("trigger") // 给任务一个名字
.WithCronSchedule("*/20 * * * * ?") .StartAt(DateTime.Now) // 设置任务开始时间
.UsingJobData("k", 321) .ForJob("job", SchedulerConstants.DefaultGroup) //给任务指定一个分组
.Build(); .WithCronSchedule("*/20 * * * * ?")
await scheduler.ScheduleJob(job, trigger, cancellationToken); .UsingJobData("k", 321)
await scheduler.Start(cancellationToken); .Build();
await scheduler.ScheduleJob(job, trigger, cancellationToken);
await scheduler.Start(cancellationToken);
}
catch (Exception ex)
{
LogService.WriteLog(ex.Message+"___"+ex.InnerException, "同步程序错误");
}
#endregion #endregion
} }
public async Task StopAsync(CancellationToken cancellationToken) public async Task StopAsync(CancellationToken cancellationToken)
{ {
IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken); IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken);

Write Preview
Loading…
Cancel
Save