♻️ feat(优化): 优化项目实体类和配置类位置

.vs/Bunny.WebApi/v17/DocumentLayout.json

@@ -1,92 +1,12 @@
 {
   "Version": 1,
-  "WorkspaceRootPath": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\",
+  "WorkspaceRootPath": "D:\\Project\\web\\Bunny-Cli\\template\\CSharp\\CSharp-Single-EFCore\\",
-  "Documents": [
+  "Documents": [],
-    {
-      "AbsoluteMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|d:\\myfolder\\bunny\\bunny-cli\\csharp\\csharp-single-efcore\\bunny.webapi\\config\\baseconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|solutionrelative:bunny.webapi\\config\\baseconfig.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|d:\\myfolder\\bunny\\bunny-cli\\csharp\\csharp-single-efcore\\bunny.webapi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|solutionrelative:bunny.webapi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|d:\\myfolder\\bunny\\bunny-cli\\csharp\\csharp-single-efcore\\bunny.webapi\\config\\serviceregistration.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|solutionrelative:bunny.webapi\\config\\serviceregistration.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|d:\\myfolder\\bunny\\bunny-cli\\csharp\\csharp-single-efcore\\bunny.webapi\\config\\knife4net.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{28753039-0C3B-4FE5-95F8-7EDC92DCBA26}|Bunny.WebApi\\Bunny.WebApi.csproj|solutionrelative:bunny.webapi\\config\\knife4net.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    }
-  ],
   "DocumentGroupContainers": [
     {
       "Orientation": 0,
       "VerticalTabListWidth": 256,
-      "DocumentGroups": [
+      "DocumentGroups": []
-        {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 4,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "Program.cs",
-              "DocumentMoniker": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Program.cs",
-              "RelativeDocumentMoniker": "Bunny.WebApi\\Program.cs",
-              "ToolTip": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Program.cs",
-              "RelativeToolTip": "Bunny.WebApi\\Program.cs",
-              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-09-02T00:54:57.227Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "ServiceRegistration.cs",
-              "DocumentMoniker": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Config\\ServiceRegistration.cs",
-              "RelativeDocumentMoniker": "Bunny.WebApi\\Config\\ServiceRegistration.cs",
-              "ToolTip": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Config\\ServiceRegistration.cs",
-              "RelativeToolTip": "Bunny.WebApi\\Config\\ServiceRegistration.cs",
-              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-09-02T00:54:44.07Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "Knife4Net.cs",
-              "DocumentMoniker": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Config\\Knife4Net.cs",
-              "RelativeDocumentMoniker": "Bunny.WebApi\\Config\\Knife4Net.cs",
-              "ToolTip": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Config\\Knife4Net.cs",
-              "RelativeToolTip": "Bunny.WebApi\\Config\\Knife4Net.cs",
-              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-09-02T00:54:28.202Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "BaseConfig.cs",
-              "DocumentMoniker": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Config\\BaseConfig.cs",
-              "RelativeDocumentMoniker": "Bunny.WebApi\\Config\\BaseConfig.cs",
-              "ToolTip": "D:\\MyFolder\\Bunny\\Bunny-cli\\CSharp\\CSharp-Single-EFCore\\Bunny.WebApi\\Config\\BaseConfig.cs",
-              "RelativeToolTip": "Bunny.WebApi\\Config\\BaseConfig.cs",
-              "ViewState": "AQIAABAAAAAAAAAAAAAowBwAAAARAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-09-02T00:54:22.184Z",
-              "EditorCaption": ""
-            }
-          ]
-        }
-      ]
     }
   ]
 }

Bunny.Common/Configuration/JsonDateTimeConverter.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Bunny.Dao.Model.Constant;
+using Bunny.Dao.Common.Constant;
 
-namespace Bunny.Common.Context;
+namespace Bunny.Common.Configuration;
 
 /// <summary>
 ///     自定义Json转换器，用于将DateTime类型转换为JSON格式

Bunny.Common/Context/Database/EFCoreContext.cs

@@ -3,7 +3,7 @@ using Bunny.Dao.Entity.Base;
 using Bunny.Dao.Entity.System;
 using Microsoft.EntityFrameworkCore;
 
-namespace Bunny.Common.Context;
+namespace Bunny.Common.Context.Database;
 
 /// <summary>
 ///     EfCore 连接内容

Bunny.Common/Context/Database/SoftDeleteQueryExtension.cs

@@ -3,7 +3,7 @@ using System.Reflection;
 using Bunny.Dao.Entity.Base;
 using Microsoft.EntityFrameworkCore.Metadata;
 
-namespace Bunny.Common.Context;
+namespace Bunny.Common.Context.Database;
 
 /// <summary>
 ///     软删除过滤器

Bunny.Common/Context/Middleware/MinioContext.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Minio;
 
