更新1.8版本

ZhonTai.sln

@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Admin.Service
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Common", "src\shared\ZhonTai.Common\ZhonTai.Common.csproj", "{97D32A49-994C-44C5-A167-51E71D173B6F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Admin.Tests", "src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Tests\ZhonTai.Plate.Admin.Tests.csproj", "{69A9CD28-39CE-415E-8150-A4A876E708FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Admin.Tests", "src\tests\ZhonTai.Plate.Admin.Tests\ZhonTai.Plate.Admin.Tests.csproj", "{69A9CD28-39CE-415E-8150-A4A876E708FD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Tools", "src\shared\ZhonTai.Tools\ZhonTai.Tools.csproj", "{BDD8E9DB-896C-4340-A7E6-DFE341DE86C2}"
 EndProject
@@ -39,11 +39,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Personnel.Rep
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Personnel.Service", "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Service\ZhonTai.Plate.Personnel.Service.csproj", "{F10045F0-C9CD-4634-994F-D6B140B0A61E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Personnel.Tests", "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Tests\ZhonTai.Plate.Personnel.Tests.csproj", "{D312B1B5-1E0A-4C6A-8BDA-521688246822}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Personnel.Tests", "src\tests\ZhonTai.Plate.Personnel.Tests\ZhonTai.Plate.Personnel.Tests.csproj", "{D312B1B5-1E0A-4C6A-8BDA-521688246822}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Personnel.Service.Contracts", "src\plates\ZhonTai.Plate.Personal\ZhonTai.Plate.Personnel.Service.Contracts\ZhonTai.Plate.Personnel.Service.Contracts.csproj", "{0D1F06D6-EAF6-4792-AEFC-0FFB6D5B1A4F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZhonTai.Plate.Admin.Service.Contracts", "src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Service.Contracts\ZhonTai.Plate.Admin.Service.Contracts.csproj", "{93F13D77-3A26-4168-A0AA-9DDE96166359}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZhonTai.Plate.Admin.Service.Contracts", "src\plates\ZhonTai.Plate.Admin\ZhonTai.Plate.Admin.Service.Contracts\ZhonTai.Plate.Admin.Service.Contracts.csproj", "{93F13D77-3A26-4168-A0AA-9DDE96166359}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4A1F23C8-24A6-4571-B3DE-D27D024A051D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -125,7 +127,7 @@ Global
 		{8D651E7F-49D3-4D27-8486-ADCF000BB24D} = {8B9E8DFB-078E-465B-B56E-6921F79057F2}
 		{A2EFEFFC-39AD-48D2-8337-E6840B26023B} = {8B9E8DFB-078E-465B-B56E-6921F79057F2}
 		{97D32A49-994C-44C5-A167-51E71D173B6F} = {03F02E23-28CB-4F93-B09E-60AC9908C26C}
-		{69A9CD28-39CE-415E-8150-A4A876E708FD} = {8B9E8DFB-078E-465B-B56E-6921F79057F2}
+		{69A9CD28-39CE-415E-8150-A4A876E708FD} = {4A1F23C8-24A6-4571-B3DE-D27D024A051D}
 		{BDD8E9DB-896C-4340-A7E6-DFE341DE86C2} = {03F02E23-28CB-4F93-B09E-60AC9908C26C}
 		{4D034C30-CE3E-426D-84AE-68DF9EA50CC5} = {8B9E8DFB-078E-465B-B56E-6921F79057F2}
 		{F5ABCD82-9E7D-4AA6-9477-8779B76CDD02} = {8B9E8DFB-078E-465B-B56E-6921F79057F2}
@@ -135,7 +137,7 @@ Global
 		{B909562D-6924-41A3-A2C8-798FFA54956B} = {45D8B6F4-1B35-414B-BA2A-7365F81C4B7C}
 		{F40EC290-8860-4D78-AB59-7DEEED8D7483} = {45D8B6F4-1B35-414B-BA2A-7365F81C4B7C}
 		{F10045F0-C9CD-4634-994F-D6B140B0A61E} = {45D8B6F4-1B35-414B-BA2A-7365F81C4B7C}
-		{D312B1B5-1E0A-4C6A-8BDA-521688246822} = {45D8B6F4-1B35-414B-BA2A-7365F81C4B7C}
+		{D312B1B5-1E0A-4C6A-8BDA-521688246822} = {4A1F23C8-24A6-4571-B3DE-D27D024A051D}
 		{0D1F06D6-EAF6-4792-AEFC-0FFB6D5B1A4F} = {45D8B6F4-1B35-414B-BA2A-7365F81C4B7C}
 		{93F13D77-3A26-4168-A0AA-9DDE96166359} = {8B9E8DFB-078E-465B-B56E-6921F79057F2}
 	EndGlobalSection

src/hosts/ZhonTai.Plate.Admin.Host/ZhonTai.Plate.Admin.Host.csproj

@@ -48,13 +48,13 @@
     <PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.0" />
     <PackageReference Include="Caching.CSRedis" Version="3.6.60" />
     <PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.0.0" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.3" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.11" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />   
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 
   <ItemGroup>

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Base/FreeSqlRepositoryExtensions.cs

@@ -5,7 +5,6 @@ using ZhonTai.Common.Domain.Repositories;
 
 public static class FreeSqlDbContextExtensions
 {
-
     /// <summary>
     /// 返回默认仓库类
     /// </summary>

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Base/TransactionAsyncInterceptor.cs

@@ -1,5 +1,5 @@
 using ZhonTai.Common.Attributes;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using Castle.DynamicProxy;
 using FreeSql;
 using System.Linq;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/Attributes/ValidateInputAttribute.cs

@@ -1,10 +1,12 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;
-using ZhonTai.Common.Output;
+using System.Text;
+using ZhonTai.Common.Domain.Dto;
 
 namespace ZhonTai.Plate.Admin.HttpApi.Shared.Attributes
 {
@@ -21,9 +23,18 @@ namespace ZhonTai.Plate.Admin.HttpApi.Shared.Attributes
                 try
                 {
                     var logger = (ILogger<ValidateInputAttribute>)context.HttpContext.RequestServices.GetService(typeof(ILogger<ValidateInputAttribute>));
-                    var errorMessages = context.ModelState.Values.First().Errors.Select(a => a.ErrorMessage);
-                    logger.LogError(string.Join(",", errorMessages));
-                    context.Result = new JsonResult(ResponseOutput.NotOk(errorMessages.First()));
+                    var errors = context.ModelState
+                   .Where(m => m.Value.ValidationState == ModelValidationState.Invalid)
+                   .Select(m =>
+                   {
+                       var sb = new StringBuilder();
+                       sb.AppendFormat("{0}：", m.Key);
+                       sb.Append(m.Value.Errors.Select(n => n.ErrorMessage).Aggregate((x, y) => x + ";" + y));
+                       return sb.ToString();
+                   })
+                   .Aggregate((x, y) => x + "|" + y);
+                    logger.LogError(errors);
+                    context.Result = new JsonResult(ResponseOutput.NotOk(errors));
                 }
                 catch
                 {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/BaseStartup.cs

@@ -27,7 +27,7 @@ using Yitter.IdGenerator;
 //using FluentValidation.AspNetCore;
 using ZhonTai.Plate.Admin.HttpApi.Shared.Auth;
 using ZhonTai.Common.Auth;
-using ZhonTai.Common.Cache;
+using ZhonTai.Tools.Cache;
 using ZhonTai.Common.Configs;
 using ZhonTai.Common.Consts;
 using ZhonTai.Common.Helpers;
@@ -323,10 +323,10 @@ namespace ZhonTai.Plate.Admin.HttpApi.Shared
 
             services.AddControllers(options =>
             {
-                options.Filters.Add<AdminExceptionFilter>();
+                options.Filters.Add<ControllerExceptionFilter>();
                 if (_appConfig.Log.Operation)
                 {
-                    options.Filters.Add<LogActionFilter>();
+                    options.Filters.Add<ControllerLogFilter>();
                 }
                 //禁止去除ActionAsync后缀
                 options.SuppressAsyncSuffixInActionNames = false;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/Extensions/RateLimitServiceCollectionExtensions.cs

@@ -3,7 +3,7 @@ using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Redis;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using ZhonTai.Common.Configs;
+using ZhonTai.Tools.Cache;
 
 namespace ZhonTai.Plate.Admin.HttpApi.Shared.Extensions
 {
@@ -22,7 +22,7 @@ namespace ZhonTai.Plate.Admin.HttpApi.Shared.Extensions
             services.Configure<IpRateLimitOptions>(configuration.GetSection("IpRateLimiting"));
             services.Configure<IpRateLimitPolicies>(configuration.GetSection("IpRateLimitPolicies"));
 
-            if (cacheConfig.TypeRateLimit == Common.Cache.CacheType.Redis)
+            if (cacheConfig.TypeRateLimit == CacheType.Redis)
             {
                 //redis
                 var redisRateLimit = new CSRedis.CSRedisClient(cacheConfig.Redis.ConnectionStringRateLimit);

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/Filters/AdminExceptionFilter.cs → src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/Filters/ControllerExceptionFilter.cs

@@ -5,19 +5,19 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
 using ZhonTai.Common.Extensions;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 
 namespace ZhonTai.Plate.Admin.HttpApi.Shared.Filters
 {
     /// <summary>
-    /// Admin控制器异常错误过滤
+    /// 控制器异常处理
     /// </summary>
-    public class AdminExceptionFilter : IExceptionFilter, IAsyncExceptionFilter
+    public class ControllerExceptionFilter : IExceptionFilter, IAsyncExceptionFilter
     {
         private readonly IWebHostEnvironment _env;
-        private readonly ILogger<AdminExceptionFilter> _logger;
+        private readonly ILogger<ControllerExceptionFilter> _logger;
 
-        public AdminExceptionFilter(IWebHostEnvironment env, ILogger<AdminExceptionFilter> logger)
+        public ControllerExceptionFilter(IWebHostEnvironment env, ILogger<ControllerExceptionFilter> logger)
         {
             _env = env;
             _logger = logger;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/Filters/LogActionFilter.cs → src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/Filters/ControllerLogFilter.cs

@@ -6,11 +6,14 @@ using ZhonTai.Plate.Admin.HttpApi.Shared.Logs;
 
 namespace ZhonTai.Plate.Admin.HttpApi.Shared.Filters
 {
-    public class LogActionFilter : IAsyncActionFilter
+    /// <summary>
+    /// 控制器操作日志记录
+    /// </summary>
+    public class ControllerLogFilter : IAsyncActionFilter
     {
         private readonly ILogHandler _logHandler;
 
-        public LogActionFilter(ILogHandler logHandler)
+        public ControllerLogFilter(ILogHandler logHandler)
         {
             _logHandler = logHandler;
         }

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/Logs/LogHandler.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.OprationLog;
 using ZhonTai.Plate.Admin.Service.OprationLog.Input;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi.Shared/ZhonTai.Plate.Admin.HttpApi.Shared.csproj

@@ -7,13 +7,13 @@
 		<PackageReference Include="AspNetCoreRateLimit" Version="4.0.1" />
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
 		<PackageReference Include="Caching.CSRedis" Version="3.6.60" />
-		<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.3" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.9" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.11" />
 		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
 		<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
 		<PackageReference Include="Mapster" Version="7.2.0" />
 	</ItemGroup>
 	

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/ApiController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Api;
 using ZhonTai.Plate.Admin.Domain.Api;
 using ZhonTai.Plate.Admin.Service.Api.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/AuthController.cs

@@ -12,7 +12,7 @@ using ZhonTai.Common.Auth;
 using ZhonTai.Common.Consts;
 using ZhonTai.Common.Extensions;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Auth;
 using ZhonTai.Plate.Admin.Service.Auth.Input;
 using ZhonTai.Plate.Admin.Service.Auth.Output;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/CacheController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Cache;
 
 namespace ZhonTai.Plate.Admin.HttpApi

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/DictionaryController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Dictionary;
 using ZhonTai.Plate.Admin.Service.Dictionary;
 using ZhonTai.Plate.Admin.Service.Dictionary.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/DictionaryTypeController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.DictionaryType;
 using ZhonTai.Plate.Admin.Service.DictionaryType.Input;
 using ZhonTai.Plate.Admin.Domain.DictionaryType;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/DocumentController.cs

@@ -4,7 +4,7 @@ using System;
 using System.Threading.Tasks;
 using ZhonTai.Common.Configs;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Document;
 using ZhonTai.Plate.Admin.Service.Document.Input;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/LoginLogController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.LoginLog;
 using ZhonTai.Plate.Admin.Service.LoginLog;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/OprationLogController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.OprationLog;
 using ZhonTai.Plate.Admin.Service.OprationLog;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/PermissionController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Threading.Tasks;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Permission;
 using ZhonTai.Plate.Admin.Service.Permission.Input;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/RoleController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Role;
 using ZhonTai.Plate.Admin.Service.Role;
 using ZhonTai.Plate.Admin.Service.Role.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/TenantController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Tenant;
 using ZhonTai.Plate.Admin.Service.Tenant;
 using ZhonTai.Plate.Admin.Service.Tenant.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/UserController.cs

@@ -6,8 +6,7 @@ using ZhonTai.Plate.Admin.HttpApi.Shared.Attributes;
 using ZhonTai.Common.Auth;
 using ZhonTai.Common.Configs;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.User;
 using ZhonTai.Plate.Admin.Service.User.Input;
 using ZhonTai.Plate.Admin.Domain.User;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.HttpApi/Controllers/ViewController.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.View;
 using ZhonTai.Plate.Admin.Service.View;
 using ZhonTai.Plate.Admin.Service.View.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Repository/CustomGenerateData.cs

@@ -23,7 +23,6 @@ using ZhonTai.Plate.Admin.Domain.PermissionApi;
 using ZhonTai.Plate.Admin.Domain.View;
 using ZhonTai.Common.Configs;
 using ZhonTai.Common.Extensions;
-using ZhonTai.Plate.Admin.Domain;
 
 namespace ZhonTai.Plate.Admin.Repository
 {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Repository/CustomSyncData.cs

@@ -14,7 +14,6 @@ using ZhonTai.Plate.Admin.Domain.PermissionApi;
 using ZhonTai.Plate.Admin.Domain.View;
 using ZhonTai.Common.Configs;
 using ZhonTai.Plate.Admin.Domain.Dual;
-using ZhonTai.Plate.Admin.Domain;
 
 namespace ZhonTai.Plate.Admin.Repository
 {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Api/IApiService.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Admin.Domain.Api;
 using ZhonTai.Plate.Admin.Service.Api.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Auth/IAuthService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Admin.Service.Auth.Input;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Base/BaseService.cs

@@ -5,7 +5,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using MapsterMapper;
 using ZhonTai.Common.Auth;
-using ZhonTai.Common.Cache;
+using ZhonTai.Tools.Cache;
 using ZhonTai.Common.Extensions;
 
 namespace ZhonTai.Plate.Admin.Service

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Cache/ICacheService.cs

@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Cache
 {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Dictionary/IDictionaryService.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Admin.Domain.Dictionary;
 using ZhonTai.Plate.Admin.Service.Dictionary.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/DictionaryType/IDictionaryTypeService.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Admin.Domain.DictionaryType;
 using ZhonTai.Plate.Admin.Service.DictionaryType.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Document/IDocumentService.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Document.Input;
 
 namespace ZhonTai.Plate.Admin.Service.Document

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/LoginLog/ILoginLogService.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Admin.Domain.LoginLog;
 using ZhonTai.Plate.Admin.Service.LoginLog.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/OprationLog/IOprationLogService.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.OprationLog.Input;
 using ZhonTai.Plate.Admin.Domain.OprationLog;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Permission/IPermissionService.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Permission.Input;
 
 namespace ZhonTai.Plate.Admin.Service.Permission

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Role/IRoleService.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Role;
 using ZhonTai.Plate.Admin.Service.Role.Input;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/Tenant/ITenantService.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Tenant;
 using ZhonTai.Plate.Admin.Service.Tenant.Input;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/User/IUserService.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.User;
 using ZhonTai.Plate.Admin.Service.Auth.Output;
 using ZhonTai.Plate.Admin.Service.User.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service.Contracts/View/IViewService.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.View;
 using ZhonTai.Plate.Admin.Service.View.Input;
 

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Api/ApiService.cs

@@ -2,8 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Common.Attributes;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Api;
 using ZhonTai.Plate.Admin.Service.Api.Output;
 using ZhonTai.Plate.Admin.Service.Api.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Auth/AuthService.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using ZhonTai.Common.Cache;
+using ZhonTai.Tools.Cache;
 using ZhonTai.Common.Configs;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Tools.Captcha;
 using ZhonTai.Plate.Admin.Domain.Permission;
 using ZhonTai.Plate.Admin.Domain.User;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Cache/CacheService.cs

@@ -4,8 +4,8 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using ZhonTai.Common.Cache;
-using ZhonTai.Common.Output;
+using ZhonTai.Tools.Cache;
+using ZhonTai.Common.Domain.Dto;
 
 namespace ZhonTai.Plate.Admin.Service.Cache
 {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Dictionary/DictionaryService.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Dictionary;
 using ZhonTai.Plate.Admin.Service.Dictionary.Output;
 using ZhonTai.Plate.Admin.Service.Dictionary.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/DictionaryType/DictionaryTypeService.cs

@@ -1,8 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Common.Attributes;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.DictionaryType.Input;
 using ZhonTai.Plate.Admin.Service.DictionaryType.Output;
 using ZhonTai.Plate.Admin.Domain.DictionaryType;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Document/DocumentService.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Document;
 using ZhonTai.Plate.Admin.Domain.DocumentImage;
 using ZhonTai.Plate.Admin.Service.Document.Output;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/LoginLog/LoginLogService.cs

@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using System.Threading.Tasks;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.LoginLog;
 using ZhonTai.Plate.Admin.Service.LoginLog.Output;
 using ZhonTai.Plate.Admin.Service.LoginLog.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/OprationLog/OprationLogService.cs

@@ -1,8 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.OprationLog.Input;
 using ZhonTai.Plate.Admin.Service.OprationLog.Output;
 using ZhonTai.Plate.Admin.Domain.OprationLog;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Permission/PermissionService.cs

@@ -5,9 +5,9 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using ZhonTai.Common.Attributes;
 using ZhonTai.Common.Domain.Entities;
-using ZhonTai.Common.Cache;
+using ZhonTai.Tools.Cache;
 using ZhonTai.Common.Configs;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Service.Permission.Input;
 using ZhonTai.Plate.Admin.Service.Permission.Output;
 using ZhonTai.Plate.Admin.Domain.Permission;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Role/RoleService.cs

@@ -1,8 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Common.Domain.Repositories;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Role;
 using ZhonTai.Plate.Admin.Domain.RolePermission;
 using ZhonTai.Plate.Admin.Service.Role.Input;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/Tenant/TenantService.cs

@@ -3,8 +3,7 @@ using System.Threading.Tasks;
 using ZhonTai.Common.Attributes;
 using ZhonTai.Common.Domain.Repositories;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Role;
 using ZhonTai.Plate.Admin.Domain.RolePermission;
 using ZhonTai.Plate.Admin.Domain.Tenant;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/User/UserService.cs

@@ -2,12 +2,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Common.Attributes;
-using ZhonTai.Common.Cache;
+using ZhonTai.Tools.Cache;
 using ZhonTai.Common.Configs;
 using ZhonTai.Common.Domain.Repositories;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.Api;
 using ZhonTai.Plate.Admin.Domain.PermissionApi;
 using ZhonTai.Plate.Admin.Domain.Role;

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Service/View/ViewService.cs

@@ -2,8 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Common.Attributes;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Admin.Domain.View;
 using ZhonTai.Plate.Admin.Service.View.Input;
 using ZhonTai.Plate.Admin.Service.View.Output;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/Controllers/EmployeeController.cs

@@ -1,10 +1,10 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Employee;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Personnel.Service.Employee.Input;
 using ZhonTai.Plate.Personnel.Domain.Employee;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace ZhonTai.Plate.Personnel.HttpApi.Controllers
 {
@@ -26,7 +26,7 @@ namespace ZhonTai.Plate.Personnel.HttpApi.Controllers
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<IResponseOutput> Get(long id)
+        public async Task<IResponseOutput> Get([BindRequired] long id)
         {
             return await _employeeService.GetAsync(id);
         }

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/Controllers/OrganizationController.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Organization;
 using ZhonTai.Plate.Personnel.Service.Organization.Input;
 using Microsoft.AspNetCore.Mvc;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.HttpApi/Controllers/PositionController.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Position;
 using ZhonTai.Plate.Personnel.Service.Position.Input;
 using Microsoft.AspNetCore.Mvc;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Repository/CustomGenerateData.cs

@@ -11,7 +11,6 @@ using ZhonTai.Plate.Personnel.Domain.Position.Output;
 using ZhonTai.Plate.Personnel.Domain.Employee;
 using ZhonTai.Plate.Personnel.Domain.Employee.Output;
 using ZhonTai.Plate.Admin.Domain.Tenant;
-using ZhonTai.Plate.Admin.Domain;
 
 namespace ZhonTai.Plate.Personnel.Repository
 {

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Repository/CustomSyncData.cs

@@ -2,7 +2,6 @@
 using ZhonTai.Common.Domain.Db;
 using ZhonTai.Common.Configs;
 using ZhonTai.Plate.Admin.Domain.Dual;
-using ZhonTai.Plate.Admin.Domain;
 using ZhonTai.Plate.Personnel.Domain.Organization;
 using ZhonTai.Plate.Personnel.Domain.Position;
 using ZhonTai.Plate.Personnel.Domain.Employee;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/Employee/IEmployeeService.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Employee.Input;
 using ZhonTai.Plate.Personnel.Service.Employee.Output;
 using System.Threading.Tasks;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/Organization/IOrganizationService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Organization.Input;
 using System.Threading.Tasks;
 

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service.Contracts/Position/IPositionService.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Position.Input;
 using System.Threading.Tasks;
 using ZhonTai.Plate.Personnel.Domain.Position;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Employee/EmployeeService.cs

@@ -1,8 +1,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ZhonTai.Common.Attributes;
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Domain;
 using ZhonTai.Plate.Personnel.Service.Employee.Input;
 using ZhonTai.Plate.Personnel.Service.Employee.Output;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Organization/OrganizationService.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Organization.Input;
 using ZhonTai.Plate.Personnel.Service.Organization.Output;
 using System.Threading.Tasks;

src/plates/ZhonTai.Plate.Personal/ZhonTai.Plate.Personnel.Service/Position/PositionService.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Input;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using ZhonTai.Plate.Personnel.Service.Position.Input;
 using ZhonTai.Plate.Personnel.Service.Position.Output;
 using System.Threading.Tasks;

src/shared/ZhonTai.Common/Auth/User.cs

@@ -1,7 +1,7 @@
-using ZhonTai.Common.Domain.Entities;
-using ZhonTai.Common.Helpers;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using System;
+using ZhonTai.Common.Extensions;
+using ZhonTai.Common.Domain.Entities;
 
 namespace ZhonTai.Common.Auth
 {

src/shared/ZhonTai.Common/Auth/UserIdentiyServer.cs

@@ -1,5 +1,5 @@
-using ZhonTai.Common.Helpers;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
+using ZhonTai.Common.Extensions;
 
 namespace ZhonTai.Common.Auth
 {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Base/GenerateData.cs → src/shared/ZhonTai.Common/Domain/Db/GenerateData.cs

@@ -1,14 +1,12 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.IO;
 using Newtonsoft.Json;
 using FreeSql.DataAnnotations;
 using ZhonTai.Common.Helpers;
-using ZhonTai.Common.Domain.Db;
 using System.Collections.Generic;
 using Newtonsoft.Json.Serialization;
 
-namespace ZhonTai.Plate.Admin.Domain
+namespace ZhonTai.Common.Domain.Db
 {
     public abstract class GenerateData
     {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Domain/Base/SyncData.cs → src/shared/ZhonTai.Common/Domain/Db/SyncData.cs

@@ -8,7 +8,7 @@ using FreeSql.DataAnnotations;
 using ZhonTai.Common.Helpers;
 using ZhonTai.Common.Configs;
 
-namespace ZhonTai.Plate.Admin.Domain
+namespace ZhonTai.Common.Domain.Db
 {
     public abstract class SyncData
     {
@@ -68,7 +68,7 @@ namespace ZhonTai.Plate.Admin.Domain
                     return;
                 }
 
-                var repo = db.GetRepositoryBase<T>();
+                var repo = db.GetRepository<T>();
                 var insert = db.Insert<T>();
                 if (unitOfWork != null)
                 {

src/shared/ZhonTai.Common/Output/IResponseOutput.cs → src/shared/ZhonTai.Common/Domain/Dto/IResponseOutput.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace ZhonTai.Common.Output
+namespace ZhonTai.Common.Domain.Dto
 {
     /// <summary>
     /// 响应数据输出接口

src/shared/ZhonTai.Common/Output/OptionOutput.cs → src/shared/ZhonTai.Common/Domain/Dto/OptionOutput.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Common.Output
+namespace ZhonTai.Common.Domain.Dto
 {
     /// <summary>
     /// 下拉选项输出

src/shared/ZhonTai.Common/Input/PageInput.cs → src/shared/ZhonTai.Common/Domain/Dto/PageInput.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Common.Input
+namespace ZhonTai.Common.Domain.Dto
 {
     /// <summary>
     /// 分页信息输入

src/shared/ZhonTai.Common/Output/PageOutput.cs → src/shared/ZhonTai.Common/Domain/Dto/PageOutput.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ZhonTai.Common.Output
+namespace ZhonTai.Common.Domain.Dto
 {
     /// <summary>
     /// 分页信息输出

src/shared/ZhonTai.Common/Output/ResponseOutput.cs → src/shared/ZhonTai.Common/Domain/Dto/ResponseOutput.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace ZhonTai.Common.Output
+namespace ZhonTai.Common.Domain.Dto
 {
     /// <summary>
     /// 响应数据输出

src/shared/ZhonTai.Common/Extensions/DateTimeExtensions.cs → src/shared/ZhonTai.Common/Extensions/DateTimeExtension.cs

@@ -2,7 +2,7 @@
 
 namespace ZhonTai.Common.Extensions
 {
-    public static class DateTimeExtensions
+    public static class DateTimeExtension
     {
         /// <summary>
         /// 时间戳起始日期

src/shared/ZhonTai.Common/Extensions/DictionaryExtensions.cs → src/shared/ZhonTai.Common/Extensions/DictionaryExtension.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ZhonTai.Common.Extensions
 {
-    public static class DictionaryExtensions
+    public static class DictionaryExtension
     {
         public static TValue GetOrAdd<TKey, TValue>(
            this IDictionary<TKey, TValue> dictionary,

src/shared/ZhonTai.Common/Extensions/EnumExtensions.cs → src/shared/ZhonTai.Common/Extensions/EnumExtension.cs

@@ -1,4 +1,4 @@
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -7,7 +7,7 @@ using System.Reflection;
 
 namespace ZhonTai.Common.Extensions
 {
-    public static class EnumExtensions
+    public static class EnumExtension
     {
         public static string ToDescription(this Enum item)
         {

src/shared/ZhonTai.Common/Extensions/GuidExtensions.cs → src/shared/ZhonTai.Common/Extensions/GuidExtension.cs

@@ -2,7 +2,7 @@
 
 namespace ZhonTai.Common.Extensions
 {
-    public static class GuidExtensions
+    public static class GuidExtension
     {
         /// <summary>
         /// 判断Guid是否为空

src/shared/ZhonTai.Common/Extensions/ListExtensions.cs → src/shared/ZhonTai.Common/Extensions/ListExtension.cs

@@ -4,7 +4,7 @@ using System.Linq;
 
 namespace ZhonTai.Common.Extensions
 {
-    public static class ListExtensions
+    public static class ListExtension
     {
         /// <summary>
         /// 将列表转换为树形结构

src/shared/ZhonTai.Common/Extensions/MethodInfoExtensions.cs → src/shared/ZhonTai.Common/Extensions/MethodInfoExtension.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 
 namespace ZhonTai.Common.Extensions
 {
-    public static class MethodInfoExtensions
+    public static class MethodInfoExtension
     {
         public static bool HasAttribute<T>(this MethodInfo method)
         {

src/shared/ZhonTai.Common/Extensions/StringExtensions.cs → src/shared/ZhonTai.Common/Extensions/StringExtension.cs

@@ -1,12 +1,12 @@
-using ZhonTai.Common.Helpers;
-using System;
+using System;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using ZhonTai.Common.Extensions;
 
 namespace ZhonTai
 {
-    public static class StringExtensions
+    public static class StringExtension
     {
         /// <summary>
         /// 判断字符串是否为Null、空

src/shared/ZhonTai.Common/Helpers/UtilConvert.cs → src/shared/ZhonTai.Common/Extensions/UtilConvertExtension.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Text;
 
-namespace ZhonTai.Common.Helpers
+namespace ZhonTai.Common.Extensions
 {
     /// <summary>
     /// 数据类型转换
     /// </summary>
-    public static class UtilConvert
+    public static class UtilConvertExtension
     {
         public static int ToInt(this object thisValue)
         {
@@ -131,7 +131,7 @@ namespace ZhonTai.Common.Helpers
 
         public static DateTime ToDateTime(this long milliseconds)
         {
-            return Extensions.DateTimeExtensions.TimestampStart.AddMilliseconds(milliseconds);
+            return Extensions.DateTimeExtension.TimestampStart.AddMilliseconds(milliseconds);
         }
 
         public static bool ToBool(this object thisValue)

src/shared/ZhonTai.Common/Files/FileSize.cs

@@ -1,5 +1,4 @@
 using ZhonTai.Common.Extensions;
-using ZhonTai.Common.Helpers;
 
 namespace ZhonTai.Common.Files
 {

src/shared/ZhonTai.Common/Helpers/DESEncrypt.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
+using ZhonTai.Common.Extensions;
 
 namespace ZhonTai.Common.Helpers
 {

src/shared/ZhonTai.Common/Helpers/IPHelper.cs

@@ -45,53 +45,5 @@ namespace ZhonTai.Common.Helpers
 
             return ip;
         }
-
-        /// <summary>
-        /// 获得MAC地址
-        /// </summary>
-        /// <returns></returns>
-        public static string GetMACIp()
-        {
-            //本地计算机网络连接信息
-            //IPGlobalProperties computerProperties = IPGlobalProperties.GetIPGlobalProperties();
-            //获取本机电脑名
-            //var HostName = computerProperties.HostName;
-            //获取域名
-            //var DomainName = computerProperties.DomainName;
-
-            //获取本机所有网络连接
-            NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
-
-            if (nics == null || nics.Length < 1)
-            {
-                return "";
-            }
-
-            var MACIp = "";
-            foreach (NetworkInterface adapter in nics)
-            {
-                var adapterName = adapter.Name;
-
-                var adapterDescription = adapter.Description;
-                var NetworkInterfaceType = adapter.NetworkInterfaceType;
-                if (adapterName == "本地连接" || adapterName == "WLAN")
-                {
-                    PhysicalAddress address = adapter.GetPhysicalAddress();
-                    byte[] bytes = address.GetAddressBytes();
-
-                    for (int i = 0; i < bytes.Length; i++)
-                    {
-                        MACIp += bytes[i].ToString("X2");
-
-                        if (i != bytes.Length - 1)
-                        {
-                            MACIp += "-";
-                        }
-                    }
-                }
-            }
-
-            return MACIp;
-        }
     }
 }

src/shared/ZhonTai.Common/Helpers/MD5Encrypt.cs

@@ -1,5 +1,6 @@
 using System.Security.Cryptography;
 using System.Text;
+using ZhonTai.Common.Extensions;
 
 namespace ZhonTai.Common.Helpers
 {

src/shared/ZhonTai.Common/Helpers/Snowflake.cs

@@ -1,150 +0,0 @@
-using System;
-
-namespace ZhonTai.Common.Helpers
-{
-    public class Snowflake
-    {
-        //基准时间
-        private static long StartStmp = 1288834974657L;
-
-        //private const long START_STMP = 1480166465631L;
-        /*每一部分占用的位数*/
-
-        //机器标识位数
-        private const int MachineIdBits = 5;
-
-        //数据标志位数
-        private const int DatacenterIdBits = 5;
-
-        //序列号识位数
-        private const int SequenceBits = 12;
-
-        /* 每一部分的最大值*/
-
-        //机器ID最大值
-        private const long MaxMachineNum = -1L ^ (-1L << MachineIdBits);
-
-        //数据标志ID最大值
-        private const long MaxDatacenterNum = -1L ^ (-1L << DatacenterIdBits);
-
-        //序列号ID最大值
-        private const long MaxSequenceNum = -1L ^ (-1L << SequenceBits);
-
-        /*每一部分向左的位移*/
-
-        //机器ID偏左移12位
-        private const int MachineShift = SequenceBits;
-
-        //数据ID偏左移17位
-        private const int DatacenterIdShift = SequenceBits + MachineIdBits;
-
-        //时间毫秒左移22位
-        public const int TimestampLeftShift = SequenceBits + MachineIdBits + DatacenterIdBits;
-
-        private long _sequence = 0L;//序列号
-        private long _lastTimestamp = -1L;//上一次时间戳
-        public long MachineId { get; protected set; }//机器标识
-        public long DatacenterId { get; protected set; }//数据中心
-        //public long Sequence = 0L;//序列号
-        //{
-        //    get { return _sequence; }
-        //    internal set { _sequence = value; }
-        //}
-
-        private readonly DateTime Jan1st1970 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-        private readonly object _lock = new Object();
-
-        public Snowflake(long machineId, long datacenterId)
-        {
-            // 如果超出范围就抛出异常
-            if (machineId > MaxMachineNum || machineId < 0)
-            {
-                throw new ArgumentException(string.Format("machineId 必须大于0，MaxMachineNum： {0}", MaxMachineNum));
-            }
-
-            if (datacenterId > MaxDatacenterNum || datacenterId < 0)
-            {
-                throw new ArgumentException(string.Format("datacenterId必须大于0，且不能大于MaxDatacenterNum： {0}", MaxDatacenterNum));
-            }
-
-            //先检验再赋值
-            MachineId = machineId;
-            DatacenterId = datacenterId;
-            //_sequence = sequence;
-        }
-
-        //public static Init(long machineId, long datacenterId)
-        //{
-        //}
-        public long NextId()
-        {
-            lock (_lock)
-            {
-                var timestamp = TimeGen();
-                if (timestamp < _lastTimestamp)
-                {
-                    throw new Exception(string.Format("时间戳必须大于上一次生成ID的时间戳.  拒绝为{0}毫秒生成id", _lastTimestamp - timestamp));
-                }
-
-                //如果上次生成时间和当前时间相同,在同一毫秒内
-                if (_lastTimestamp == timestamp)
-                {
-                    //sequence自增，和sequenceMask相与一下，去掉高位
-                    _sequence = (_sequence + 1) & MaxSequenceNum;
-                    //判断是否溢出,也就是每毫秒内超过1024，当为1024时，与sequenceMask相与，sequence就等于0
-                    if (_sequence == 0L)
-                    {
-                        //等待到下一毫秒
-                        timestamp = TilNextMillis(_lastTimestamp);
-                    }
-                }
-                else
-                {
-                    //如果和上次生成时间不同,重置sequence，就是下一毫秒开始，sequence计数重新从0开始累加,
-                    //为了保证尾数随机性更大一些,最后一位可以设置一个随机数
-                    _sequence = 0L;//new Random().Next(10);
-                }
-
-                _lastTimestamp = timestamp;
-                return ((timestamp - StartStmp) << TimestampLeftShift) | (DatacenterId << DatacenterIdShift) | (MachineId << MachineShift) | _sequence;
-            }
-        }
-
-        // 防止产生的时间比之前的时间还要小（由于NTP回拨等问题）,保持增量的趋势.
-        protected virtual long TilNextMillis(long lastTimestamp)
-        {
-            var timestamp = TimeGen();
-            while (timestamp <= lastTimestamp)
-            {
-                timestamp = TimeGen();
-            }
-            return timestamp;
-        }
-
-        // 获取当前的时间戳
-        protected virtual long TimeGen()
-        {
-            //return TimeExtensions.CurrentTimeMillis();
-            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
-        }
-    }
-
-    public class IdWorkerHelper
-    {
-        private static Snowflake _idWorker = null;
-
-        private IdWorkerHelper()
-        {
-        }
-
-        static IdWorkerHelper()
-        {
-            _idWorker = new Snowflake(1, 1);
-        }
-
-        public static long GenId64()
-        {
-            return _idWorker.NextId();
-        }
-    }
-}

src/shared/ZhonTai.Common/Helpers/UploadHelper.cs

@@ -1,6 +1,6 @@
 using ZhonTai.Common.Attributes;
 using ZhonTai.Common.Configs;
-using ZhonTai.Common.Output;
+using ZhonTai.Common.Domain.Dto;
 using Microsoft.AspNetCore.Http;
 using System;
 using System.IO;
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using FileInfo = ZhonTai.Common.Files.FileInfo;
+using Yitter.IdGenerator;
 
 namespace ZhonTai.Common.Helpers
 {
@@ -61,7 +62,7 @@ namespace ZhonTai.Common.Helpers
                 Directory.CreateDirectory(fileInfo.FileDirectory);
             }
 
-            fileInfo.SaveName = $"{IdWorkerHelper.GenId64()}.{fileInfo.Extension}";
+            fileInfo.SaveName = $"{YitIdHelper.NextId()}.{fileInfo.Extension}";
 
             await SaveAsync(file, fileInfo.FilePath, cancellationToken);
 

src/shared/ZhonTai.Common/ZhonTai.Common.csproj

@@ -34,14 +34,14 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.12.2" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.13.1" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.12.2" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.12" />
 	<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
 	<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.0" />
-	<PackageReference Include="NLog" Version="4.7.11" />
+	<PackageReference Include="NLog" Version="4.7.12" />
 	<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
   </ItemGroup>
 

src/shared/ZhonTai.Common/Configs/CacheConfig.cs → src/shared/ZhonTai.Tools/Cache/CacheConfig.cs

@@ -1,6 +1,4 @@
-using ZhonTai.Common.Cache;
-
-namespace ZhonTai.Common.Configs
+namespace ZhonTai.Tools.Cache
 {
     /// <summary>
     /// 缓存配置

src/shared/ZhonTai.Common/Cache/CacheKey.cs → src/shared/ZhonTai.Tools/Cache/CacheKey.cs

@@ -1,11 +1,11 @@
 using System.ComponentModel;
 
-namespace ZhonTai.Common.Cache
+namespace ZhonTai.Tools.Cache
 {
     /// <summary>
     /// 缓存键
     /// </summary>
-    public static class CacheKey
+    public static partial class CacheKey
     {
         /// <summary>
         /// 验证码 admin:verify:code:guid

src/shared/ZhonTai.Common/Cache/CacheType.cs → src/shared/ZhonTai.Tools/Cache/CacheType.cs

@@ -1,4 +1,4 @@
-namespace ZhonTai.Common.Cache
+namespace ZhonTai.Tools.Cache
 {
     /// <summary>
     /// 缓存类型

src/shared/ZhonTai.Common/Cache/ICache.cs → src/shared/ZhonTai.Tools/Cache/ICache.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace ZhonTai.Common.Cache
+namespace ZhonTai.Tools.Cache
 {
     /// <summary>
     /// 缓存接口

src/shared/ZhonTai.Common/Cache/MemoryCache.cs → src/shared/ZhonTai.Tools/Cache/MemoryCache.cs

@@ -1,5 +1,4 @@
-using ZhonTai.Common.Helpers;
-using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Caching.Memory;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -7,8 +6,9 @@ using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using ZhonTai.Common.Extensions;
 
-namespace ZhonTai.Common.Cache
+namespace ZhonTai.Tools.Cache
 {
     /// <summary>
     /// 内存缓存

src/shared/ZhonTai.Common/Cache/RedisCache.cs → src/shared/ZhonTai.Tools/Cache/RedisCache.cs

@@ -2,7 +2,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace ZhonTai.Common.Cache
+namespace ZhonTai.Tools.Cache
 {
     /// <summary>
     /// Redis缓存

src/shared/ZhonTai.Tools/Captcha/Models/PointModel.cs → src/shared/ZhonTai.Tools/Captcha/Dto/PointDto.cs

@@ -1,6 +1,6 @@
 namespace ZhonTai.Tools.Captcha
 {
-    public class PointModel
+    public class PointDto
     {
         /// <summary>
         /// x坐标
@@ -12,7 +12,7 @@
         /// </summary>
         public int Y { get; set; }
 
-        public PointModel(int x, int y)
+        public PointDto(int x, int y)
         {
             X = x;
             Y = y;

src/shared/ZhonTai.Tools/Captcha/Models/SlideJigsawCaptchaModel.cs → src/shared/ZhonTai.Tools/Captcha/Dto/SlideJigsawCaptchaDto.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// 滑动验证
     /// </summary>
-    public class SlideJigsawCaptchaModel
+    public class SlideJigsawCaptchaDto
     {
         /// <summary>
         /// 滑块图

src/shared/ZhonTai.Tools/Captcha/SlideJigsawCaptcha.cs

@@ -1,5 +1,5 @@
 using ZhonTai.Common.Attributes;
-using ZhonTai.Common.Cache;
+using ZhonTai.Tools.Cache;
 using Newtonsoft.Json;
 using System;
 using System.Drawing;
@@ -295,7 +295,7 @@ namespace ZhonTai.Tools.Captcha
         /// <param name="templateWidth"></param>
         /// <param name="templateHeight"></param>
         /// <returns></returns>
-        private PointModel GeneratePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight)
+        private PointDto GeneratePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight)
         {
             Random random = new Random();
             int widthDifference = originalWidth - templateWidth;
@@ -320,7 +320,7 @@ namespace ZhonTai.Tools.Captcha
                 y = random.Next(originalHeight - templateHeight - 5) + 5;
             }
 
-            return new PointModel(x, y);
+            return new PointDto(x, y);
         }
 
         /// <summary>
@@ -333,7 +333,7 @@ namespace ZhonTai.Tools.Captcha
         /// <param name="blockX"></param>
         /// <param name="blockY"></param>
         /// <returns></returns>
-        private PointModel GenerateInterferencePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight, int blockX, int blockY)
+        private PointDto GenerateInterferencePoint(int originalWidth, int originalHeight, int templateWidth, int templateHeight, int blockX, int blockY)
         {
             int x;
             if (originalWidth - blockX - 5 > templateWidth * 2)
@@ -359,7 +359,7 @@ namespace ZhonTai.Tools.Captcha
                 y = GetRandomInt(5, blockY - templateHeight - 5);
             }
 
-            return new PointModel(x, y);
+            return new PointDto(x, y);
         }
 
         /// <summary>
@@ -391,7 +391,7 @@ namespace ZhonTai.Tools.Captcha
             int templateHeight = templateImage.Height;
 
             //随机生成拼图坐标
-            PointModel point = GeneratePoint(baseWidth, baseHeight, templateWidth, templateHeight);
+            PointDto point = GeneratePoint(baseWidth, baseHeight, templateWidth, templateHeight);
             int x = point.X;
             int y = point.Y;
 
@@ -399,7 +399,7 @@ namespace ZhonTai.Tools.Captcha
             string blockImageBase64 = "data:image/png;base64," + ImgToBase64String(CutByTemplate(baseImage, templateImage, x, y));
 
             //生成干扰图
-            PointModel interferencePoint = GenerateInterferencePoint(baseWidth, baseHeight, templateWidth, templateHeight, x, y);
+            PointDto interferencePoint = GenerateInterferencePoint(baseWidth, baseHeight, templateWidth, templateHeight, x, y);
             InterferenceByTemplate(baseImage, templateImage, interferencePoint.X, interferencePoint.Y);
 
             string baseImageBase64 = "data:image/png;base64," + ImgToBase64String(baseImage);
@@ -410,7 +410,7 @@ namespace ZhonTai.Tools.Captcha
             CaptchaOutput captchaData = new CaptchaOutput
             {
                 Token = token,
-                Data = new SlideJigsawCaptchaModel()
+                Data = new SlideJigsawCaptchaDto()
                 {
                     BlockImage = blockImageBase64,
                     BaseImage = baseImageBase64
@@ -439,7 +439,7 @@ namespace ZhonTai.Tools.Captcha
             {
                 try
                 {
-                    var point = JsonConvert.DeserializeObject<PointModel>(input.Data);
+                    var point = JsonConvert.DeserializeObject<PointDto>(input.Data);
                     var x = await _cache.GetAsync<int>(key);
                     if (Math.Abs(x - point.X) < 5)
                     {

src/plates/ZhonTai.Plate.Admin/ZhonTai.Plate.Admin.Tests/BaseControllerTest.cs → src/tests/ZhonTai.Plate.Admin.Tests/BaseControllerTest.cs

@@ -8,10 +8,10 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
-using ZhonTai.Common.Cache;
 using ZhonTai.Common.Configs;
 using ZhonTai.Tools.Captcha;
 using ZhonTai.Plate.Admin.Service.Auth.Input;
+using ZhonTai.Tools.Cache;
 
 namespace ZhonTai.Plate.Admin.Tests
 {