V1.0.2 新增软件管理权限，新增，删除，管理等，还有软件控制权限等

LMS.Common/Attributes/NotEmptyAttribute.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace LMS.Common.Attributes
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public class NotEmptyAttribute : ValidationAttribute
+    {
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            if (value is string str && string.IsNullOrWhiteSpace(str))
+            {
+                return new ValidationResult(ErrorMessage ?? "字段不能为空");
+            }
+            return ValidationResult.Success;
+        }
+    }
+}

LMS.Common/Enum/ResponseCodeEnum.cs

@@ -77,6 +77,11 @@ namespace LMS.Common.Enums
             [Description("无效的邀请码")]
             InvalidAffiliateCode = 1014,
 
+            // 无效token
+            [Result("无效token")]
+            [Description("无效token")]
+            InvalidToken = 1015,
+
             #endregion
 
             #region Machine 操作失败
@@ -141,6 +146,10 @@ namespace LMS.Common.Enums
             [Result(ResponseString.InvalidOptions)]
             [Description(ResponseString.InvalidOptions)]
             InvalidOptions = 5002,
+
+            [Result(ResponseString.IdDateNotFound)]
+            [Description(ResponseString.IdDateNotFound)]
+            IdDateNotFound = 5003,
             #endregion
 
             #region 提示词操作失败

LMS.Common/Enum/SoftwareControlEnum.cs

@@ -0,0 +1,31 @@
+namespace LMS.Common.Enum
+{
+    public class SoftwareControlEnum
+    {
+        public enum SoftwareControlValidityEnum
+        {
+            /// <summary>
+            /// 0
+            /// </summary>
+            Zero = 0,
+            /// <summary>
+            /// 一个月
+            /// </summary>
+            Thirty = 30,
+            /// <summary>
+            /// 三个月
+            /// </summary>
+            Ninety = 90,
+
+            /// <summary>
+            /// 六个月
+            /// </summary>
+            OneHundredAndEighty = 180,
+            /// <summary>
+            /// 一年
+            /// </summary>
+            ThreeHundredAndSixtyFive = 365,
+
+        }
+    }
+}

LMS.DAO/ApplicationDbContext.cs

@@ -34,6 +34,12 @@ namespace LMS.DAO
 
         public DbSet<Options> Options { get; set; }
 
+        public DbSet<Software> Software { get; set; }
+
+        public DbSet<UserSoftware> UserSoftware { get; set; }
+
+        public DbSet<SoftwareControl> SoftwareControl { get; set; }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);
@@ -47,6 +53,8 @@ namespace LMS.DAO
                         ? new List<string>()  // 如果存储的是空字符串或空数组，则返回空列表
                         : JsonSerializer.Deserialize<List<string>>(v, (JsonSerializerOptions?)null) ?? new List<string>()
             );
+            modelBuilder.Entity<UserSoftware>()
+            .HasKey(us => new { us.UserId, us.SoftwareId });
         }
     }
 }

LMS.DAO/UserDAO/UserBasicDAO.cs

@@ -1,11 +1,5 @@
 using LMS.Repository.Models.DB;
 using Microsoft.AspNetCore.Identity;
-using OneOf.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace LMS.DAO.UserDAO
 {
@@ -43,6 +37,24 @@ namespace LMS.DAO.UserDAO
             bool isAdminOrSuperAdmin = await _userManager.IsInRoleAsync(user, "Admin") || await _userManager.IsInRoleAsync(user, "Super Admin");
             return isAdminOrSuperAdmin;
         }
+
+        /// <summary>
+        /// 检查用户是不是超级管理员
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public async Task<bool> CheckUserIsSuperAdmin(long? userId)
+        {
+            if (userId == null)
+            {
+                return false;
+            }
+            User? user = await _userManager.FindByIdAsync(userId.ToString() ?? "0") ?? throw new Exception("用户不存在");
+
+            bool isSuperAdmin = await _userManager.IsInRoleAsync(user, "Super Admin");
+            return isSuperAdmin;
+        }
     }
 
 }

LMS.Repository/DB/Software.cs