-namespace Bunny.Common.Context;
+namespace Bunny.Common.Context.Middleware;
 
 public static class MinioContext
 {

Bunny.Common/Context/Middleware/RedisContext.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using StackExchange.Redis;
 
-namespace Bunny.Common.Context;
+namespace Bunny.Common.Context.Middleware;
 
 public static class RedisContext
 {

Bunny.Common/Filter/GlobalExceptionFilter.cs

@@ -1,6 +1,6 @@
 using Bunny.Common.Exception;
-using Bunny.Dao.Model.Constant;
+using Bunny.Dao.Common.Constant;
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;

Bunny.Common/Filter/ValidateModelStateAttribute.cs

@@ -1,5 +1,5 @@
 using System.Net;
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 

Bunny.Common/Interceptor/TransactionInterceptor.cs

@@ -1,5 +1,5 @@
 using Bunny.Common.Exception;
-using Bunny.Dao.Model.Constant;
+using Bunny.Dao.Common.Constant;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace Bunny.Common.Interceptor;

Bunny.Common/Migrations/20240902054644_InitialCreate.Designer.cs

@@ -1,6 +1,7 @@
 // <auto-generated />
 using System;
 using Bunny.Common.Context;
+using Bunny.Common.Context.Database;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;

Bunny.Common/Migrations/EfCoreContextModelSnapshot.cs

@@ -1,6 +1,7 @@
 // <auto-generated />
 using System;
 using Bunny.Common.Context;
+using Bunny.Common.Context.Database;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;

Bunny.Common/Utils/Jwt/JwtParseUtil.cs

@@ -1,7 +1,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using Bunny.Common.Exception;
-using Bunny.Dao.Model.Constant;
+using Bunny.Dao.Common.Constant;
 using Newtonsoft.Json;
 
 namespace Bunny.Common.Utils.Jwt;

Bunny.Common/Utils/MinioUtil.cs

@@ -1,6 +1,6 @@
-using Bunny.Common.Context;
+using Bunny.Common.Context.Middleware;
 using Bunny.Common.Exception;
-using Bunny.Dao.Model.Constant;
+using Bunny.Dao.Common.Constant;
 using Microsoft.AspNetCore.Http;
 using Microsoft.IdentityModel.Tokens;
 using Minio.DataModel;

Bunny.Common/Utils/Net/Response.cs

@@ -1,5 +1,5 @@
 using System.Net;
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bunny.Common.Utils.Net;

Bunny.Dao/Bunny.Dao.csproj

@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Model\"/>
+        <Folder Include="Common\"/>
     </ItemGroup>
 
 </Project>

Bunny.Dao/Common/Constant/ExceptionConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     错误常量

Bunny.Dao/Common/Constant/FileMessageConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     文件消息相关常量

Bunny.Dao/Common/Constant/LocalDateTimeConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     事件相关常量

Bunny.Dao/Common/Constant/MailMessageConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     邮箱消息先关常量

Bunny.Dao/Common/Constant/RedisConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     Redis相关常量

Bunny.Dao/Common/Constant/Result/ErrorConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant.Result;
+namespace Bunny.Dao.Common.Constant.Result;
 
 /// <summary>
 ///     发生时的错误敞亮

Bunny.Dao/Common/Constant/Result/SuccessConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant.Result;
+namespace Bunny.Dao.Common.Constant.Result;
 
 public class SuccessConstant
 {

Bunny.Dao/Common/Constant/SecurityConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     鉴权相关常量

Bunny.Dao/Common/Constant/SqlConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     数据库相关常量

Bunny.Dao/Common/Constant/StatusConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     状态相关常量

Bunny.Dao/Common/Constant/UserConstant.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Constant;
+namespace Bunny.Dao.Common.Constant;
 
 /// <summary>
 ///     用户相关常量

Bunny.Dao/Common/Enum/Enum.cs

@@ -0,0 +1,5 @@
+namespace Bunny.Dao.Common.Enum;
+
+public enum Enum
+{
+}

Bunny.Dao/Common/Result/Pagination.cs

@@ -1,4 +1,4 @@
-namespace Bunny.Dao.Model.Result;
+namespace Bunny.Dao.Common.Result;
 
 public class PageResult<T>
 {

Bunny.Dao/Common/Result/Result.cs

@@ -1,8 +1,8 @@
 using System.Net;
-using Bunny.Dao.Model.Constant.Result;
+using Bunny.Dao.Common.Constant.Result;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bunny.Dao.Model.Result;
+namespace Bunny.Dao.Common.Result;
 
 [Serializable]
 public class Result<T>(HttpStatusCode code, T? data, string? message)

Bunny.Dao/Model/Enum/Enum.cs

@@ -1,5 +0,0 @@
-namespace Bunny.Dao.Model.Enum;
-
-public enum Enum
-{
-}

Bunny.Service/Filter/AuthorizationFilter.cs

@@ -1,7 +1,7 @@
 using System.Net;
 using Bunny.Common.Utils.Jwt;
 using Bunny.Common.Utils.Net;
-using Bunny.Dao.Model.Constant;
+using Bunny.Dao.Common.Constant;
 using Bunny.Dao.Vo.User;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Filters;

Bunny.Service/IService/IBlogService.cs

@@ -1,6 +1,6 @@
-using Bunny.Dao.Dto.System;
+using Bunny.Dao.Common.Result;
+using Bunny.Dao.Dto.System;
 using Bunny.Dao.Entity.System;
-using Bunny.Dao.Model.Result;
 
 namespace Bunny.Service.IService;
 

Bunny.Service/IService/Service/BlogService.cs

@@ -1,8 +1,8 @@
-using Bunny.Common.Context;
+using Bunny.Common.Context.Database;
 using Bunny.Common.Utils.Net;
+using Bunny.Dao.Common.Result;
 using Bunny.Dao.Dto.System;
 using Bunny.Dao.Entity.System;
-using Bunny.Dao.Model.Result;
 using Microsoft.AspNetCore.Components;
 
 namespace Bunny.Service.IService.Service;

Bunny.Service/IService/Service/MinioService.cs

@@ -1,5 +1,5 @@
 using Bunny.Common;
-using Bunny.Common.Context;
+using Bunny.Common.Context.Middleware;
 using Microsoft.AspNetCore.Http;
 using Minio;
 using Minio.DataModel;

Bunny.Service/IService/Service/RedisOptionService.cs

@@ -1,4 +1,4 @@
-using Bunny.Common.Context;
+using Bunny.Common.Context.Middleware;
 using Bunny.Dao.Entity.System;
 using Newtonsoft.Json;
 using StackExchange.Redis;

Bunny.Test.Until/TestResultCodeEnum.cs

@@ -1,6 +1,6 @@
 using System.Net;
-using Bunny.Dao.Model.Constant;
+using Bunny.Dao.Common.Constant;
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Newtonsoft.Json;
 using NUnit.Framework;
 

Bunny.WebApi/Bunny.WebApi.csproj

@@ -19,30 +19,30 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <_WebToolingArtifacts Remove="Properties\launchSettings.json"/>
+        <_WebToolingArtifacts Remove="Properties\launchSettings.json" />
     </ItemGroup>
 
     <ItemGroup>
-        <Content Include="Properties\launchSettings.json"/>
+        <Content Include="Properties\launchSettings.json" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Autofac" Version="8.0.0"/>
+        <PackageReference Include="Autofac" Version="8.1.0" />
-        <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0"/>
+        <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
-        <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16"/>
+        <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
-        <PackageReference Include="log4net" Version="2.0.17"/>
+        <PackageReference Include="log4net" Version="2.0.17" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.6"/>
+        <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Bunny.Service\Bunny.Service.csproj"/>
+        <ProjectReference Include="..\Bunny.Service\Bunny.Service.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <_ContentIncludedByDefault Remove="Config\log4net.config"/>
+        <_ContentIncludedByDefault Remove="Config\log4net.config" />
-        <_ContentIncludedByDefault Remove="Config\NLog.config"/>
+        <_ContentIncludedByDefault Remove="Config\NLog.config" />
     </ItemGroup>
 
 </Project>

Bunny.WebApi/Configuration/AddAutofacConfig.cs

@@ -1,5 +1,5 @@
 using Autofac;
-using Bunny.Common.Context;
+using Bunny.Common.Context.Database;
 using Bunny.Service.IService;
 using Bunny.Service.IService.Service;
 using Microsoft.AspNetCore.Mvc;

Bunny.WebApi/Configuration/BaseConfig.cs

@@ -1,7 +1,8 @@
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Bunny.Common;
-using Bunny.Common.Context;
+using Bunny.Common.Configuration;
+using Bunny.Common.Context.Middleware;
 using Bunny.Service.WebSocket;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.DependencyInjection.Extensions;

Bunny.WebApi/Controllers/BlogController.cs

@@ -1,6 +1,6 @@
-using Bunny.Dao.Dto.System;
+using Bunny.Dao.Common.Result;
+using Bunny.Dao.Dto.System;
 using Bunny.Dao.Entity.System;
-using Bunny.Dao.Model.Result;
 using Bunny.Service.IService;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Mvc;

Bunny.WebApi/Controllers/CaptchaTestController.cs

@@ -1,5 +1,5 @@
-using Bunny.Dao.Model.Constant.Result;
+using Bunny.Dao.Common.Constant.Result;
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Lazy.Captcha.Core;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Mvc;

Bunny.WebApi/Controllers/JobInitController.cs

@@ -1,4 +1,4 @@
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Bunny.Service.IService;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Mvc;

Bunny.WebApi/Controllers/MinioController.cs

@@ -1,4 +1,4 @@
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Bunny.Service.IService;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Mvc;

Bunny.WebApi/Controllers/RedisController.cs

@@ -1,4 +1,4 @@
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Bunny.Service.IService;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Mvc;

Bunny.WebApi/Controllers/TemplateController.cs

@@ -1,4 +1,4 @@
-using Bunny.Dao.Model.Result;
+using Bunny.Dao.Common.Result;
 using Bunny.Service.IService;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Mvc;