所有model中 string改为string?

24Hour/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "7.0.5",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

24Hour/24Hour.csproj

@@ -7,6 +7,10 @@
     <RootNamespace>_24Hour</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>E:\Code\24Hour.Service\24Hour\24Hour.xml</DocumentationFile>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.16" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.83" />

24Hour/24Hour.csproj.user

@@ -3,5 +3,6 @@
   <PropertyGroup>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
+    <NameOfLastUsedPublishProfile>E:\Code\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

24Hour/Controllers/LoginController.cs

@@ -17,7 +17,7 @@ namespace _24Hour.Controllers
     /// 되쩌
     /// </summary>
     [ApiController]
-    [Route("api/Login")]
+    [Route("api/APP")]
     public class LoginController : ControllerBase
     {
         private readonly IConfiguration _configuration;

24Hour/Program.cs

@@ -2,6 +2,7 @@ using Elight.Logic;
 using Elight.Utility;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.IdentityModel.Tokens;
@@ -23,8 +24,25 @@ builder.Services.AddControllers();
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen(c =>
 {
-    c.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
+    c.SwaggerDoc("v1", new OpenApiInfo { Title = "24СʱһÌå»ú API", Version = "v1" });
+    c.CustomOperationIds(apiDesc =>
+    {
+        var controllerAction = apiDesc.ActionDescriptor as ControllerActionDescriptor;
+        return controllerAction?.ControllerName + "-" + controllerAction?.ActionName;
+    });
+
+    c.ResolveConflictingActions(apiDescription => apiDescription.First());
+    c.CustomSchemaIds(x => x.FullName);
+    c.DocInclusionPredicate((docName, description) => true);
 
+    var xmlFiles = Directory.GetFiles(Path.Combine(AppContext.BaseDirectory, "xml"), "*.xml");
+    if (xmlFiles.Length > 0)
+    {
+        foreach (var xmlFile in xmlFiles)
+        {
+            c.IncludeXmlComments(xmlFile, true);
+        }
+    }
     //Ìí¼ÓJwtÑéÖ¤ÉèÖÃ
     c.AddSecurityRequirement(new OpenApiSecurityRequirement()
                         {

24Hour/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>C:\Users\Administrator\Desktop\一体机</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <_TargetId>Folder</_TargetId>
+    <SiteUrlToLaunchAfterPublish />
+    <TargetFramework>net6.0</TargetFramework>
+    <ProjectGuid>9cc60d58-cc75-4bf7-a854-3220e725cd8c</ProjectGuid>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>

24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <_PublishTargetUrl>C:\Users\Administrator\Desktop\一体机</_PublishTargetUrl>
+    <History>True|2023-06-13T10:05:11.2568840Z;False|2023-06-13T18:04:56.9546003+08:00;</History>
+    <LastFailureDetails />
+  </PropertyGroup>
+</Project>

Elight.Logic/SystemModel/App_Sys_DepartInput.cs

@@ -15,29 +15,29 @@ namespace Elight.Logic.SystemModel
 		/// 表里用户唯一标识符，自增长Id
 		/// </summary>
 		[DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
         /// <summary>
         /// 单位Id
         /// </summary>
         [DataMember]
-        public string unitId { get; set; }
+        public string? unitId { get; set; }
 
         /// <summary>
         /// 部门编码
         /// </summary>
         [DataMember]
-		public string departCode { get; set; }
+		public string? departCode { get; set; }
         /// <summary>
         /// 部门名称
         /// </summary>
         [DataMember]
-        public string departname { get; set; }
+        public string? departname { get; set; }
 
         /// <summary>
         /// 部门简称
         /// </summary>
         [DataMember]
-        public string departjc { get; set; }
+        public string? departjc { get; set; }
     }
 }
 

Elight.Logic/SystemModel/App_Sys_MenuInput.cs

@@ -15,47 +15,47 @@ namespace Elight.Logic.SystemModel
 		/// 表里用户唯一标识符，自增长Id
 		/// </summary>
 		[DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
         /// <summary>
         /// 父级
         /// </summary>
         [DataMember]
-        public string pid { get; set; }
+        public string? pid { get; set; }
 
         /// <summary>
         /// 路径
         /// </summary>
         [DataMember]
-		public string path { get; set; }
+		public string? path { get; set; }
         /// <summary>
         /// 菜单名称
         /// </summary>
         [DataMember]
-        public string name { get; set; }
+        public string? name { get; set; }
 
         /// <summary>
         /// 页面组件路径
         /// </summary>
         [DataMember]
-        public string component { get; set; }
+        public string? component { get; set; }
 
         /// <summary>
         /// 直接跳转路径
         /// </summary>
         [DataMember]
-        public string redirect { get; set; }
+        public string? redirect { get; set; }
 
         /// <summary>
         /// 页面标题
         /// </summary>
         [DataMember]
-        public string title { get; set; }
+        public string? title { get; set; }
 
         /// <summary>
         /// 是否隐藏子菜单
         /// </summary>
         [DataMember]
-        public bool hideChildrenInMenu { get; set; }
+        public bool? hideChildrenInMenu { get; set; }
 
         /// <summary>
         /// 图标

Elight.Logic/SystemModel/App_Sys_RoleInput.cs

@@ -16,19 +16,19 @@ namespace Elight.Logic.SystemModel
 		/// 表里用户唯一标识符，自增长Id
 		/// </summary>
 		[DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
 
         /// <summary>
         /// 单位编码
         /// </summary>
         [DataMember]
-		public string unitCode { get; set; }
+		public string? unitCode { get; set; }
 
 		/// <summary>
 		/// 角色名称
 		/// </summary>
 		[DataMember]
-		public string name { get; set; }
+		public string? name { get; set; }
     }
 }
 

Elight.Logic/SystemModel/App_Sys_RoleMenuInput.cs

@@ -13,19 +13,19 @@ namespace Elight.Logic.SystemModel
     public class App_Sys_RoleMenuInput : Paging
     {
         [DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
 
         /// <summary>
         /// 角色Id
         /// </summary>
         [DataMember]
-        public string roleId { get; set; }
+        public string? roleId { get; set; }
 
         /// <summary>
         /// 菜单Id
         /// </summary>
         [DataMember]
-        public string menuId { get; set; }
+        public string? menuId { get; set; }
     }
 }
 

Elight.Logic/SystemModel/App_Sys_RoleUserInput.cs

@@ -15,19 +15,19 @@ namespace Elight.Logic.SystemModel
         /// 表里用户唯一标识符，自增长Id
         /// </summary>
         [DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
 
         /// <summary>
         /// 单位编码
         /// </summary>
         [DataMember]
-        public string roleId { get; set; }
+        public string? roleId { get; set; }
 
         /// <summary>
         /// 角色用户Id
         /// </summary>
         [DataMember]
-        public string roleuserId { get; set; }
+        public string? roleuserId { get; set; }
 
     }
 }

Elight.Logic/SystemModel/App_Sys_UnitInput.cs

@@ -15,29 +15,29 @@ namespace Elight.Logic.SystemModel
 		/// 表里用户唯一标识符，自增长Id
 		/// </summary>
 		[DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
         /// <summary>
         /// 父级
         /// </summary>
         [DataMember]
-        public string pid { get; set; }
+        public string? pid { get; set; }
 
         /// <summary>
         /// 单位编码
         /// </summary>
         [DataMember]
-		public string unitCode { get; set; }
+		public string? unitCode { get; set; }
         /// <summary>
         /// 单位名称
         /// </summary>
         [DataMember]
-        public string unitname { get; set; }
+        public string? unitname { get; set; }
 
         /// <summary>
         /// 单位简称
         /// </summary>
         [DataMember]
-        public string unitjc { get; set; }
+        public string? unitjc { get; set; }
     }
 }
 

Elight.Logic/SystemModel/App_Sys_UnitTree.cs

@@ -18,48 +18,48 @@ namespace Elight.Logic.SystemModel
         /// </summary>
         [SqlSugar.SugarColumn(IsPrimaryKey = true)]
         [DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
         /// <summary>
         /// 父级
         /// </summary>
         [DataMember]
-        public string pid { get; set; }
+        public string? pid { get; set; }
 
         /// <summary>
         /// 单位编码
         /// </summary>
         [DataMember]
-		public string unitCode { get; set; }
+		public string? unitCode { get; set; }
         /// <summary>
         /// 单位名称
         /// </summary>
         [DataMember]
-        public string unitname { get; set; }
+        public string? unitname { get; set; }
 
         /// <summary>
         /// 单位简称
         /// </summary>
         [DataMember]
-        public string unitjc { get; set; }
+        public string? unitjc { get; set; }
 
 
         /// <summary>
         /// 是否删除 0否，1是
         /// </summary>
         [DataMember]
-        public int IsDelete { get; set; }
+        public int? IsDelete { get; set; }
 
         /// <summary>
         /// 创建人Id
         /// </summary>
         [DataMember]
-        public string createuserId { get; set; }
+        public string? createuserId { get; set; }
 
         /// <summary>
         /// 创建人
         /// </summary>
         [DataMember]
-        public string createusername { get; set; }
+        public string? createusername { get; set; }
         /// <summary>
         /// 创建时间
         /// </summary>
@@ -67,7 +67,7 @@ namespace Elight.Logic.SystemModel
         public DateTime? createtime { get; set; } = DateTime.Now;
 
         [SqlSugar.SugarColumn(IsIgnore = true)]
-        public List<App_Sys_UnitTree> Child { get; set; }
+        public List<App_Sys_UnitTree>? Child { get; set; }
     }
 }
 

Elight.Logic/SystemModel/App_Sys_UserInput.cs

@@ -15,61 +15,61 @@ namespace Elight.Logic.SystemModel
         /// 表里用户唯一标识符，自增长Id
         /// </summary>
         [DataMember]
-        public string Id { get; set; }
+        public string? Id { get; set; }
 
         /// <summary>
         /// 单位编码
         /// </summary>
         [DataMember]
-        public string unitCode { get; set; }
+        public string? unitCode { get; set; }
 
         /// <summary>
         /// 部门
         /// </summary>
         [DataMember]
-        public string department { get; set; }
+        public string? department { get; set; }
 
         /// <summary>
         /// 密码
         /// </summary>
         [DataMember]
-        public string Password { get; set; }
+        public string? Password { get; set; }
 
         /// <summary>
         /// 名称
         /// </summary>
         [DataMember]
-        public string name { get; set; }
+        public string? name { get; set; }
 
         /// <summary>
         /// 职务
         /// </summary>
         [DataMember]
-        public string duties { get; set; }
+        public string? duties { get; set; }
 
         /// <summary>
         /// 电话号码
         /// </summary>
         [DataMember]
-        public string phone { get; set; }
+        public string? phone { get; set; }
 
         /// <summary>
         /// 身份
         /// </summary>
         [DataMember]
-        public string identity { get; set; }
+        public string? identity { get; set; }
 
         /// <summary>
         /// 身份证号码
         /// </summary>
         [DataMember]
-        public string cardId { get; set; }
+        public string? cardId { get; set; }
 
         /// <summary>
         /// 微信Id
         /// </summary>
         [DataMember]
-        public string wechatId { get; set; }
+        public string? wechatId { get; set; }
 
         /// <summary>
         /// 账号类型0：系统，1：APP
@@ -93,7 +93,7 @@ namespace Elight.Logic.SystemModel
         /// 头像地址
         /// </summary>
         [DataMember]
-        public string photo { get; set; }
+        public string? photo { get; set; }
 
         /// <summary>
         /// 性别 0:女 1:男

Elight.Utility/Paging.cs

@@ -102,13 +102,13 @@ namespace Elight.Utility.Code
         /// 排序名
         /// </summary>
         [DataMember]
-        public string SortName { get; set; }
+        public string? SortName { get; set; }
 
         /// <summary>
         /// 排序方式
         /// </summary>
         [DataMember]
-        public string SortType { get; set; }
+        public string? SortType { get; set; }
 
         /// <summary>
         /// 实名数量