@@ -0,0 +1,41 @@
+namespace LMS.Repository.DB;
+
+public class Software
+{
+    /// <summary>
+    /// ID
+    /// </summary>
+    public string Id { get; set; }
+    /// <summary>
+    /// 软件名称
+    /// </summary>
+    public string SoftwareName { get; set; }
+    /// <summary>
+    /// 软件代码
+    /// </summary>
+    public string SoftwareCode { get; set; }
+    /// <summary>
+    /// 创建用户ID
+    /// </summary>
+    public long CreatedUserId { get; set; }
+    /// <summary>
+    /// 更新用户ID
+    /// </summary>
+    public long UpdatedUserId { get; set; }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreatedTime { get; set; }
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    public DateTime UpdatedTime { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool IsUse { get; set; }
+}

LMS.Repository/DB/SoftwareControl.cs

@@ -0,0 +1,45 @@
+namespace LMS.Repository.DB;
+
+public class SoftwareControl
+{
+    /// <summary>
+    /// ID
+    /// </summary>
+    public string Id { get; set; }
+    /// <summary>
+    /// 用户ID
+    /// </summary>
+    public long UserId { get; set; }
+    /// <summary>
+    /// 软件ID
+    /// </summary>
+    public string SoftwareId { get; set; }
+    /// <summary>
+    /// 创建用户ID
+    /// </summary>
+    public long CreatedUserId { get; set; }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreatedTime { get; set; }
+    /// <summary>
+    /// 更新用户ID
+    /// </summary>
+    public long UpdatedUserId { get; set; }
+    /// <summary>
+    /// 更新时间
+    /// </summary>
+    public DateTime UpdatedTime { get; set; }
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+    /// <summary>
+    /// 到期时间
+    /// </summary>
+    public DateTime? ExpirationTime { get; set; }
+    /// <summary>
+    /// 是否永久
+    /// </summary>
+    public bool IsForever { get; set; }
+}

LMS.Repository/DB/UserSoftware.cs

@@ -0,0 +1,22 @@
+namespace LMS.Repository.DB;
+
+public class UserSoftware
+{
+    /// <summary>
+    /// 用户ID
+    /// </summary>
+    public long UserId { get; set; }
+    /// <summary>
+    /// 软件ID
+    /// </summary>
+    public string SoftwareId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string MachineId { get; set; }
+
+    /// <summary>
+    /// 软件控制ID
+    /// </summary>
+    public string SoftwareControlId { get; set; }
+}

LMS.Repository/DTO/Software/SoftwareBasicDto.cs

@@ -0,0 +1,13 @@
+namespace LMS.Repository.DTO.Software
+{
+    public class SoftwareBasicDto
+    {
+        public string Id { get; set; } = string.Empty;
+
+        public string SoftwareName { get; set; } = string.Empty;
+
+        public string SoftwareCode { get; set; } = string.Empty;
+
+        public bool IsUse { get; set; }
+    }
+}

LMS.Repository/DTO/Software/SoftwareCollectionDto.cs

@@ -0,0 +1,44 @@
+using LMS.Repository.DTO.UserDto;
+
+namespace LMS.Repository.DTO.Software
+{
+    public class SoftwareCollectionDto
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public string Id { get; set; }
+        /// <summary>
+        /// 软件名称
+        /// </summary>
+        public string SoftwareName { get; set; }
+        /// <summary>
+        /// 软件代码
+        /// </summary>
+        public string SoftwareCode { get; set; }
+        /// <summary>
+        /// 创建用户ID
+        /// </summary>
+        public UserBaseDto CreatedUser { get; set; }
+        /// <summary>
+        /// 更新用户ID
+        /// </summary>
+        public UserBaseDto UpdatedUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreatedTime { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdatedTime { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsUse { get; set; }
+    }
+}

LMS.Repository/DTO/Software/SoftwareControlCollectionDto.cs

@@ -0,0 +1,47 @@
+using LMS.Repository.DTO.UserDto;
+namespace LMS.Repository.DTO.Software
+{
+    public class SoftwareControlCollectionDto
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public string Id { get; set; }
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public UserBaseDto User { get; set; }
+        /// <summary>
+        /// 软件ID
+        /// </summary>
+        public DB.Software Software { get; set; }
+        /// <summary>
+        /// 创建用户ID
+        /// </summary>
+        public UserBaseDto CreatedUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreatedTime { get; set; }
+        /// <summary>
+        /// 更新用户ID
+        /// </summary>
+        public UserBaseDto UpdatedUser { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdatedTime { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        /// <summary>
+        /// 到期时间
+        /// </summary>
+        public DateTime? ExpirationTime { get; set; }
+        /// <summary>
+        /// 是否永久
+        /// </summary>
+        public bool IsForever { get; set; }
+    }
+}

LMS.Repository/DTO/UserDto/UserBaseDto.cs

@@ -15,4 +15,11 @@ public class UserBaseDto
     public string PhoneNumber { get; set; } = string.Empty;
 
     public string Avatar { get; set; } = string.Empty;
+
+    // 添加隐藏联系信息的方法
+    public void HideContactInfo()
+    {
+        Email = "**********";
+        PhoneNumber = "***********";
+    }
 }

LMS.Repository/Software/AddSoftwareModel.cs

@@ -0,0 +1,22 @@
+using LMS.Common.Attributes;
+using System.ComponentModel.DataAnnotations;
+
+namespace LMS.Repository.Software
+{
+    public class AddSoftwareModel
+    {
+        /// <summary>
+        /// 软件名称
+        /// </summary>
+        [Required]
+        [NotEmpty(ErrorMessage = "123")]
+        public string SoftwareName { get; set; }
+
+        /// <summary>
+        /// 软件代码
+        /// </summary>
+        [Required]
+        [NotEmpty(ErrorMessage = "123")]
+        public string SoftwareCode { get; set; }
+    }
+}

LMS.Repository/Software/ModifySoftwareControlValidityModel.cs

@@ -0,0 +1,11 @@
+using LMS.Common.Enum;
+
+namespace LMS.Repository.Software
+{
+    public class ModifySoftwareControlValidityModel
+    {
+        public SoftwareControlEnum.SoftwareControlValidityEnum? ExpirationTime { get; set; }
+
+        public bool? IsForever { get; set; }
+    }
+}

LMS.Repository/User/LoginResponse.cs

@@ -0,0 +1,21 @@
+namespace LMS.Repository.User;
+public class LoginResponseBase
+{
+
+    public string Token { get; set; }
+    public string UserName { get; set; }
+    public long Id { get; set; }
+    public string NickName { get; set; }
+}
+
+public class LoginResponse : LoginResponseBase
+{
+    public string RefreshToken { get; set; }
+}
+
+public class SimpleLoginResponse : LoginResponseBase
+{
+    public bool IsForver { get; set; }
+
+    public DateTime? ExpirationTime { get; set; }
+}

LMS.service/Configuration/ServiceConfiguration.cs

@@ -7,6 +7,7 @@ using LMS.service.Service;
 using LMS.service.Service.PermissionService;
 using LMS.service.Service.PromptService;
 using LMS.service.Service.RoleService;
+using LMS.service.Service.SoftwareService;
 using LMS.service.Service.UserService;
 
 namespace Lai_server.Configuration
@@ -31,6 +32,8 @@ namespace Lai_server.Configuration
             services.AddScoped<PromptTypeService>();
             services.AddScoped<PromptService>();
             services.AddScoped<ForwardWordService>();
+            services.AddScoped<SoftwareControlService>();
+            services.AddScoped<SoftwareService>();
 
 
 

LMS.service/Controllers/SoftWareController.cs

@@ -1,14 +1,230 @@
-using Microsoft.AspNetCore.Mvc;
+using LMS.Repository.DB;
+using LMS.Repository.DTO;
+using LMS.Repository.DTO.Software;
+using LMS.Repository.Models.User;
+using LMS.Repository.Software;
+using LMS.Repository.User;
+using LMS.service.Service.SoftwareService;
+using LMS.service.Service.UserService;
+using LMS.Tools.Extensions;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.IdentityModel.Tokens;
+using System.ComponentModel.DataAnnotations;
+using System.IdentityModel.Tokens.Jwt;
+using static LMS.Common.Enums.ResponseCodeEnum;
 
 namespace LMS.service.Controllers
 {
     [Route("lms/[controller]/[action]")]
     public class SoftWareController : ControllerBase
     {
-        //public  Index()
+        private readonly SoftwareControlService _softwareControlService;
-        //{
+        private readonly SoftwareService _softwareService;
-        //    var version = Assembly.GetExecutingAssembly().GetName().Version;
+
-        //    Console.WriteLine($"Version: {version}");
+        public SoftWareController(SoftwareControlService softwareControlService, SoftwareService softwareService)
-        //}
+        {
+            _softwareControlService = softwareControlService;
+            _softwareService = softwareService;
+        }
+
+        #region 软件控制-同步用户的软件控制权限
+        /// <summary>
+        /// 同步用户的软件控制权限,用于用户登录后同步用户的软件控制权限
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpPost("{userId}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<string>>> ApplySoftwareControl(long userId)
+        {
+            long reuqestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareControlService.ApplySoftwareControl(userId, reuqestUserId);
+        }
+
+        #endregion
+
+        #region 软件控制-设置软件的到期时间和是否永久
+
+        [HttpPost("{id}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<string>>> ModifySoftwareControlValidity(string id, [FromBody] ModifySoftwareControlValidityModel model)
+        {
+            if (!ModelState.IsValid)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError);
+            }
+            if (model.IsForever == null && model.ExpirationTime == null)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError);
+            }
+            long requestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareControlService.ModifySoftwareControlValidity(id, model, requestUserId);
+        }
+
+        #endregion
+
+        #region 软件控制-获取软件信息的集合
+
+        [HttpGet]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<CollectionResponse<SoftwareControlCollectionDto>>>> GetSoftwareControlCollection([Required] int page, [Required] int pageSize, long? userId, string? softwareId, bool? IsForever, string? remark)
+        {
+            long requestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareControlService.GetSoftwareControlCollection(page, pageSize, userId, softwareId, IsForever, remark, requestUserId);
+        }
+
+        #endregion
+
+        #region 软件控制-删除软件控制数据
+
+        [HttpDelete("{id}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<string>>> DeleteSoftwareControl(string id)
+        {
+            long requestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareControlService.DeleteSoftwareControl(id, requestUserId);
+        }
+        #endregion
+
+        #region 软件控制-各个软件检测软件控制权限
+
+        [HttpPost("{userID}/{machineId}/{softwareId}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<string>>> CheckSoftwareControl(long userID, string machineId, string softwareId)
+        {
+            if (!ModelState.IsValid)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError);
+            }
+            long requestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            // 解析jwt，获取machineID
+            // 从请求头中获取 JWT
+            var token = HttpContext.Request.Headers["Authorization"].ToString().Replace("Bearer ", "");
+
+            // 解析 JWT 并获取 MachineId
+            var handler = new JwtSecurityTokenHandler();
+            var jwtToken = handler.ReadJwtToken(token);
+
+            // 假设 MachineId 存储在 JWT 的声明中
+            var machineIdClaim = jwtToken.Claims.FirstOrDefault(claim => claim.Type == "DeviceInfo");
+            string parsedMachineId = machineIdClaim?.Value ?? "";
+            if (parsedMachineId != machineId || userID != requestUserId)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.InvalidToken, "登录失效，请重新登录");
+            }
+
+            return await _softwareControlService.CheckSoftwareControl(userID, machineId, softwareId);
+        }
+
+        #endregion
+
+        #region 软件控制-传入用户可以未申请权限数量
+
+        [HttpGet("{userId}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<int>>> GetUserSoftwareControlCount(long userId)
+        {
+            long requestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareControlService.GetUserSoftwareControlCount(userId, requestUserId);
+        }
+
+        #endregion
+
+
+
+        #region 软件-添加软件数据
+        /// <summary>
+        /// 添加软件数据
+        /// </summary>
+        /// <param name="software"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<string>>> AddSoftware([FromBody] AddSoftwareModel software)
+        {
+            if (!ModelState.IsValid)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError);
+            }
+            long reuqestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareService.AddSoftware(software, reuqestUserId);
+        }
+        #endregion
+
+        #region 软件-修改软件信息
+
+        /// <summary>
+        /// 修改软件信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="software"></param>
+        /// <returns></returns>
+        [HttpPost("{id}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<string>>> MpdifySoftware(string id, [FromBody] AddSoftwareModel software)
+        {
+            if (!ModelState.IsValid)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError);
+            }
+            long reuqestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareService.ModifySoftware(id, software, reuqestUserId);
+        }
+
+        #endregion
+
+        #region 软件-获取软件列表信息
+        /// <summary>
+        /// 获取软件的列表信息，可以使用查询条件 softwareName, softwareCode
+        /// </summary>
+        /// <param name="page">页数</param>
+        /// <param name="pageSize">一页多少</param>
+        /// <param name="softwareName">软件名字</param>
+        /// <param name="softwareCode">软件编码</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<CollectionResponse<SoftwareCollectionDto>>>> GetSoftwareCollection([Required] int page, [Required] int pageSize, string? softwareName, string? softwareCode, bool? isUse = true)
+        {
+            long reuqestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareService.GetSoftwareCollection(page, pageSize, softwareName, softwareCode, reuqestUserId, isUse);
+        }
+        #endregion
+
+        #region 软件-获取软件的信息信息，通过ID
+
+        [HttpGet("{id}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<SoftwareCollectionDto>>> GetSoftwareInfoById(string id)
+        {
+            long reuqestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareService.GetSoftwareInfoById(id, reuqestUserId);
+        }
+        #endregion
+
+        #region 软件-删除软件数据
+        [HttpDelete("{id}")]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<string>>> DeleteSoftware(string id)
+        {
+            long reuqestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareService.DeleteSoftware(id, reuqestUserId);
+        }
+
+        #endregion
+
+        #region 软件-获取所有软件的基础信息
+
+        [HttpGet]
+        [Authorize]
+        public async Task<ActionResult<APIResponseModel<List<SoftwareBasicDto>>>> GetSoftwareBaseCollection()
+        {
+            long reuqestUserId = ConvertExtension.ObjectToLong(HttpContext.Items["UserId"] ?? 0);
+            return await _softwareService.GetSoftwareBaseCollection(reuqestUserId);
+        }
+
+        #endregion
     }
 }

LMS.service/Controllers/UserController.cs

@@ -46,7 +46,7 @@ namespace LMS.service.Controllers
 
         #endregion
 
-        #region 登录
+        #region 登录 会生成刷新token，用户后台的刷新
         /// <summary>
         /// 用户登录接口
         /// </summary>
@@ -81,10 +81,30 @@ namespace LMS.service.Controllers
                 SameSite = SameSiteMode.None,
                 Expires = DateTime.UtcNow.AddDays(7),
             };
-            Response.Cookies.Append("refreshToken", ((LoginService.LoginResponse)apiResponse.Data).RefreshToken, cookieOptions);
+            Response.Cookies.Append("refreshToken", ((LoginResponse)apiResponse.Data).RefreshToken, cookieOptions);
             return apiResponse;
         }
 
+        #endregion
+
+        #region 简单登录，不生成刷新token，绑定机器码，有效期一天
+
+        [HttpPost("{softwareId}")]
+        public async Task<ActionResult<APIResponseModel<SimpleLoginResponse>>> SimpleLogin(string softwareId, [FromBody] LoginModel model)
+        {
+            if (!ModelState.IsValid)
+            {
+                return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.ParameterError);
+            }
+            string? ip = HttpContext.Request.Headers["X-Forwarded-For"].FirstOrDefault();
+            if (string.IsNullOrEmpty(ip))
+            {
+                ip = HttpContext.Connection.RemoteIpAddress?.ToString();
+            }
+            return await _loginService.SimpleLogin(model, softwareId, ip, _keyStore);
+        }
+
+
         #endregion
 
         #region 注册

