From a2589676cb899d57a3831d6b025120c93883e83e Mon Sep 17 00:00:00 2001 From: Ky_Gyt <1971574843@qq.com> Date: Fri, 30 Apr 2021 11:34:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E7=BB=9F=E8=AE=A1=E5=9B=BE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/src/pages/home/charts.vue | 3 + Web/src/pages/system/machine/index.vue | 209 ++++++++++++++++++++++--- 2 files changed, 186 insertions(+), 26 deletions(-) diff --git a/Web/src/pages/home/charts.vue b/Web/src/pages/home/charts.vue index 768ed3f..b0b0e78 100644 --- a/Web/src/pages/home/charts.vue +++ b/Web/src/pages/home/charts.vue @@ -99,6 +99,9 @@ export default { var chartDom = this.$refs.chart; var myChart = echarts.init(chartDom); myChart.setOption(this.options); + window.addEventListener("resize",function(){ + myChart.resize(); + }) }, }; \ No newline at end of file diff --git a/Web/src/pages/system/machine/index.vue b/Web/src/pages/system/machine/index.vue index ec9033a..3654990 100644 --- a/Web/src/pages/system/machine/index.vue +++ b/Web/src/pages/system/machine/index.vue @@ -4,63 +4,188 @@ - + - + - + + + + + + + + + + + \ No newline at end of file + + \ No newline at end of file From df2e5c51fcbbfbc2fa8926979a79a45ebf475b6a Mon Sep 17 00:00:00 2001 From: Ky_Gyt <1971574843@qq.com> Date: Fri, 30 Apr 2021 11:35:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E6=89=80?= =?UTF-8?q?=E6=9C=89datetimeoffset=E7=B1=BB=E5=9E=8B=E4=B8=BAdatetime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/HouseProjectInfoInput.cs | 6 ++-- .../Dto/HouseProjectOutput.cs | 4 +-- Api/Ewide.Core/Entity/DEntityBase.cs | 4 +-- Api/Ewide.Core/Entity/SysLogAudit.cs | 2 +- Api/Ewide.Core/Entity/SysLogOp.cs | 2 +- Api/Ewide.Core/Entity/SysLogVis.cs | 2 +- Api/Ewide.Core/Entity/SysNotice.cs | 4 +-- Api/Ewide.Core/Entity/SysNoticeUser.cs | 2 +- Api/Ewide.Core/Entity/SysTimer.cs | 4 +-- Api/Ewide.Core/Entity/SysUser.cs | 4 +-- Api/Ewide.Core/Filter/RequestActionFilter.cs | 2 +- Api/Ewide.Core/SeedData/SysTimerSeedData.cs | 2 +- Api/Ewide.Core/SeedData/SysUserSeedData.cs | 6 ++-- Api/Ewide.Core/Service/Auth/AuthService.cs | 30 +++++++++++++++++-- .../Service/Auth/Dto/LoginOutput.cs | 4 +-- Api/Ewide.Core/Service/Log/Dto/OpLogInput.cs | 2 +- Api/Ewide.Core/Service/Log/Dto/VisLogInput.cs | 2 +- .../Service/Notice/Dto/NoticeBase.cs | 4 +-- .../Service/Notice/Dto/NoticeDetailOutput.cs | 2 +- .../Service/Notice/Dto/NoticeReceiveOutput.cs | 2 +- .../Service/Notice/SysNoticeService.cs | 8 ++--- .../Service/Notice/SysNoticeUserService.cs | 2 +- Api/Ewide.Core/Service/Timer/Dto/JobInput.cs | 4 +-- Api/Ewide.Core/Service/User/Dto/UserOutput.cs | 2 +- Api/Ewide.Core/Service/User/SysUserService.cs | 1 + Api/Ewide.Core/Util/MachineUtil.cs | 2 +- .../DbContexts/DefaultDbContext.cs | 4 +-- .../DbContexts/MultiTenantDbContext.cs | 4 +-- Web/src/pages/system/user/form.vue | 2 +- 29 files changed, 72 insertions(+), 47 deletions(-) diff --git a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs index d89a0df..1d4365a 100644 --- a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs +++ b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectInfoInput.cs @@ -16,8 +16,8 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto public string AreaID { get; set; } public string AreaName { get; set; } public int Type { get; set; } - public DateTimeOffset? CreatedTime { get; set; } - public DateTimeOffset? UpdatedTime { get; set; } + public DateTime? CreatedTime { get; set; } + public DateTime? UpdatedTime { get; set; } public string CreatedUserId { get; set; } public string CreatedUserName { get; set; } public string UpdatedUserId { get; set; } @@ -34,7 +34,7 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto public string Note { get; set; } public int Type { get; set; } - public DateTimeOffset? UpdatedTime { get; set; } + public DateTime? UpdatedTime { get; set; } public string UpdatedUserId { get; set; } public string UpdatedUserName { get; set; } } diff --git a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs index f8289ca..dfe6d45 100644 --- a/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs +++ b/Api/Ewide.Application/Service/HouseProjectInfo/Dto/HouseProjectOutput.cs @@ -15,8 +15,8 @@ namespace Ewide.Application.Service.HouseProjectInfo.Dto public string AreaID { get; set; } public string AreaName { get; set; } public int Type { get; set; } - public DateTimeOffset? CreatedTime { get; set; } - public DateTimeOffset? UpdatedTime { get; set; } + public DateTime CreatedTime { get; set; } + public DateTime UpdatedTime { get; set; } public string CreatedUserId { get; set; } public string CreatedUserName { get; set; } public string UpdatedUserId { get; set; } diff --git a/Api/Ewide.Core/Entity/DEntityBase.cs b/Api/Ewide.Core/Entity/DEntityBase.cs index df3ee0d..ba8d4c9 100644 --- a/Api/Ewide.Core/Entity/DEntityBase.cs +++ b/Api/Ewide.Core/Entity/DEntityBase.cs @@ -25,13 +25,13 @@ namespace Ewide.Core /// 创建时间 /// [Comment("创建时间")] - public virtual DateTimeOffset? CreatedTime { get; set; } + public virtual DateTime? CreatedTime { get; set; } /// /// 更新时间 /// [Comment("更新时间")] - public virtual DateTimeOffset? UpdatedTime { get; set; } + public virtual DateTime? UpdatedTime { get; set; } /// /// 创建者Id diff --git a/Api/Ewide.Core/Entity/SysLogAudit.cs b/Api/Ewide.Core/Entity/SysLogAudit.cs index ab1a24e..c0836b4 100644 --- a/Api/Ewide.Core/Entity/SysLogAudit.cs +++ b/Api/Ewide.Core/Entity/SysLogAudit.cs @@ -40,7 +40,7 @@ namespace Ewide.Core /// 操作时间 /// [Comment("操作时间")] - public DateTimeOffset CreatedTime { get; set; } + public DateTime CreatedTime { get; set; } /// /// 操作人Id diff --git a/Api/Ewide.Core/Entity/SysLogOp.cs b/Api/Ewide.Core/Entity/SysLogOp.cs index 31f4755..5c243aa 100644 --- a/Api/Ewide.Core/Entity/SysLogOp.cs +++ b/Api/Ewide.Core/Entity/SysLogOp.cs @@ -106,7 +106,7 @@ namespace Ewide.Core /// 操作时间 /// [Comment("操作时间")] - public DateTimeOffset OpTime { get; set; } + public DateTime OpTime { get; set; } /// /// 操作人 diff --git a/Api/Ewide.Core/Entity/SysLogVis.cs b/Api/Ewide.Core/Entity/SysLogVis.cs index a0a3e7a..0e49ff0 100644 --- a/Api/Ewide.Core/Entity/SysLogVis.cs +++ b/Api/Ewide.Core/Entity/SysLogVis.cs @@ -64,7 +64,7 @@ namespace Ewide.Core /// 访问时间 /// [Comment("访问时间")] - public DateTimeOffset VisTime { get; set; } + public DateTime VisTime { get; set; } /// /// 访问人 diff --git a/Api/Ewide.Core/Entity/SysNotice.cs b/Api/Ewide.Core/Entity/SysNotice.cs index 38ed62e..75e3d58 100644 --- a/Api/Ewide.Core/Entity/SysNotice.cs +++ b/Api/Ewide.Core/Entity/SysNotice.cs @@ -59,13 +59,13 @@ namespace Ewide.Core /// 发布时间 /// [Comment("发布时间")] - public DateTimeOffset PublicTime { get; set; } + public DateTime PublicTime { get; set; } /// /// 撤回时间 /// [Comment("撤回时间")] - public DateTimeOffset CancelTime { get; set; } + public DateTime CancelTime { get; set; } /// /// 状态（字典 0草稿 1发布 2撤回 3删除） diff --git a/Api/Ewide.Core/Entity/SysNoticeUser.cs b/Api/Ewide.Core/Entity/SysNoticeUser.cs index 0552761..84b6b4e 100644 --- a/Api/Ewide.Core/Entity/SysNoticeUser.cs +++ b/Api/Ewide.Core/Entity/SysNoticeUser.cs @@ -31,7 +31,7 @@ namespace Ewide.Core /// 阅读时间 /// [Comment("阅读时间")] - public DateTimeOffset ReadTime { get; set; } + public DateTime ReadTime { get; set; } /// /// 状态（字典 0未读 1已读） diff --git a/Api/Ewide.Core/Entity/SysTimer.cs b/Api/Ewide.Core/Entity/SysTimer.cs index 30747b2..471986d 100644 --- a/Api/Ewide.Core/Entity/SysTimer.cs +++ b/Api/Ewide.Core/Entity/SysTimer.cs @@ -30,14 +30,14 @@ namespace Ewide.Core /// 开始时间 /// [Comment("开始时间")] - public DateTimeOffset BeginTime { get; set; } = DateTimeOffset.Now; + public DateTime BeginTime { get; set; } = DateTime.Now; /// /// 结束时间 /// /// null [Comment("结束时间")] - public DateTimeOffset? EndTime { get; set; } + public DateTime? EndTime { get; set; } /// /// Cron表达式 diff --git a/Api/Ewide.Core/Entity/SysUser.cs b/Api/Ewide.Core/Entity/SysUser.cs index 384651d..f588576 100644 --- a/Api/Ewide.Core/Entity/SysUser.cs +++ b/Api/Ewide.Core/Entity/SysUser.cs @@ -53,7 +53,7 @@ namespace Ewide.Core /// 生日 /// [Comment("生日")] - public DateTimeOffset Birthday { get; set; } + public DateTime? Birthday { get; set; } /// /// 性别-男_1、女_2 @@ -93,7 +93,7 @@ namespace Ewide.Core /// 最后登录时间 /// [Comment("最后登录时间")] - public DateTimeOffset LastLoginTime { get; set; } + public DateTime LastLoginTime { get; set; } /// /// 管理员类型-超级管理员_1、非管理员_2 diff --git a/Api/Ewide.Core/Filter/RequestActionFilter.cs b/Api/Ewide.Core/Filter/RequestActionFilter.cs index 7cd1b14..fa6ce44 100644 --- a/Api/Ewide.Core/Filter/RequestActionFilter.cs +++ b/Api/Ewide.Core/Filter/RequestActionFilter.cs @@ -51,7 +51,7 @@ namespace Ewide.Core //Param = JsonSerializerUtility.Serialize(context.ActionArguments), //Result = JsonSerializerUtility.Serialize(actionContext.Result), ElapsedTime = sw.ElapsedMilliseconds, - OpTime = DateTimeOffset.Now, + OpTime = DateTime.Now, Account = httpContext.User?.FindFirstValue(ClaimConst.CLAINM_ACCOUNT) }; await sysOpLog.InsertAsync(); diff --git a/Api/Ewide.Core/SeedData/SysTimerSeedData.cs b/Api/Ewide.Core/SeedData/SysTimerSeedData.cs index 0e4c666..69d496e 100644 --- a/Api/Ewide.Core/SeedData/SysTimerSeedData.cs +++ b/Api/Ewide.Core/SeedData/SysTimerSeedData.cs @@ -21,7 +21,7 @@ namespace Ewide.Core { return new[] { - new SysTimer{Id="971bc338-0c03-46d4-8113-c7738d54ea18", JobName="百度api", JobGroup="默认分组", BeginTime=DateTimeOffset.Parse("2021-03-21 00:00:00+08:00"), Interval=30, TriggerType=TriggerTypeEnum.Simple, RequestUrl="https://www.baidu.com", RequestType=RequestTypeEnum.Post, IsDeleted=false }, // 142307070910556 + new SysTimer{Id="971bc338-0c03-46d4-8113-c7738d54ea18", JobName="百度api", JobGroup="默认分组", BeginTime=DateTime.Parse("2021-03-21 00:00:00+08:00"), Interval=30, TriggerType=TriggerTypeEnum.Simple, RequestUrl="https://www.baidu.com", RequestType=RequestTypeEnum.Post, IsDeleted=false }, // 142307070910556 }; } } diff --git a/Api/Ewide.Core/SeedData/SysUserSeedData.cs b/Api/Ewide.Core/SeedData/SysUserSeedData.cs index b2121cb..214393b 100644 --- a/Api/Ewide.Core/SeedData/SysUserSeedData.cs +++ b/Api/Ewide.Core/SeedData/SysUserSeedData.cs @@ -20,9 +20,9 @@ namespace Ewide.Core { return new[] { - new SysUser{Id="d0ead3dc-5096-4e15-bc6d-f640be5301ec", Account="superAdmin", Name="superAdmin", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.SuperAdmin, Birthday=DateTimeOffset.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=1, IsDeleted=false }, // 142307070910551 - new SysUser{Id="5398fb9a-2209-4ce7-a2c1-b6a983e502b5", Account="admin", Name="admin", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.SuperAdmin, Birthday=DateTimeOffset.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=2, IsDeleted=false }, // 142307070910552 - new SysUser{Id="16a74726-e156-499f-9942-0e0e24ad0c3f", Account="zuohuaijun", Name="zuohuaijun", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.None, Birthday=DateTimeOffset.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=1, IsDeleted=false } // 142307070910553 + new SysUser{Id="d0ead3dc-5096-4e15-bc6d-f640be5301ec", Account="superAdmin", Name="superAdmin", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.SuperAdmin, Birthday=DateTime.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=1, IsDeleted=false }, // 142307070910551 + new SysUser{Id="5398fb9a-2209-4ce7-a2c1-b6a983e502b5", Account="admin", Name="admin", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.SuperAdmin, Birthday=DateTime.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=2, IsDeleted=false }, // 142307070910552 + new SysUser{Id="16a74726-e156-499f-9942-0e0e24ad0c3f", Account="zuohuaijun", Name="zuohuaijun", Password="e10adc3949ba59abbe56e057f20f883e", AdminType=AdminType.None, Birthday=DateTime.Parse("1986-07-26 00:00:00"), Phone="18020030720", Sex=1, IsDeleted=false } // 142307070910553 }; } } diff --git a/Api/Ewide.Core/Service/Auth/AuthService.cs b/Api/Ewide.Core/Service/Auth/AuthService.cs index 15f2fef..beb77f9 100644 --- a/Api/Ewide.Core/Service/Auth/AuthService.cs +++ b/Api/Ewide.Core/Service/Auth/AuthService.cs @@ -115,10 +115,14 @@ namespace Ewide.Core.Service var httpContext = App.GetService().HttpContext; var loginOutput = user.Adapt(); - loginOutput.LastLoginTime = user.LastLoginTime = DateTimeOffset.Now; + loginOutput.LastLoginTime = user.LastLoginTime = DateTime.Now; var ip = httpContext.Request.Headers["X-Real-IP"].FirstOrDefault(); loginOutput.LastLoginIp = user.LastLoginIp = string.IsNullOrEmpty(user.LastLoginIp) ? httpContext.GetRemoteIpAddressToIPv4() : ip; - + ///如果真实ip为空的话，就获取客户端主机IPv4地址 + if (string.IsNullOrEmpty(ip)) + { + loginOutput.LastLoginIp = httpContext.GetRemoteIpAddressToIPv4(); + } //var ipInfo = IpTool.Search(loginOutput.LastLoginIp); //loginOutput.LastLoginAddress = ipInfo.Country + ipInfo.Province + ipInfo.City + "[" + ipInfo.NetworkOperator + "][" + ipInfo.Latitude + ipInfo.Longitude + "]"; @@ -174,14 +178,34 @@ namespace Ewide.Core.Service { _httpContextAccessor.SignoutToSwagger(); //_httpContextAccessor.HttpContext.Response.Headers["access-token"] = "invalid token"; + var user = _userManager.User; + var userId = user.Id; + var httpContext = App.GetService().HttpContext; + var loginOutput = user.Adapt(); + + + var ip = httpContext.Request.Headers["X-Real-IP"]; + var LastLoginIp = user.LastLoginIp = string.IsNullOrEmpty(user.LastLoginIp) ? httpContext.GetRemoteIpAddressToIPv4() : ip; + var clent = Parser.GetDefault().Parse(httpContext.Request.Headers["User-Agent"]); + loginOutput.LastLoginBrowser = clent.UA.Family + clent.UA.Major; + ///如果真实ip为空的话，就获取客户端主机IPv4地址 + if (string.IsNullOrEmpty(ip)) + { + LastLoginIp = httpContext.GetRemoteIpAddressToIPv4(); + } // 增加退出日志 await new SysLogVis { Name = "退出", + VisTime = DateTime.Now, Success = true, Message = "退出成功", - VisType = 2 + VisType = 2, + Browser = loginOutput.LastLoginBrowser, + Os = loginOutput.LastLoginOs, + Ip = LastLoginIp, + Account = loginOutput.Account }.InsertAsync(); await Task.CompletedTask; diff --git a/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs b/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs index 24f88c8..4dfea66 100644 --- a/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs +++ b/Api/Ewide.Core/Service/Auth/Dto/LoginOutput.cs @@ -38,7 +38,7 @@ namespace Ewide.Core.Service /// /// 生日 /// - public DateTimeOffset Birthday { get; set; } + public DateTime? Birthday { get; set; } /// /// 性别(字典 1男 2女) @@ -73,7 +73,7 @@ namespace Ewide.Core.Service /// /// 最后登陆时间 /// - public DateTimeOffset LastLoginTime { get; set; } + public DateTime LastLoginTime { get; set; } /// /// 最后登陆地址 diff --git a/Api/Ewide.Core/Service/Log/Dto/OpLogInput.cs b/Api/Ewide.Core/Service/Log/Dto/OpLogInput.cs index 843c7cf..207f55d 100644 --- a/Api/Ewide.Core/Service/Log/Dto/OpLogInput.cs +++ b/Api/Ewide.Core/Service/Log/Dto/OpLogInput.cs @@ -85,7 +85,7 @@ namespace Ewide.Core.Service /// /// 操作时间 /// - public DateTimeOffset OpTime { get; set; } + public DateTime OpTime { get; set; } /// /// 操作人 diff --git a/Api/Ewide.Core/Service/Log/Dto/VisLogInput.cs b/Api/Ewide.Core/Service/Log/Dto/VisLogInput.cs index 3973995..21423ae 100644 --- a/Api/Ewide.Core/Service/Log/Dto/VisLogInput.cs +++ b/Api/Ewide.Core/Service/Log/Dto/VisLogInput.cs @@ -50,7 +50,7 @@ namespace Ewide.Core.Service /// /// 访问时间 /// - public DateTimeOffset VisTime { get; set; } + public DateTime VisTime { get; set; } /// /// 访问人 diff --git a/Api/Ewide.Core/Service/Notice/Dto/NoticeBase.cs b/Api/Ewide.Core/Service/Notice/Dto/NoticeBase.cs index 3999b87..e63b789 100644 --- a/Api/Ewide.Core/Service/Notice/Dto/NoticeBase.cs +++ b/Api/Ewide.Core/Service/Notice/Dto/NoticeBase.cs @@ -45,12 +45,12 @@ namespace Ewide.Core.Service /// /// 发布时间 /// - public DateTimeOffset PublicTime { get; set; } + public DateTime PublicTime { get; set; } /// /// 撤回时间 /// - public DateTimeOffset CancelTime { get; set; } + public DateTime CancelTime { get; set; } /// /// 状态（字典 0草稿 1发布 2撤回 3删除） diff --git a/Api/Ewide.Core/Service/Notice/Dto/NoticeDetailOutput.cs b/Api/Ewide.Core/Service/Notice/Dto/NoticeDetailOutput.cs index ff3c2fe..1bee47c 100644 --- a/Api/Ewide.Core/Service/Notice/Dto/NoticeDetailOutput.cs +++ b/Api/Ewide.Core/Service/Notice/Dto/NoticeDetailOutput.cs @@ -39,6 +39,6 @@ namespace Ewide.Core.Service /// /// 阅读时间 /// - public DateTimeOffset ReadTime { get; set; } + public DateTime ReadTime { get; set; } } } diff --git a/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs b/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs index fff0fb1..02e6810 100644 --- a/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs +++ b/Api/Ewide.Core/Service/Notice/Dto/NoticeReceiveOutput.cs @@ -20,6 +20,6 @@ namespace Ewide.Core.Service /// /// 阅读时间 /// - public DateTimeOffset ReadTime { get; set; } + public DateTime ReadTime { get; set; } } } diff --git a/Api/Ewide.Core/Service/Notice/SysNoticeService.cs b/Api/Ewide.Core/Service/Notice/SysNoticeService.cs index c9e969c..e931b0e 100644 --- a/Api/Ewide.Core/Service/Notice/SysNoticeService.cs +++ b/Api/Ewide.Core/Service/Notice/SysNoticeService.cs @@ -70,7 +70,7 @@ namespace Ewide.Core.Service.Notice await UpdatePublicInfo(notice); // 如果是发布，则设置发布时间 if (input.Status == (int)NoticeStatus.PUBLIC) - notice.PublicTime = DateTimeOffset.Now; + notice.PublicTime = DateTime.Now; var newItem = await notice.InsertNowAsync(); // 通知到的人 @@ -113,7 +113,7 @@ namespace Ewide.Core.Service.Notice var notice = input.Adapt(); if (input.Status == (int)NoticeStatus.PUBLIC) { - notice.PublicTime = DateTimeOffset.Now; + notice.PublicTime = DateTime.Now; await UpdatePublicInfo(notice); } await notice.UpdateAsync(); @@ -179,11 +179,11 @@ namespace Ewide.Core.Service.Notice if (input.Status == (int)NoticeStatus.CANCEL) { - notice.CancelTime = DateTimeOffset.Now; + notice.CancelTime = DateTime.Now; } else if (input.Status == (int)NoticeStatus.PUBLIC) { - notice.PublicTime = DateTimeOffset.Now; + notice.PublicTime = DateTime.Now; } await notice.UpdateAsync(); } diff --git a/Api/Ewide.Core/Service/Notice/SysNoticeUserService.cs b/Api/Ewide.Core/Service/Notice/SysNoticeUserService.cs index 3409a6e..5e86d47 100644 --- a/Api/Ewide.Core/Service/Notice/SysNoticeUserService.cs +++ b/Api/Ewide.Core/Service/Notice/SysNoticeUserService.cs @@ -82,7 +82,7 @@ namespace Ewide.Core.Service.Notice if (noticeUser != null) { noticeUser.ReadStatus = status; - noticeUser.ReadTime = DateTimeOffset.Now; + noticeUser.ReadTime = DateTime.Now; await noticeUser.UpdateAsync(); } } diff --git a/Api/Ewide.Core/Service/Timer/Dto/JobInput.cs b/Api/Ewide.Core/Service/Timer/Dto/JobInput.cs index 5aa916a..2e82c3c 100644 --- a/Api/Ewide.Core/Service/Timer/Dto/JobInput.cs +++ b/Api/Ewide.Core/Service/Timer/Dto/JobInput.cs @@ -24,13 +24,13 @@ namespace Ewide.Core.Service /// /// 开始时间 /// - public DateTimeOffset BeginTime { get; set; } = DateTimeOffset.Now; + public DateTime BeginTime { get; set; } = DateTime.Now; /// /// 结束时间 /// /// null - public DateTimeOffset? EndTime { get; set; } + public DateTime? EndTime { get; set; } /// /// Cron表达式 diff --git a/Api/Ewide.Core/Service/User/Dto/UserOutput.cs b/Api/Ewide.Core/Service/User/Dto/UserOutput.cs index 087eef5..88bb1c9 100644 --- a/Api/Ewide.Core/Service/User/Dto/UserOutput.cs +++ b/Api/Ewide.Core/Service/User/Dto/UserOutput.cs @@ -35,7 +35,7 @@ namespace Ewide.Core.Service /// /// 生日 /// - public virtual DateTimeOffset Birthday { get; set; } + public virtual DateTime? Birthday { get; set; } /// /// 性别-男_1、女_2 diff --git a/Api/Ewide.Core/Service/User/SysUserService.cs b/Api/Ewide.Core/Service/User/SysUserService.cs index 2e31058..89af90c 100644 --- a/Api/Ewide.Core/Service/User/SysUserService.cs +++ b/Api/Ewide.Core/Service/User/SysUserService.cs @@ -158,6 +158,7 @@ namespace Ewide.Core.Service var user = input.Adapt(); await user.UpdateExcludeAsync(new[] { nameof(SysUser.Password), nameof(SysUser.Status), nameof(SysUser.AdminType) }, true); + user.UpdateIncludeNow(new[] { nameof(SysUser.Birthday) }); input.SysEmpParam.Id = user.Id.ToString(); // 更新员工及附属机构职位信息 await _sysEmpService.AddOrUpdate(input.SysEmpParam); diff --git a/Api/Ewide.Core/Util/MachineUtil.cs b/Api/Ewide.Core/Util/MachineUtil.cs index 23d03b7..fdb12a5 100644 --- a/Api/Ewide.Core/Util/MachineUtil.cs +++ b/Api/Ewide.Core/Util/MachineUtil.cs @@ -120,7 +120,7 @@ namespace Ewide.Core /// private static string GetRunTime() { - return FormatTime((long)(DateTimeOffset.Now - Process.GetCurrentProcess().StartTime).TotalMilliseconds); + return FormatTime((long)(DateTime.Now - Process.GetCurrentProcess().StartTime).TotalMilliseconds); //return DateTimeUtil.FormatTime(Environment.TickCount); } diff --git a/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs b/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs index c619d21..f877b59 100644 --- a/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs +++ b/Api/Ewide.EntityFramework.Core/DbContexts/DefaultDbContext.cs @@ -113,7 +113,7 @@ namespace Ewide.EntityFramework.Core if (entity.State == EntityState.Added) { obj.Id = Guid.NewGuid().ToString(); - obj.CreatedTime = DateTimeOffset.Now; + obj.CreatedTime = DateTime.Now; if (!string.IsNullOrEmpty(userId)) { obj.CreatedUserId = userId; @@ -122,7 +122,7 @@ namespace Ewide.EntityFramework.Core } else if (entity.State == EntityState.Modified) { - obj.UpdatedTime = DateTimeOffset.Now; + obj.UpdatedTime = DateTime.Now; obj.UpdatedUserId = userId; obj.UpdatedUserName = userName; } diff --git a/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs b/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs index 2cd4a46..33476ec 100644 --- a/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs +++ b/Api/Ewide.EntityFramework.Core/DbContexts/MultiTenantDbContext.cs @@ -47,7 +47,7 @@ namespace Ewide.EntityFramework.Core if (entity.State == EntityState.Added) { obj.Id = Guid.NewGuid().ToString(); - obj.CreatedTime = DateTimeOffset.Now; + obj.CreatedTime = DateTime.Now; if (!string.IsNullOrEmpty(userId)) { obj.CreatedUserId = userId; @@ -56,7 +56,7 @@ namespace Ewide.EntityFramework.Core } else if (entity.State == EntityState.Modified) { - obj.UpdatedTime = DateTimeOffset.Now; + obj.UpdatedTime = DateTime.Now; obj.UpdatedUserId = userId; obj.UpdatedUserName = userName; } diff --git a/Web/src/pages/system/user/form.vue b/Web/src/pages/system/user/form.vue index 63eb789..f6742fc 100644 --- a/Web/src/pages/system/user/form.vue +++ b/Web/src/pages/system/user/form.vue @@ -25,7 +25,7 @@