diff --git a/LMS.service/Service/MachineService.cs b/LMS.service/Service/MachineService.cs index c39e9c5..0923553 100644 --- a/LMS.service/Service/MachineService.cs +++ b/LMS.service/Service/MachineService.cs @@ -251,7 +251,7 @@ namespace LMS.service.Service var machine = await _context.Machine.FirstOrDefaultAsync(x => x.MachineId == machineId && ((x.DeactivationTime == null && x.UseStatus == MachineUseStatus.Permanent && x.Status == MachineStatus.Active) - || (x.DeactivationTime != null && x.UseStatus == MachineUseStatus.Trial && DateTime.Now < x.DeactivationTime && x.Status == MachineStatus.Active))); + || (x.DeactivationTime != null && x.UseStatus == MachineUseStatus.Trial && BeijingTimeExtension.GetBeijingTime() < x.DeactivationTime && x.Status == MachineStatus.Active))); if (machine == null) { diff --git a/LMS.service/Service/UserService/LoginService.cs b/LMS.service/Service/UserService/LoginService.cs index 75b34e4..87afe1b 100644 --- a/LMS.service/Service/UserService/LoginService.cs +++ b/LMS.service/Service/UserService/LoginService.cs @@ -67,7 +67,7 @@ namespace LMS.service.Service.UserService //设置Token的过期时间 - DateTime expires = DateTime.Now.AddHours(1); + DateTime expires = DateTime.Now.AddHours(6); byte[] secBytes = Encoding.UTF8.GetBytes(key); var secKey = new SymmetricSecurityKey(secBytes);