LMS.service/Extensions/Middleware/DynamicPermissionMiddleware.cs

@@ -59,6 +59,7 @@ namespace LMS.service.Extensions.Middleware
                 context.Items["UserId"] = userId;
                 return Convert.ToInt64(userIdClaim?.Value);
             }
+
             return 0;
         }
     }

LMS.service/LMS.service.csproj

@@ -7,7 +7,7 @@
     <UserSecretsId>ed64fb6f-9c93-43d0-b418-61f507f28420</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>.</DockerfileContext>
-    <Version>1.0.0</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

LMS.service/Service/SoftwareService/SoftwareControlService.cs

@@ -0,0 +1,442 @@
+using AutoMapper;
+using LMS.Common.Enum;
+using LMS.DAO;
+using LMS.DAO.UserDAO;
+using LMS.Repository.DB;
+using LMS.Repository.DTO;
+using LMS.Repository.DTO.Software;
+using LMS.Repository.DTO.UserDto;
+using LMS.Repository.Models.DB;
+using LMS.Repository.Software;
+using LMS.Tools;
+using LMS.Tools.Extensions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using static LMS.Common.Enums.ResponseCodeEnum;
+
+namespace LMS.service.Service.SoftwareService
+{
+    public class SoftwareControlService(UserBasicDao userBasicDao, ApplicationDbContext dbContext, IMapper mapper)
+    {
+        private readonly UserBasicDao _userBasicDao = userBasicDao;
+        private readonly ApplicationDbContext _dbContext = dbContext;
+        private readonly IMapper _mapper = mapper;
+
+        #region 软件控制-同步用户的软件控制权限
+        /// <summary>
+        /// 用户自动同步软件控制，和software中的一致，只要没有的数据都同步上，不管isUse，这个会在后面过滤掉
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name=""></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        internal async Task<ActionResult<APIResponseModel<string>>> ApplySoftwareControl(long id, long requestUserId)
+        {
+            using var transaction = _dbContext.Database.BeginTransaction();
+            try
+            {
+                // 用户ID和请求ID不一致，且请求ID不是管理员或超级管理员，返回无权限操作
+                if (id != requestUserId && !await _userBasicDao.CheckUserIsAdminOrSuperAdmin(requestUserId))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+
+                // 检查用户是否存在
+                if (!await _userBasicDao.CheckUserExistsByID(id))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.FindUserByIdFail);
+                }
+
+                List<SoftwareControl> softwareControl = await _dbContext.SoftwareControl.Where(x => x.UserId == id).ToListAsync();
+                List<Software> software = await _dbContext.Software.ToListAsync();
+
+                bool isAdd = false;
+
+                // 判断是不是所有的软件都有权限，如果没有就添加
+                foreach (var item in software)
+                {
+                    if (softwareControl.FirstOrDefault(x => x.SoftwareId == item.Id) == null)
+                    {
+                        SoftwareControl softwareControlModel = new SoftwareControl
+                        {
+                            Id = Guid.NewGuid().ToString(),
+                            UserId = id,
+                            SoftwareId = item.Id,
+                            CreatedUserId = requestUserId,
+                            CreatedTime = BeijingTimeExtension.GetBeijingTime(),
+                            UpdatedUserId = requestUserId,
+                            UpdatedTime = BeijingTimeExtension.GetBeijingTime(),
+                            Remark = string.Empty,
+                            IsForever = false,
+                            ExpirationTime = null,
+                        };
+                        await _dbContext.SoftwareControl.AddAsync(softwareControlModel);
+                        isAdd = true;
+                    }
+
+                }
+                // 判断现在的，将再soft中没有的软件控制删除
+                foreach (var item1 in softwareControl)
+                {
+                    if (software.FirstOrDefault(x => x.Id == item1.SoftwareId) == null)
+                    {
+                        _dbContext.SoftwareControl.Remove(item1);
+                        isAdd = true;
+                    }
+                }
+
+                await _dbContext.SaveChangesAsync();
+                await transaction.CommitAsync();
+                if (isAdd)
+                {
+                    return APIResponseModel<string>.CreateSuccessResponseModel("同步所有的软件权限成功");
+                }
+                else
+                {
+                    return APIResponseModel<string>.CreateSuccessResponseModel("当前已获取所有的软件控制权限，不需要做处理");
+                }
+            }
+            catch (Exception ex)
+            {
+                await transaction.RollbackAsync();
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+
+        #endregion
+
+        #region 软件控制-设置软件的到期时间和是否永久
+        /// <summary>
+        /// 设置软件的到期时间和是否永久
+        /// </summary>
+        /// <param name="id">软件控制项的ID</param>
+        /// <param name="model">传入的数据</param>
+        /// <param name="requestUserId">请求的用户ID</param>
+        /// <returns></returns>
+        public async Task<ActionResult<APIResponseModel<string>>> ModifySoftwareControlValidity(string id, ModifySoftwareControlValidityModel model, long requestUserId)
+        {
+            try
+            {
+                if (!await _userBasicDao.CheckUserIsAdminOrSuperAdmin(requestUserId))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+                if (model.ExpirationTime != null)
+                {
+                    // 判断model传入的枚举值是不是再对应的enum中是有效的
+                    if (!Enum.IsDefined(typeof(SoftwareControlEnum.SoftwareControlValidityEnum), model.ExpirationTime))
+                    {
+                        return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "传入的到期时间不在有效范围内");
+                    }
+                }
+
+                // 判断指定ID的软件控制项是否存在
+                SoftwareControl? softwareControl = await _dbContext.SoftwareControl.FirstOrDefaultAsync(x => x.Id == id);
+                if (softwareControl == null)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.IdDateNotFound);
+                }
+
+                // 判断当前数据是不是永久，如果是永久，就不能修改
+                if (softwareControl.IsForever && model.IsForever == true)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "当前已是永久，不可再修改");
+                }
+
+                // 判断传入的modal的IsForever是不是true，是的话直接设置未永久，不是的话，设置到期时间
+                if (model.IsForever == true)
+                {
+                    softwareControl.IsForever = true;
+                    softwareControl.ExpirationTime = null;
+                }
+                else
+                {
+                    // 这边判断现在的到期时间是不是大于现在的时间，是的话，再到期时间的基础上加上传入的时间，不是的话，直接再现在时间加上传入的时间，如果现在是永久，直接设置到期时间为现在时间加上传入的时间
+                    if (model.ExpirationTime == null)
+                    {
+                        return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "当前到期时间为空，不可修改");
+                    }
+
+                    if (softwareControl.IsForever == true)
+                    {
+                        softwareControl.ExpirationTime = BeijingTimeExtension.GetBeijingTime().AddDays((double)model.ExpirationTime.Value);
+                        softwareControl.IsForever = false;
+                    }
+                    else
+                    {
+
+                        if (softwareControl.ExpirationTime > BeijingTimeExtension.GetBeijingTime())
+                        {
+                            if (model.ExpirationTime == SoftwareControlEnum.SoftwareControlValidityEnum.Zero)
+                            {
+                                softwareControl.ExpirationTime = BeijingTimeExtension.GetBeijingTime();
+                            }
+                            else
+                            {
+                                softwareControl.ExpirationTime = softwareControl.ExpirationTime.Value.AddDays((double)model.ExpirationTime.Value);
+                            }
+                        }
+                        else
+                        {
+                            softwareControl.ExpirationTime = BeijingTimeExtension.GetBeijingTime().AddDays((double)model.ExpirationTime.Value);
+                        }
+
+
+                    }
+                }
+                // 设置更新时间和更新人
+                softwareControl.UpdatedTime = BeijingTimeExtension.GetBeijingTime();
+                softwareControl.UpdatedUserId = requestUserId;
+                //  更新数据库
+                _dbContext.SoftwareControl.Update(softwareControl);
+                await _dbContext.SaveChangesAsync();
+                return APIResponseModel<string>.CreateSuccessResponseModel("修改成功");
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+        #endregion
+
+        #region 软件控制-获取软件信息的集合
+        /// <summary>
+        /// 获取软件信息的集合
+        /// </summary>
+        /// <param name="page"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="userId"></param>
+        /// <param name="softwareId"></param>
+        /// <param name="isForever"></param>
+        /// <param name="remark"></param>
+        /// <param name="reuqestUserId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<ActionResult<APIResponseModel<CollectionResponse<SoftwareControlCollectionDto>>>> GetSoftwareControlCollection(int page, int pageSize, long? userId, string? softwareId, bool? isForever, string? remark, long requestUserId)
+        {
+            try
+            {
+                // 判断权限，如果不是管理员或超级管理员，就判断是不是自己的数据，不是的话，返回无权限操作
+                IQueryable<SoftwareControl> query = _dbContext.SoftwareControl.AsQueryable();
+                bool isAdminOrSuperAdmin = await _userBasicDao.CheckUserIsAdminOrSuperAdmin(requestUserId);
+
+                if (!isAdminOrSuperAdmin && userId != requestUserId)
+                {
+                    return APIResponseModel<CollectionResponse<SoftwareControlCollectionDto>>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+
+                if (userId != null)
+                {
+                    query = query.Where(x => x.UserId == userId);
+                }
+                if (softwareId != null)
+                {
+                    query = query.Where(x => x.SoftwareId == softwareId);
+                }
+                if (isForever != null)
+                {
+                    query = query.Where(x => x.IsForever == isForever);
+                }
+                if (!string.IsNullOrWhiteSpace(remark))
+                {
+                    query = query.Where(x => x.Remark.Contains(remark));
+                }
+
+
+                if (!isAdminOrSuperAdmin)
+                {
+                    // 通过 softwareId 过滤掉isUse为false的数
+                    List<string> softwareIds = await _dbContext.Software.Where(x => x.IsUse == true).Select(x => x.Id).ToListAsync();
+                    query = query.Where(x => softwareIds.Contains(x.SoftwareId));
+                }
+
+                // 通过ID降序
+                query = query.OrderByDescending(x => x.CreatedTime);
+
+                // 查询总数
+                int total = await query.CountAsync();
+
+                // 分页   
+                query = query.Skip((page - 1) * pageSize).Take(pageSize);
+
+                List<SoftwareControl> softwareControls = await query.ToListAsync();
+                List<SoftwareControlCollectionDto> softwareControlCollectionDtos = new List<SoftwareControlCollectionDto>();
+
+                foreach (var item in softwareControls)
+                {
+                    SoftwareControlCollectionDto softwareControlCollectionDto = new SoftwareControlCollectionDto
+                    {
+                        Id = item.Id,
+                        IsForever = item.IsForever,
+                        ExpirationTime = item.ExpirationTime,
+                        Remark = item.Remark,
+                        CreatedTime = item.CreatedTime,
+                        UpdatedTime = item.UpdatedTime,
+                    };
+                    Software? software = await _dbContext.Software.FirstOrDefaultAsync(x => x.Id == item.SoftwareId);
+                    if (software != null)
+                    {
+                        softwareControlCollectionDto.Software = software;
+                    }
+                    User? user = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == item.UserId);
+                    softwareControlCollectionDto.User = _mapper.Map<UserBaseDto>(user);
+                    softwareControlCollectionDto.User.HideContactInfo();
+
+                    User? createdUser = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == item.CreatedUserId);
+                    softwareControlCollectionDto.CreatedUser = _mapper.Map<UserBaseDto>(createdUser);
+                    softwareControlCollectionDto.CreatedUser.HideContactInfo();
+
+                    User? updatedUser = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == item.UpdatedUserId);
+                    softwareControlCollectionDto.UpdatedUser = _mapper.Map<UserBaseDto>(updatedUser);
+                    softwareControlCollectionDto.UpdatedUser.HideContactInfo();
+
+                    softwareControlCollectionDtos.Add(softwareControlCollectionDto);
+                }
+                return APIResponseModel<CollectionResponse<SoftwareControlCollectionDto>>.CreateSuccessResponseModel(new CollectionResponse<SoftwareControlCollectionDto>
+                {
+                    Total = total,
+                    Collection = softwareControlCollectionDtos,
+                    Current = page,
+                });
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<CollectionResponse<SoftwareControlCollectionDto>>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+
+
+        }
+        #endregion
+
+        #region 软件控制-删除软件控制数据
+
+        /// <summary>
+        /// 删除软件控制数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="requestUserId"></param>
+        /// <returns></returns>
+        public async Task<ActionResult<APIResponseModel<string>>> DeleteSoftwareControl(string id, long requestUserId)
+        {
+            try
+            {
+                if (!await _userBasicDao.CheckUserIsAdminOrSuperAdmin(requestUserId))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+
+                SoftwareControl? softwareControl = await _dbContext.SoftwareControl.FirstOrDefaultAsync(x => x.Id == id);
+                if (softwareControl == null)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.IdDateNotFound);
+                }
+
+                _dbContext.SoftwareControl.Remove(softwareControl);
+                await _dbContext.SaveChangesAsync();
+                return APIResponseModel<string>.CreateSuccessResponseModel("删除成功");
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+
+        #endregion
+
+        #region 软件检查权限以及登录状态
+        /// <summary>
+        /// 检查软件控制权限 以及登录状态
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="machineId"></param>
+        /// <param name="softwareId"></param>
+        /// <returns></returns>
+        public async Task<ActionResult<APIResponseModel<string>>> CheckSoftwareControl(long userID, string machineId, string softwareId)
+        {
+            try
+            {
+                // 判断软件是不是存在
+                if (!await _dbContext.Software.AnyAsync(x => x.Id == softwareId))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.IdDateNotFound);
+                }
+
+                // 判断是不是有关联信息，没有的话就是没有登录，或者是机器码不一致，再其他地方登录过了
+                UserSoftware? userSoftware = await _dbContext.UserSoftware.FirstOrDefaultAsync(x => x.UserId == userID && x.MachineId == machineId);
+                if (userSoftware == null)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction, "无用户登录信息或登录信息不正确，请确认是不是登录多次，请重新登录");
+                }
+
+                // 判断是不是有权限
+                SoftwareControl? softwareControl = await _dbContext.SoftwareControl.FirstOrDefaultAsync(x => x.UserId == userID && x.SoftwareId == softwareId);
+                if (softwareControl == null)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction, "无权限操作，请先申请权限");
+                }
+
+                // 判断是不是还能用
+                if (softwareControl.IsForever == true || softwareControl.ExpirationTime > BeijingTimeExtension.GetBeijingTime())
+                {
+                    // 可用
+                    return APIResponseModel<string>.CreateSuccessResponseModel("1");
+                }
+                else
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction, "权限已过期，请重新申请");
+                }
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+
+        #endregion
+
+        #region 软件控制-用户可申请的软件控制数量
+        /// <summary>
+        /// 用户可申请的软件控制数量
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="requestUserId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<ActionResult<APIResponseModel<int>>> GetUserSoftwareControlCount(long userId, long requestUserId)
+        {
+            try
+            {
+                bool isAdminOrSuperAdmin = await _userBasicDao.CheckUserIsAdminOrSuperAdmin(requestUserId);
+                if (!isAdminOrSuperAdmin && userId != requestUserId)
+                {
+                    return APIResponseModel<int>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+                User? user = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == userId);
+                if (user == null)
+                {
+                    return APIResponseModel<int>.CreateErrorResponseModel(ResponseCode.FindUserByIdFail);
+                }
+
+                List<Software> software = await _dbContext.Software.Where(x => x.IsUse == true).ToListAsync();
+
+                List<SoftwareControl> softwareControls = await _dbContext.SoftwareControl.Where(x => x.UserId == userId).ToListAsync();
+                // 判断software中的softwareId是否在softwareControl中，不在的话，不在的话计数
+                int count = 0;
+                foreach (var item in software)
+                {
+                    if (softwareControls.FirstOrDefault(x => x.SoftwareId == item.Id) == null)
+                    {
+                        count++;
+                    }
+                }
+                return APIResponseModel<int>.CreateSuccessResponseModel(count);
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<int>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+
+        #endregion
+    }
+}

LMS.service/Service/SoftwareService/SoftwareService.cs

@@ -0,0 +1,320 @@
+using AutoMapper;
+using LMS.DAO;
+using LMS.DAO.UserDAO;
+using LMS.Repository.DB;
+using LMS.Repository.DTO;
+using LMS.Repository.DTO.Software;
+using LMS.Repository.DTO.UserDto;
+using LMS.Repository.Models.DB;
+using LMS.Repository.Software;
+using LMS.Tools.Extensions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using static LMS.Common.Enums.ResponseCodeEnum;
+
+namespace LMS.service.Service.SoftwareService
+{
+    public class SoftwareService(UserBasicDao userBasicDao, ApplicationDbContext dbContext, IMapper mapper)
+    {
+        private readonly UserBasicDao _userBasicDao = userBasicDao;
+        private readonly ApplicationDbContext _dbContext = dbContext;
+        private readonly IMapper _mapper = mapper;
+
+        #region 添加软件数据
+        /// <summary>
+        /// 添加软件数据
+        /// </summary>
+        /// <param name="software"></param>
+        /// <param name="reuqestUserId"></param>
+        /// <returns></returns>
+        public async Task<ActionResult<APIResponseModel<string>>> AddSoftware(AddSoftwareModel software, long reuqestUserId)
+        {
+            try
+            {
+                // 判断用户是不是超级管理员
+                if (!(await _userBasicDao.CheckUserIsSuperAdmin(reuqestUserId)))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+
+                // 判断软件名字软件代码是不是存在,存在的话,报错
+                bool isSoftwareExists = await _dbContext.Software.AnyAsync(x => x.SoftwareName == software.SoftwareName || x.SoftwareCode == software.SoftwareCode);
+                if (isSoftwareExists)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "软件名称或软件编码已存在,请检查");
+                }
+
+                // 开始添加软件
+                Software software1 = new Software
+                {
+                    Id = Guid.NewGuid().ToString(),
+                    SoftwareName = software.SoftwareName,
+                    SoftwareCode = software.SoftwareCode,
+                    CreatedUserId = reuqestUserId,
+                    UpdatedUserId = reuqestUserId,
+                    CreatedTime = BeijingTimeExtension.GetBeijingTime(),
+                    UpdatedTime = BeijingTimeExtension.GetBeijingTime(),
+                    Remark = string.Empty,
+                    IsUse = true
+                };
+                await _dbContext.Software.AddAsync(software1);
+                await _dbContext.SaveChangesAsync();
+                // Add software
+                return APIResponseModel<string>.CreateSuccessResponseModel("Add software successfully");
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+        #endregion
+
+        #region 修改软件信息
+        /// <summary>
+        /// 修改软件信息
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="software"></param>
+        /// <param name="reuqestUserId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<ActionResult<APIResponseModel<string>>> ModifySoftware(string id, AddSoftwareModel software, long reuqestUserId)
+        {
+            try
+            {
+                // 判断用户是不是超级管理员
+                if (!(await _userBasicDao.CheckUserIsSuperAdmin(reuqestUserId)))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+                // 判断传入的ID是不是存在
+                Software? software2 = await _dbContext.Software.FirstOrDefaultAsync(x => x.Id == id);
+                if (software2 == null)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "Software does not exist");
+                }
+                // 判断软件名字软件代码是不是存在，不包含当前的,存在的话,报错
+                bool isSoftwareExists = await _dbContext.Software.AnyAsync(x => (x.SoftwareName == software.SoftwareName || x.SoftwareCode == software.SoftwareCode) && x.Id != id);
+                if (isSoftwareExists)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "软件名称或软件编码已存在,请检查");
+                }
+                software2.SoftwareName = software.SoftwareName;
+                software2.SoftwareCode = software.SoftwareCode;
+                software2.UpdatedUserId = reuqestUserId;
+                software2.UpdatedTime = BeijingTimeExtension.GetBeijingTime();
+                _dbContext.Update(software2);
+                await _dbContext.SaveChangesAsync();
+                return APIResponseModel<string>.CreateSuccessResponseModel("Modify software successfully");
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+        #endregion
+
+        #region 获取软件列表信息
+
+        /// <summary>
+        /// 获取软件信息的列表，可以使用查询条件 softwareName, softwareCode
+        /// </summary>
+        /// <param name="page"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="softwareName"></param>
+        /// <param name="softwareCode"></param>
+        /// <param name="reuqestUserId"></param>
+        /// <returns></returns>
+        public async Task<ActionResult<APIResponseModel<CollectionResponse<SoftwareCollectionDto>>>> GetSoftwareCollection(int page, int pageSize, string? softwareName, string? softwareCode, long reuqestUserId, bool? isUse)
+        {
+            try
+            {
+                if (!await _userBasicDao.CheckUserIsSuperAdmin(reuqestUserId))
+                {
+                    return APIResponseModel<CollectionResponse<SoftwareCollectionDto>>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+
+                IQueryable<Software> query = _dbContext.Software.AsQueryable();
+                if (!string.IsNullOrWhiteSpace(softwareName))
+                {
+                    query = query.Where(x => x.SoftwareName.Contains(softwareName));
+                }
+                if (!string.IsNullOrWhiteSpace(softwareCode))
+                {
+                    query = query.Where(x => x.SoftwareCode.Contains(softwareCode));
+                }
+                if (isUse != null)
+                {
+                    query = query.Where(x => x.IsUse == isUse);
+                }
+                // 按照创建时间排序
+                query = query.OrderByDescending(x => x.CreatedTime);
+                // 计算总数
+                int count = await query.CountAsync();
+                // 分页
+                List<Software> softwareList = await query.Skip((page - 1) * pageSize).Take(pageSize).ToListAsync();
+
+                List<SoftwareCollectionDto> softwareCollectionDtos = [];
+                for (int i = 0; i < softwareList.Count; i++)
+                {
+
+                    SoftwareCollectionDto softwareCollectionDto = new()
+                    {
+                        Id = softwareList[i].Id,
+                        SoftwareName = softwareList[i].SoftwareName,
+                        SoftwareCode = softwareList[i].SoftwareCode,
+                        CreatedTime = softwareList[i].CreatedTime,
+                        UpdatedTime = softwareList[i].UpdatedTime,
+                        Remark = softwareList[i].Remark,
+                        IsUse = softwareList[i].IsUse
+                    };
+
+                    User? createdUser = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == softwareList[i].CreatedUserId);
+                    softwareCollectionDto.CreatedUser = _mapper.Map<UserBaseDto>(createdUser);
+                    softwareCollectionDto.CreatedUser.HideContactInfo();
+                    User? updatedUser = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == softwareList[i].UpdatedUserId);
+                    softwareCollectionDto.UpdatedUser = _mapper.Map<UserBaseDto>(updatedUser);
+                    softwareCollectionDto.UpdatedUser.HideContactInfo();
+                    softwareCollectionDtos.Add(softwareCollectionDto);
+                }
+                return APIResponseModel<CollectionResponse<SoftwareCollectionDto>>.CreateSuccessResponseModel(new CollectionResponse<SoftwareCollectionDto>
+                {
+                    Total = count,
+                    Collection = softwareCollectionDtos,
+                    Current = page
+                });
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<CollectionResponse<SoftwareCollectionDto>>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+        #endregion
+
+        #region 获取软件信息，通用ID
+        /// <summary>
+        /// 获取软件信息，通过ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="reuqestUserId"></param>
+        /// <returns></returns>
+        public async Task<ActionResult<APIResponseModel<SoftwareCollectionDto>>> GetSoftwareInfoById(string id, long reuqestUserId)
+        {
+            try
+            {
+                if (!await _userBasicDao.CheckUserIsSuperAdmin(reuqestUserId))
+                {
+                    return APIResponseModel<SoftwareCollectionDto>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+
+                Software? software = await _dbContext.Software.FirstOrDefaultAsync(x => x.Id == id);
+                if (software == null)
+                {
+                    return APIResponseModel<SoftwareCollectionDto>.CreateErrorResponseModel(ResponseCode.ParameterError, "Software does not exist");
+                }
+
+                SoftwareCollectionDto softwareCollection = new SoftwareCollectionDto
+                {
+                    Id = software.Id,
+                    SoftwareName = software.SoftwareName,
+                    SoftwareCode = software.SoftwareCode,
+                    CreatedTime = software.CreatedTime,
+                    UpdatedTime = software.UpdatedTime,
+                    Remark = software.Remark,
+                    IsUse = software.IsUse
+                };
+
+                User? createdUser = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == software.CreatedUserId);
+                softwareCollection.CreatedUser = _mapper.Map<UserBaseDto>(createdUser);
+                User? updatedUser = await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == software.UpdatedUserId);
+                softwareCollection.UpdatedUser = _mapper.Map<UserBaseDto>(updatedUser);
+                return APIResponseModel<SoftwareCollectionDto>.CreateSuccessResponseModel(softwareCollection);
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<SoftwareCollectionDto>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+
+        #endregion
+
+        #region 删除软件数据
+
+        /// <summary>
+        /// 删除软件，通过软件ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="reuqestUserId"></param>
+        /// <returns></returns>
+        public async Task<ActionResult<APIResponseModel<string>>> DeleteSoftware(string id, long reuqestUserId)
+        {
+            try
+            {
+                if (!await _userBasicDao.CheckUserIsSuperAdmin(reuqestUserId))
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.NotPermissionAction);
+                }
+
+                Software? software = await _dbContext.Software.FirstOrDefaultAsync(x => x.Id == id);
+                if (software == null)
+                {
+                    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "Software does not exist");
+                }
+                software.IsUse = false;
+                _dbContext.Software.Update(software);
+                await _dbContext.SaveChangesAsync();
+                return APIResponseModel<string>.CreateSuccessResponseModel("soft Delete software successfully");
+
+
+                //Software? software = await _dbContext.Software.FirstOrDefaultAsync(x => x.Id == id);
+                //if (software == null)
+                //{
+                //    return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.ParameterError, "Software does not exist");
+                //}
+                //// 开始删除软件
+                //_dbContext.Software.Remove(software);
+
+                ////TODO: 删除软件相关的数据（用户软件关联表，软件控制表）
+                //await _dbContext.SaveChangesAsync();
+                //return APIResponseModel<string>.CreateSuccessResponseModel("Delete software successfully");
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 获取所有软件的基础信息
+        /// </summary>
+        /// <param name="reuqestUserId"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<ActionResult<APIResponseModel<List<SoftwareBasicDto>>>> GetSoftwareBaseCollection(long reuqestUserId)
+        {
+            try
+            {
+                List<Software> softwares = await _dbContext.Software.ToListAsync();
+                List<SoftwareBasicDto> softwareBasicDtos = [];
+                for (int i = 0; i < softwares.Count; i++)
+                {
+                    SoftwareBasicDto softwareBasicDto = new SoftwareBasicDto
+                    {
+                        Id = softwares[i].Id,
+                        SoftwareName = softwares[i].SoftwareName,
+                        SoftwareCode = softwares[i].SoftwareCode,
+                        IsUse = softwares[i].IsUse
+                    };
+                    softwareBasicDtos.Add(softwareBasicDto);
+                }
+                return APIResponseModel<List<SoftwareBasicDto>>.CreateSuccessResponseModel(softwareBasicDtos);
+            }
+            catch (Exception ex)
+            {
+                return APIResponseModel<List<SoftwareBasicDto>>.CreateErrorResponseModel(ResponseCode.SystemError, ex.Message);
+            }
+        }
+    }
+}

LMS.service/Service/UserService/LoginService.cs

@@ -1,9 +1,10 @@
 
 using LMS.Common.RSAKey;
 using LMS.DAO;
+using LMS.Repository.DB;
 using LMS.Repository.Models.DB;
 using LMS.Repository.Models.User;
-using LMS.service.Data;
+using LMS.Repository.User;
 using LMS.Tools.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -12,7 +13,6 @@ using Microsoft.IdentityModel.Tokens;
 using System.Collections.Concurrent;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
-using System.Security.Cryptography.Xml;
 using System.Text;
 using static LMS.Common.Enums.ResponseCodeEnum;
 
@@ -31,28 +31,26 @@ namespace LMS.service.Service.UserService
             _securityService = securityService;
         }
 
-        public class LoginResponse
+        #region 生成JWT
-        {
-            public string Token { get; set; }
-            public string UserName { get; set; }
-            public long Id { get; set; }
-            public string NickName { get; set; }
-            public string RefreshToken { get; set; }
-        }
-
         /// <summary>
         /// 生成JWT
         /// </summary>
         /// <param name="user"></param>
         /// <returns></returns>
         /// <exception cref="Exception"></exception>
-        public string GenerateJWT(User user)
+        public string GenerateJWT(User user, int hours = 6, string deviceInfo = "")
         {
-            var claims = new List<Claim>();
+            var claims = new List<Claim>
-            claims.Add(new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()));
+            {
-            claims.Add(new Claim(ClaimTypes.Name, user.UserName));
+                new(ClaimTypes.NameIdentifier, user.Id.ToString()),
+                new(ClaimTypes.Name, user.UserName),
                 // 获取角色（目前只有管理员）
-            claims.Add(new Claim(ClaimTypes.Role, "AdminUser"));
+                new(ClaimTypes.Role, "AdminUser")
+            };
+            if (!string.IsNullOrEmpty(deviceInfo))
+            {
+                claims.Add(new Claim("DeviceInfo", deviceInfo));
+            }
             //foreach (string role in roles)
             //{
             //    claims.Add(new Claim(ClaimTypes.Role, role));
@@ -67,7 +65,7 @@ namespace LMS.service.Service.UserService
 
 
             //设置Token的过期时间
-            DateTime expires = DateTime.Now.AddHours(6);
+            DateTime expires = DateTime.Now.AddHours(hours);
             byte[] secBytes = Encoding.UTF8.GetBytes(key);
             var secKey = new SymmetricSecurityKey(secBytes);
 
@@ -81,6 +79,9 @@ namespace LMS.service.Service.UserService
             return jwt;
         }
 
+        #endregion
+
+        #region 用户登录，生成刷新token
         /// <summary>
         /// 用户登录的服务层方法
         /// </summary>
@@ -172,6 +173,9 @@ namespace LMS.service.Service.UserService
             }
         }
 
+        #endregion
+
+        #region 刷新token的方法
         /// <summary>
         /// 刷新token的方法
         /// </summary>
@@ -208,6 +212,8 @@ namespace LMS.service.Service.UserService
             }
         }
 
+        #endregion
+
         #region 将用户设置为代理
         /// <summary>
         /// 将用户设置为代理，要做一系列检查
@@ -273,6 +279,128 @@ namespace LMS.service.Service.UserService
                 return APIResponseModel<string>.CreateErrorResponseModel(ResponseCode.SystemError, e.Message);
             }
         }
+
+        #endregion
+
+        //TODO 未测试
+        #region 用户登录的服务层方法，简化版，只是登录，不生成刷新token
+        /// <summary>
+        /// 用户登录的服务层方法，简化版，只是登录，不生成刷新token
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="_keyStore"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public async Task<ActionResult<APIResponseModel<SimpleLoginResponse>>> SimpleLogin(LoginModel model, string softwareId, string ip, ConcurrentDictionary<string, (string Key, DateTime Expiry)> _keyStore)
+        {
+            using var transaction = await _context.Database.BeginTransactionAsync();
+            try
+            {
+                if (string.IsNullOrWhiteSpace(model.DeviceInfo))
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.ParameterError);
+                }
+                if (!_keyStore.TryRemove(model.TokenId, out var keyInfo)) // 没有找到对应的公钥
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.UserPasswordFail);
+                }
+
+                if (BeijingTimeExtension.GetBeijingTime() > keyInfo.Expiry) // 公钥超时
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.UserPasswordFail);
+                }
+
+                var rsaKeyId = keyInfo.Key;
+                var privateKey = _securityService.DecryptWithAES(rsaKeyId);
+                // 用户密码解密
+                string decryptedPassword = RsaKeyPairGenerator.Decrypt(privateKey, model.Password);
+
+                if (model.UserName == null)
+                {
+                    throw new ArgumentNullException("UserName");
+                }
+
+                User? user = await _userManager.FindByNameAsync(model.UserName);
+
+                if (user == null)
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.FindUserByNameFail);
+                }
+
+                if (await _userManager.IsLockedOutAsync(user))
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.UserIsLockedOut);
+                }
+
+                var result = await _userManager.CheckPasswordAsync(user, decryptedPassword);
+                if (!result)
+                {
+                    // 失败计数器加1
+                    await _userManager.AccessFailedAsync(user);
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.UserPasswordFail);
+                }
+
+                // 密码正确，确认权限
+                // 检查当前用户是不是有软件控制权限
+                Software? software = await _context.Software.FirstOrDefaultAsync(s => s.Id == softwareId);
+                if (software == null)
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.IdDateNotFound, "没有找到指定的软件信息，请联系管理员");
+                }
+                SoftwareControl? softwareControl = await _context.SoftwareControl.FirstOrDefaultAsync(sc => sc.UserId == user.Id && sc.SoftwareId == softwareId);
+                if (softwareControl == null)
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.NotPermissionAction, "当前用户没有软件控制权限，请联系管理员");
+                }
+                // 不是永久，需要判断是不是到期
+                if (softwareControl.IsForever == false && softwareControl.ExpirationTime <= BeijingTimeExtension.GetBeijingTime())
+                {
+                    return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.NotPermissionAction, "当前用户的软件权限已到期，请联系管理员");
+                }
+
+                UserSoftware? userSoftware = await _context.UserSoftware.FirstOrDefaultAsync(us => us.UserId == user.Id && us.SoftwareId == softwareId);
+                if (userSoftware == null)
+                {
+                    // 新建
+                    userSoftware = new UserSoftware()
+                    {
+                        UserId = user.Id,
+                        SoftwareId = softwareId,
+                        MachineId = model.DeviceInfo,
+                        SoftwareControlId = softwareControl.Id
+                    };
+                    await _context.UserSoftware.AddAsync(userSoftware);
+                }
+                else
+                {
+                    // 修改
+                    userSoftware.MachineId = model.DeviceInfo;
+                    _context.Update(userSoftware);
+                    await _context.SaveChangesAsync();
+                }
+
+                // 密码正确，返回token
+                string jwt = GenerateJWT(user, 24, model.DeviceInfo);
+
+                await _context.SaveChangesAsync();
+                await transaction.CommitAsync();
+
+
+                return APIResponseModel<SimpleLoginResponse>.CreateSuccessResponseModel(new SimpleLoginResponse()
+                {
+                    Token = jwt,
+                    UserName = user.UserName ?? "",
+                    Id = user.Id,
+                    NickName = user.NickName
+                });
+            }
+            catch (Exception e)
+            {
+                await transaction.RollbackAsync();
+                return APIResponseModel<SimpleLoginResponse>.CreateErrorResponseModel(ResponseCode.SystemError, e.Message);
+            }
+        }
+
         #endregion
     }
 }

SQL/v1.0.2/Software.sql

@@ -0,0 +1,37 @@
+/*
+ Navicat Premium Dump SQL
+
+ Source Server         : 亿速云（国内）
+ Source Server Type    : MySQL
+ Source Server Version : 80018 (8.0.18)
+ Source Host           : yisurds-66dc0b453c05d4.rds.ysydb1.com:14080
+ Source Schema         : LMS_TEST
+
+ Target Server Type    : MySQL
+ Target Server Version : 80018 (8.0.18)
+ File Encoding         : 65001
+
+ Date: 27/12/2024 21:36:00
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for Software
+-- ----------------------------
+DROP TABLE IF EXISTS `Software`;
+CREATE TABLE `Software`  (
+  `Id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'ID',
+  `SoftwareName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '软件名称',
+  `SoftwareCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '软件代码',
+  `CreatedUserId` bigint(20) NULL DEFAULT NULL COMMENT '创建用户ID',
+  `UpdatedUserId` bigint(20) NULL DEFAULT NULL COMMENT '更新用户ID',
+  `CreatedTime` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `UpdatedTime` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `Remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+  `IsUse` tinyint(1) NULL DEFAULT NULL COMMENT '是否启用',
+  PRIMARY KEY (`Id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

SQL/v1.0.2/SoftwareControl.sql

@@ -0,0 +1,38 @@
+/*
+ Navicat Premium Dump SQL
+
+ Source Server         : 亿速云（国内）
+ Source Server Type    : MySQL
+ Source Server Version : 80018 (8.0.18)
+ Source Host           : yisurds-66dc0b453c05d4.rds.ysydb1.com:14080
+ Source Schema         : LMS_TEST
+
+ Target Server Type    : MySQL
+ Target Server Version : 80018 (8.0.18)
+ File Encoding         : 65001
+
+ Date: 27/12/2024 21:36:10
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for SoftwareControl
+-- ----------------------------
+DROP TABLE IF EXISTS `SoftwareControl`;
+CREATE TABLE `SoftwareControl`  (
+  `Id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'ID',
+  `UserId` bigint(20) NOT NULL COMMENT '用户ID',
+  `SoftwareId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '软件ID',
+  `CreatedUserId` bigint(20) NULL DEFAULT NULL COMMENT '创建用户ID',
+  `CreatedTime` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `UpdatedUserId` bigint(20) NULL DEFAULT NULL COMMENT '更新用户ID',
+  `UpdatedTime` datetime NULL DEFAULT NULL COMMENT '更新时间',
+  `Remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+  `ExpirationTime` datetime NULL DEFAULT NULL COMMENT '到期时间',
+  `IsForever` tinyint(1) NULL DEFAULT NULL COMMENT '是否永久',
+  PRIMARY KEY (`Id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

SQL/v1.0.2/UserSoftware.sql

@@ -0,0 +1,32 @@
+/*
+ Navicat Premium Dump SQL
+
+ Source Server         : 亿速云（国内）
+ Source Server Type    : MySQL
+ Source Server Version : 80018 (8.0.18)
+ Source Host           : yisurds-66dc0b453c05d4.rds.ysydb1.com:14080
+ Source Schema         : LMS_TEST
+
+ Target Server Type    : MySQL
+ Target Server Version : 80018 (8.0.18)
+ File Encoding         : 65001
+
+ Date: 27/12/2024 21:36:16
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for UserSoftware
+-- ----------------------------
+DROP TABLE IF EXISTS `UserSoftware`;
+CREATE TABLE `UserSoftware`  (
+  `UserId` bigint(20) NOT NULL COMMENT '用户ID',
+  `SoftwareId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '软件ID',
+  `MachineId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '机器码ID',
+  `SoftwareControlId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '软件控制ID',
+  PRIMARY KEY (`UserId`, `SoftwareId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;