升级Orm FreeSql至3.2.651版本，其它Nuget包到当前最新版本。

滑块验证重写。支持linux

src/platform/ZhonTai.Admin/Core/Db/DBServiceCollectionExtensions.cs

@@ -24,7 +24,7 @@ namespace ZhonTai.Admin.Core.Db
         {
             services.AddScoped<DbUnitOfWorkManager>();
 
-            var dbConfig = new ConfigHelper().Get<DbConfig>("dbconfig", env.EnvironmentName);
+            var dbConfig = ConfigHelper.Get<DbConfig>("dbconfig", env.EnvironmentName);
 
             //创建数据库
             if (dbConfig.CreateDb)
@@ -57,7 +57,7 @@ namespace ZhonTai.Admin.Core.Db
             fsql.GlobalFilter.Apply<IEntitySoftDelete>("SoftDelete", a => a.IsDeleted == false);
 
             //配置实体
-            var appConfig = new ConfigHelper().Get<AppConfig>("appconfig", env.EnvironmentName);
+            var appConfig = ConfigHelper.Get<AppConfig>("appconfig", env.EnvironmentName);
             DbHelper.ConfigEntity(fsql, appConfig);
 
             #region 初始化数据库

src/platform/ZhonTai.Admin/Core/Db/SyncData.cs

@@ -91,7 +91,7 @@ namespace ZhonTai.Admin.Core.Db
                 }
                 else
                 {
-                    repo.DbContextOptions.EnableAddOrUpdateNavigateList = true;
+                    repo.DbContextOptions.EnableCascadeSave = true;
                     await repo.InsertAsync(data);
                 }
 

src/platform/ZhonTai.Admin/Core/HostApp.cs

@@ -77,7 +77,7 @@ namespace ZhonTai.Admin.Core
             var configuration = builder.Configuration;
 
             var configHelper = new ConfigHelper();
-            var appConfig = configHelper.Get<AppConfig>("appconfig", env.EnvironmentName) ?? new AppConfig();
+            var appConfig = ConfigHelper.Get<AppConfig>("appconfig", env.EnvironmentName) ?? new AppConfig();
 
             //应用配置
             services.AddSingleton(appConfig);
@@ -158,15 +158,15 @@ namespace ZhonTai.Admin.Core
 
            
             //数据库配置
-            var dbConfig = new ConfigHelper().Get<DbConfig>("dbconfig", env.EnvironmentName);
+            var dbConfig = ConfigHelper.Get<DbConfig>("dbconfig", env.EnvironmentName);
             services.AddSingleton(dbConfig);
             //添加IdleBus单例
             var timeSpan = dbConfig.IdleTime > 0 ? TimeSpan.FromMinutes(dbConfig.IdleTime) : TimeSpan.MaxValue;
-            IdleBus<IFreeSql> ib = new IdleBus<IFreeSql>(timeSpan);
+            var ib = new IdleBus<IFreeSql>(timeSpan);
             services.AddSingleton(ib);
 
             //上传配置
-            var uploadConfig = configHelper.Load("uploadconfig", env.EnvironmentName, true);
+            var uploadConfig = ConfigHelper.Load("uploadconfig", env.EnvironmentName, true);
             services.Configure<UploadConfig>(uploadConfig);
 
             #region Mapster 映射配置
@@ -217,7 +217,7 @@ namespace ZhonTai.Admin.Core
 
             #region 身份认证授权
 
-            var jwtConfig = configHelper.Get<JwtConfig>("jwtconfig", env.EnvironmentName);
+            var jwtConfig = ConfigHelper.Get<JwtConfig>("jwtconfig", env.EnvironmentName);
             services.TryAddSingleton(jwtConfig);
 
             if (appConfig.IdentityServer.Enable)
@@ -429,7 +429,7 @@ namespace ZhonTai.Admin.Core
 
             #region 缓存
 
-            var cacheConfig = configHelper.Get<CacheConfig>("cacheconfig", env.EnvironmentName);
+            var cacheConfig = ConfigHelper.Get<CacheConfig>("cacheconfig", env.EnvironmentName);
             if (cacheConfig.Type == CacheType.Redis)
             {
                 var csredis = new CSRedis.CSRedisClient(cacheConfig.Redis.ConnectionString);
@@ -478,7 +478,7 @@ namespace ZhonTai.Admin.Core
         /// <param name="app"></param>
         /// <param name="env"></param>
         /// <param name="appConfig"></param>
-        private void Configure(IApplicationBuilder app, IWebHostEnvironment env, AppConfig appConfig)
+        private static void Configure(IApplicationBuilder app, IWebHostEnvironment env, AppConfig appConfig)
         {
             //IP限流
             if (appConfig.RateLimit)

src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs

@@ -114,12 +114,13 @@ namespace ZhonTai.Admin.Services.Auth
                 return ResultOutput.NotOk("未登录！");
             }
 
-            var authUserInfoOutput = new AuthUserInfoOutput { };
-            //用户信息
-            authUserInfoOutput.User = await _userRepository.GetAsync<AuthUserProfileDto>(User.Id);
+            var authUserInfoOutput = new AuthUserInfoOutput
+            {
+                //用户信息
+                User = await _userRepository.GetAsync<AuthUserProfileDto>(User.Id),
 
-            //用户菜单
-            authUserInfoOutput.Menus = await _permissionRepository.Select
+                //用户菜单
+                Menus = await _permissionRepository.Select
                 .Where(a => new[] { PermissionTypeEnum.Group, PermissionTypeEnum.Menu }.Contains(a.Type))
                 .Where(a =>
                     _permissionRepository.Orm.Select<RolePermissionEntity>()
@@ -129,10 +130,10 @@ namespace ZhonTai.Admin.Services.Auth
                 )
                 .OrderBy(a => a.ParentId)
                 .OrderBy(a => a.Sort)
-                .ToListAsync(a => new AuthUserMenuDto { ViewPath = a.View.Path });
+                .ToListAsync(a => new AuthUserMenuDto { ViewPath = a.View.Path }),
 
-            //用户权限点
-            authUserInfoOutput.Permissions = await _permissionRepository.Select
+                //用户权限点
+                Permissions = await _permissionRepository.Select
                 .Where(a => a.Type == PermissionTypeEnum.Dot)
                 .Where(a =>
                     _permissionRepository.Orm.Select<RolePermissionEntity>()
@@ -140,7 +141,8 @@ namespace ZhonTai.Admin.Services.Auth
                     .Where(b => b.PermissionId == a.Id)
                     .Any()
                 )
-                .ToListAsync(a => a.Code);
+                .ToListAsync(a => a.Code)
+            };
 
             return ResultOutput.Ok(authUserInfoOutput);
         }
@@ -227,22 +229,21 @@ namespace ZhonTai.Admin.Services.Auth
 
             #region 添加登录日志
 
-            var loginLogAddInput = new LoginLogAddInput()
+            var loginLogAddInput = new LoginLogAddInput
             {
                 CreatedUserName = input.UserName,
                 ElapsedMilliseconds = sw.ElapsedMilliseconds,
-                Status = true
+                Status = true,
+                CreatedUserId = authLoginOutput.Id,
+                NickName = authLoginOutput.NickName,
+                TenantId = authLoginOutput.TenantId
             };
 
-            loginLogAddInput.CreatedUserId = authLoginOutput.Id;
-            loginLogAddInput.NickName = authLoginOutput.NickName;
-            loginLogAddInput.TenantId = authLoginOutput.TenantId;
-
             await LazyGetRequiredService<ILoginLogService>().AddAsync(loginLogAddInput);
 
             #endregion 添加登录日志
 
-            return ResultOutput.Ok(new { token = token });
+            return ResultOutput.Ok(new { token });
         }
 
         /// <summary>

src/platform/ZhonTai.Admin/Tools/Captcha/SlideJigsawCaptchaTool.cs

@@ -1,12 +1,16 @@
-using ZhonTai.Admin.Tools.Cache;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Threading.Tasks;
+using System.Collections.Generic;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.Drawing;
+using SixLabors.ImageSharp.PixelFormats;
 using ZhonTai.Admin.Core.Attributes;
+using ZhonTai.Admin.Tools.Cache;
 
 /*
 Linux下Ubuntu如果报Gdip错误，需要按照以下步骤操作
@@ -29,253 +33,6 @@ namespace ZhonTai.Admin.Tools.Captcha
             _cache = cache;
         }
 
-        /// <summary>
-        /// Bitmap转为base64编码的文本
-        /// </summary>
-        /// <param name="bmp"></param>
-        /// <returns></returns>
-        private string ImgToBase64String(Bitmap bmp)
-        {
-            try
-            {
-                MemoryStream ms = new MemoryStream();
-                bmp.Save(ms, ImageFormat.Png);
-                byte[] arr = new byte[ms.Length];
-                ms.Position = 0;
-                ms.Read(arr, 0, (int)ms.Length);
-                ms.Close();
-                return Convert.ToBase64String(arr);
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// 读取像素
-        /// </summary>
-        /// <param name="img"></param>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <param name="pixels"></param>
-        private void ReadPixel(Bitmap img, int x, int y, int[] pixels)
-        {
-            int xStart = x - 1;
-            int yStart = y - 1;
-            int current = 0;
-            for (int i = xStart; i < 3 + xStart; i++)
-            {
-                for (int j = yStart; j < 3 + yStart; j++)
-                {
-                    int tx = i;
-                    if (tx < 0)
-                    {
-                        tx = -tx;
-
-                    }
-                    else if (tx >= img.Width)
-                    {
-                        tx = x;
-                    }
-                    int ty = j;
-                    if (ty < 0)
-                    {
-                        ty = -ty;
-                    }
-                    else if (ty >= img.Height)
-                    {
-                        ty = y;
-                    }
-                    pixels[current++] = img.GetPixel(tx, ty).ToArgb();
-
-                }
-            }
-        }
-
-        private void FillMatrix(int[][] matrix, int[] values)
-        {
-            int filled = 0;
-            for (int i = 0; i < matrix.Length; i++)
-            {
-                int[] x = matrix[i];
-                for (int j = 0; j < x.Length; j++)
-                {
-                    x[j] = values[filled++];
-                }
-            }
-        }
-
-        private Color AvgMatrix(int[][] matrix)
-        {
-            int r = 0;
-            int g = 0;
-            int b = 0;
-            for (int i = 0; i < matrix.Length; i++)
-            {
-                int[] x = matrix[i];
-                for (int j = 0; j < x.Length; j++)
-                {
-                    if (j == 1)
-                    {
-                        continue;
-                    }
-                    Color c = Color.FromArgb(x[j]);
-                    r += c.R;
-                    g += c.G;
-                    b += c.B;
-                }
-            }
-            return Color.FromArgb(r / 8, g / 8, b / 8);
-        }
-
-        /// <summary>
-        /// 根据模板生成拼图
-        /// </summary>
-        /// <param name="baseImage"></param>
-        /// <param name="templateImage"></param>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns></returns>
-        private Bitmap CutByTemplate(Bitmap baseImage, Bitmap templateImage, int x, int y)
-        {
-            //生成透明背景图
-            Bitmap newImage = new Bitmap(templateImage.Width, baseImage.Height);
-            for (int i = 0, newImageWidth = templateImage.Width; i < newImageWidth; i++)
-            {
-                for (int j = 0, newImageHeight = baseImage.Height; j < newImageHeight; j++)
-                {
-                    newImage.SetPixel(i, j, Color.FromArgb(0,0,0,0));
-                }
-            }
-
-            // 临时数组遍历用于高斯模糊存周边像素值
-            int[] values = new int[9];
-            int[][] martrix = { new int[3], new int[3], new int[3] };
-
-            int xLength = templateImage.Width;
-            int yLength = templateImage.Height;
-            // 模板图像宽度
-            for (int i = 0; i < xLength; i++)
-            {
-                // 模板图片高度
-                for (int j = 0; j < yLength; j++)
-                {
-                    // 如果模板图像当前像素点不是透明色 copy源文件信息到目标图片中
-                    int rgb = templateImage.GetPixel(i, j).ToArgb();
-                    if (rgb < 0)
-                    {
-                        Color oriImageColor = baseImage.GetPixel(x + i, y + j);
-
-                        newImage.SetPixel(i, y + j, oriImageColor);
-
-                        //抠图区域半透明
-                        //baseImage.SetPixel(x + i, y + j, Color.FromArgb(120, oriImageColor.R, oriImageColor.G, oriImageColor.B));
-
-                        //抠图区域高斯模糊
-                        ReadPixel(baseImage, x + i, y + j, values);
-                        FillMatrix(martrix, values);
-                        baseImage.SetPixel(x + i, y + j, AvgMatrix(martrix));
-                    }
-
-                    //防止数组越界判断
-                    if (i == (xLength - 1) || j == (yLength - 1))
-                    {
-                        continue;
-                    }
-
-                    int rightRgb = templateImage.GetPixel(i + 1, j).ToArgb();
-                    int downRgb = templateImage.GetPixel(i, j + 1).ToArgb();
-                    //描边处理，,取带像素和无像素的界点，判断该点是不是临界轮廓点,如果是设置该坐标像素是白色
-                    if ((rgb >= 0 && rightRgb < 0) || (rgb < 0 && rightRgb >= 0) || (rgb >= 0 && downRgb < 0) || (rgb < 0 && downRgb >= 0))
-                    {
-                        newImage.SetPixel(i, y + j, Color.White);
-                        baseImage.SetPixel(x + i, y + j, Color.White);
-                    }
-                }
-            }
-            return newImage;
-        }
-
-        /// <summary>
-        /// 根据模板生成干扰图
-        /// </summary>
-        /// <param name="baseImage"></param>
-        /// <param name="templateImage"></param>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        private void InterferenceByTemplate(Bitmap baseImage, Bitmap templateImage, int x, int y)
-        {
-            // 临时数组遍历用于高斯模糊存周边像素值
-            int[][] martrix = { new int[3], new int[3], new int[3] };
-            int[] values = new int[9];
-
-            int xLength = templateImage.Width;
-            int yLength = templateImage.Height;
-            // 模板图像宽度
-            for (int i = 0; i < xLength; i++)
-            {
-                // 模板图片高度
-                for (int j = 0; j < yLength; j++)
-                {
-                    // 如果模板图像当前像素点不是透明色 copy源文件信息到目标图片中
-                    int rgb = templateImage.GetPixel(i, j).ToArgb();
-                    if (rgb < 0)
-                    {
-                        Color oriImageColor = baseImage.GetPixel(x + i, y + j);
-
-                        //抠图区域半透明
-                        //baseImage.SetPixel(x + i, y + j, Color.FromArgb(120, oriImageColor.R, oriImageColor.G, oriImageColor.B));
-
-                        //抠图区域高斯模糊
-                        ReadPixel(baseImage, x + i, y + j, values);
-                        FillMatrix(martrix, values);
-                        baseImage.SetPixel(x + i, y + j, AvgMatrix(martrix));
-                    }
-
-                    //防止数组越界判断
-                    if (i == (xLength - 1) || j == (yLength - 1))
-                    {
-                        continue;
-                    }
-
-                    int rightRgb = templateImage.GetPixel(i + 1, j).ToArgb();
-                    int downRgb = templateImage.GetPixel(i, j + 1).ToArgb();
-                    //描边处理，,取带像素和无像素的界点，判断该点是不是临界轮廓点,如果是设置该坐标像素是白色
-                    if ((rgb >= 0 && rightRgb < 0) || (rgb < 0 && rightRgb >= 0) || (rgb >= 0 && downRgb < 0) || (rgb < 0 && downRgb >= 0))
-                    {
-                        baseImage.SetPixel(x + i, y + j, Color.White);
-                    }
-                }
-            }
-        }
-        
-        /// <summary>
-        /// 更改图片尺寸
-        /// </summary>
-        /// <param name="bmp"></param>
-        /// <param name="width"></param>
-        /// <param name="height"></param>
-        /// <returns></returns>
-        private Bitmap ResizeImage(Bitmap bmp, int width, int height)
-        {
-            try
-            {
-                Bitmap b = new Bitmap(width, height);
-                Graphics g = Graphics.FromImage(b);
-                // 图画质量
-                g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-                g.DrawImage(bmp, new Rectangle(0, 0, width, height), new Rectangle(0, 0, bmp.Width, bmp.Height), GraphicsUnit.Pixel);
-                g.Dispose();
-
-                return b;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
         /// <summary>
         /// 随机范围内数字
         /// </summary>
@@ -362,6 +119,40 @@ namespace ZhonTai.Admin.Tools.Captcha
             return new PointModel(x, y);
         }
 
+        private static ComplexPolygon CalcBlockShape(Image<Rgba32> holeTemplateImage)
+        {
+            int temp = 0;
+            var pathList = new List<IPath>();
+            holeTemplateImage.ProcessPixelRows(accessor =>
+            {
+                for (int y = 0; y < holeTemplateImage.Height; y++)
+                {
+                    var rowSpan = accessor.GetRowSpan(y);
+                    for (int x = 0; x < rowSpan.Length; x++)
+                    {
+                        ref Rgba32 pixel = ref rowSpan[x];
+                        if (pixel.A != 0)
+                        {
+                            if (temp == 0)
+                            {
+                                temp = x;
+                            }
+                        }
+                        else
+                        {
+                            if (temp != 0)
+                            {
+                                pathList.Add(new RectangularPolygon(temp, y, x - temp, 1));
+                                temp = 0;
+                            }
+                        }
+                    }
+                }
+            });
+
+            return new ComplexPolygon(new PathCollection(pathList));
+        }
+
         /// <summary>
         /// 获得验证数据
         /// </summary>
@@ -372,53 +163,60 @@ namespace ZhonTai.Admin.Tools.Captcha
             //var client = new HttpClient();
             //var stream = await client.GetStreamAsync("https://picsum.photos/310/155");
             //client.Dispose();
-            //Bitmap baseImage = new Bitmap(stream);
-            //stream.Dispose();
 
-            var oriImage = Image.FromFile($@"{Directory.GetCurrentDirectory()}\wwwroot\captcha\jigsaw\{new Random().Next(1, 4)}.jpg".ToPath());
-            //更改图片尺寸
-            //Bitmap baseImage = ResizeImage(oriImage, 310, 155);
-            Bitmap baseImage = new Bitmap(oriImage);
-            oriImage.Dispose();
-
-            var oriTemplate = Image.FromFile($@"{Directory.GetCurrentDirectory()}\wwwroot\captcha\jigsaw\templates\{new Random().Next(1, 7)}.png".ToPath());
-            Bitmap templateImage = new Bitmap(oriTemplate);
-            oriTemplate.Dispose();
+            //底图
+            using var baseImage = await Image.LoadAsync<Rgba32>($@"{Directory.GetCurrentDirectory()}\wwwroot\captcha\jigsaw\{new Random().Next(1, 4)}.jpg".ToPath());
+            //模板图
+            using var templateImage = await Image.LoadAsync<Rgba32>($@"{Directory.GetCurrentDirectory()}\wwwroot\captcha\jigsaw\templates\{new Random().Next(1, 7)}.png".ToPath());
 
             int baseWidth = baseImage.Width;
             int baseHeight = baseImage.Height;
             int templateWidth = templateImage.Width;
             int templateHeight = templateImage.Height;
 
+            //拼图
+            using var blockImage = new Image<Rgba32>(templateWidth, templateHeight);
+            //滑块拼图
+            using var sliderBlockImage = new Image<Rgba32>(templateWidth, baseHeight);
+
             //随机生成拼图坐标
-            PointModel point = GeneratePoint(baseWidth, baseHeight, templateWidth, templateHeight);
-            int x = point.X;
-            int y = point.Y;
+            PointModel blockPoint = GeneratePoint(baseWidth, baseHeight, templateWidth, templateHeight);
 
+            //根据模板图计算轮廓
+            var blockShape = CalcBlockShape(templateImage);
             //生成拼图
-            string blockImageBase64 = "data:image/png;base64," + ImgToBase64String(CutByTemplate(baseImage, templateImage, x, y));
+            blockImage.Mutate(x =>
+            {
+                x.Clip(blockShape, p => p.DrawImage(baseImage, new Point(-blockPoint.X, -blockPoint.Y), 1));
+            });
+            //叠加拼图
+            //blockImage.Mutate(x => x.DrawImage(templateImage, new Point(0, 0), 1));
+
+            //生成滑块拼图
+            sliderBlockImage.Mutate(x => x.DrawImage(blockImage, new Point(0, blockPoint.Y), 1));
+
+            //生成拼图底图
+            baseImage.Mutate(x => x.DrawImage(templateImage, new Point(blockPoint.X, blockPoint.Y), (float)0.5));
 
-            //生成干扰图
-            PointModel interferencePoint = GenerateInterferencePoint(baseWidth, baseHeight, templateWidth, templateHeight, x, y);
-            InterferenceByTemplate(baseImage, templateImage, interferencePoint.X, interferencePoint.Y);
+            //生成干扰图坐标
+            PointModel interferencePoint = GenerateInterferencePoint(baseWidth, baseHeight, templateWidth, templateHeight, blockPoint.X, blockPoint.Y);
 
-            string baseImageBase64 = "data:image/png;base64," + ImgToBase64String(baseImage);
-            templateImage.Dispose();
-            baseImage.Dispose();
+            //生成干扰图底图
+            baseImage.Mutate(x => x.DrawImage(templateImage, new Point(interferencePoint.X, interferencePoint.Y), (float)0.5));
 
             var token = Guid.NewGuid().ToString();
-            CaptchaOutput captchaData = new CaptchaOutput
+            var captchaData = new CaptchaOutput
             {
                 Token = token,
                 Data = new SlideJigsawCaptchaDto()
                 {
-                    BlockImage = blockImageBase64,
-                    BaseImage = baseImageBase64
+                    BaseImage = baseImage.ToBase64String(PngFormat.Instance),
+                    BlockImage = sliderBlockImage.ToBase64String(PngFormat.Instance)
                 }
             };
 
             var key = string.Format(captchaKey, token);
-            await _cache.SetAsync(key, point.X);
+            await _cache.SetAsync(key, blockPoint.X);
 
             return captchaData;
         }

src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj

@@ -1,47 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Description>中台Admin接口库</Description>
-  </PropertyGroup>
+	<PropertyGroup>
+		<Description>中台Admin接口库</Description>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>ZhonTai.Admin.xml</DocumentationFile>
-    <NoWarn>1701;1702;1591</NoWarn>
-  </PropertyGroup>
-	
-    <ItemGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DocumentationFile>ZhonTai.Admin.xml</DocumentationFile>
+		<NoWarn>1701;1702;1591</NoWarn>
+	</PropertyGroup>
+
+	<ItemGroup>
 		<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
 		<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
-		<PackageReference Include="CSRedisCore" Version="3.6.9" />
-		<PackageReference Include="Caching.CSRedis" Version="3.6.90" />
-		<PackageReference Include="FluentValidation.AspNetCore" Version="10.4.0" />
-		<PackageReference Include="FreeSql" Version="3.2.500" />
-		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.500" />
-		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.500" />
-		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.500" />
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.500" />
-		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.500" />
-		<PackageReference Include="FreeSql.Repository" Version="3.2.500" />
+		<PackageReference Include="CSRedisCore" Version="3.8.1" />
+		<PackageReference Include="Caching.CSRedis" Version="3.8.1" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="11.0.1" />
+		<PackageReference Include="FreeSql" Version="3.2.651" />
+		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.651" />
+		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.651" />
+		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.651" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.651" />
+		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.651" />
+		<PackageReference Include="FreeSql.Repository" Version="3.2.651" />
 		<PackageReference Include="IdleBus" Version="1.5.2" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
-	    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
+		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
-		<PackageReference Include="NLog" Version="4.7.15" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
+		<PackageReference Include="NLog" Version="5.0.0" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
+		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.18.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.12" />
-    </ItemGroup>
-	
-    <ItemGroup>
-      <ProjectReference Include="..\ZhonTai.ApiUI\ZhonTai.ApiUI.csproj" />
-      <ProjectReference Include="..\ZhonTai.Common\ZhonTai.Common.csproj" />
-      <ProjectReference Include="..\ZhonTai.DynamicApi\ZhonTai.DynamicApi.csproj" />
-    </ItemGroup>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\ZhonTai.ApiUI\ZhonTai.ApiUI.csproj" />
+		<ProjectReference Include="..\ZhonTai.Common\ZhonTai.Common.csproj" />
+		<ProjectReference Include="..\ZhonTai.DynamicApi\ZhonTai.DynamicApi.csproj" />
+	</ItemGroup>
 
 </Project>

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -6241,50 +6241,6 @@
             滑块拼图验证
             </summary>
         </member>
-        <member name="M:ZhonTai.Admin.Tools.Captcha.SlideJigsawCaptchaTool.ImgToBase64String(System.Drawing.Bitmap)">
-            <summary>
-            Bitmap转为base64编码的文本
-            </summary>
-            <param name="bmp"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Tools.Captcha.SlideJigsawCaptchaTool.ReadPixel(System.Drawing.Bitmap,System.Int32,System.Int32,System.Int32[])">
-            <summary>
-            读取像素
-            </summary>
-            <param name="img"></param>
-            <param name="x"></param>
-            <param name="y"></param>
-            <param name="pixels"></param>
-        </member>
-        <member name="M:ZhonTai.Admin.Tools.Captcha.SlideJigsawCaptchaTool.CutByTemplate(System.Drawing.Bitmap,System.Drawing.Bitmap,System.Int32,System.Int32)">
-            <summary>
-            根据模板生成拼图
-            </summary>
-            <param name="baseImage"></param>
-            <param name="templateImage"></param>
-            <param name="x"></param>
-            <param name="y"></param>
-            <returns></returns>
-        </member>
-        <member name="M:ZhonTai.Admin.Tools.Captcha.SlideJigsawCaptchaTool.InterferenceByTemplate(System.Drawing.Bitmap,System.Drawing.Bitmap,System.Int32,System.Int32)">
-            <summary>
-            根据模板生成干扰图
-            </summary>
-            <param name="baseImage"></param>
-            <param name="templateImage"></param>
-            <param name="x"></param>
-            <param name="y"></param>
-        </member>
-        <member name="M:ZhonTai.Admin.Tools.Captcha.SlideJigsawCaptchaTool.ResizeImage(System.Drawing.Bitmap,System.Int32,System.Int32)">
-            <summary>
-            更改图片尺寸
-            </summary>
-            <param name="bmp"></param>
-            <param name="width"></param>
-            <param name="height"></param>
-            <returns></returns>
-        </member>
         <member name="M:ZhonTai.Admin.Tools.Captcha.SlideJigsawCaptchaTool.GetRandomInt(System.Int32,System.Int32)">
             <summary>
             随机范围内数字

src/platform/ZhonTai.Common/Extensions/DateTimeExtension.cs

@@ -7,7 +7,7 @@ namespace ZhonTai.Common.Extensions
         /// <summary>
         /// 时间戳起始日期
         /// </summary>
-        public static DateTime TimestampStart = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+        public static readonly DateTime TimestampStart = new(1970, 1, 1, 0, 0, 0, 0);
 
         /// <summary>
         /// 转换为时间戳

src/platform/ZhonTai.Common/Helpers/ConfigHelper.cs

@@ -28,7 +28,7 @@ namespace ZhonTai.Common.Helpers
         /// <param name="optional">可选</param>
         /// <param name="reloadOnChange">自动更新</param>
         /// <returns></returns>
-        public IConfiguration Load(string fileName, string environmentName = "", bool optional = true, bool reloadOnChange = false)
+        public static IConfiguration Load(string fileName, string environmentName = "", bool optional = true, bool reloadOnChange = false)
         {
             var filePath = Path.Combine(AppContext.BaseDirectory, "configs");
             if (!Directory.Exists(filePath))
@@ -55,7 +55,7 @@ namespace ZhonTai.Common.Helpers
         /// <param name="optional">可选</param>
         /// <param name="reloadOnChange">自动更新</param>
         /// <returns></returns>
-        public T Get<T>(string fileName, string environmentName = "", bool optional = true, bool reloadOnChange = false)
+        public static T Get<T>(string fileName, string environmentName = "", bool optional = true, bool reloadOnChange = false)
         {
             var configuration = Load(fileName, environmentName, optional, reloadOnChange);
             if (configuration == null)
@@ -72,7 +72,7 @@ namespace ZhonTai.Common.Helpers
         /// <param name="environmentName">环境名称</param>
         /// <param name="optional">可选</param>
         /// <param name="reloadOnChange">自动更新</param>
-        public void Bind(string fileName, object instance, string environmentName = "", bool optional = true, bool reloadOnChange = false)
+        public static void Bind(string fileName, object instance, string environmentName = "", bool optional = true, bool reloadOnChange = false)
         {
             var configuration = Load(fileName, environmentName, optional, reloadOnChange);
             if (configuration == null || instance == null)

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

@@ -88,15 +88,13 @@ namespace ZhonTai.Common.Helpers
                 Padding = PaddingMode.PKCS7
             };
 
-            using (var stream = new MemoryStream())
-            {
-                var cStream = new CryptoStream(stream, provider.CreateEncryptor(), CryptoStreamMode.Write);
-                cStream.Write(inputByteArray, 0, inputByteArray.Length);
-                cStream.FlushFinalBlock();
+            using var stream = new MemoryStream();
+            var cStream = new CryptoStream(stream, provider.CreateEncryptor(), CryptoStreamMode.Write);
+            cStream.Write(inputByteArray, 0, inputByteArray.Length);
+            cStream.FlushFinalBlock();
 
-                var bytes = stream.ToArray();
-                return hex ? bytes.ToHex(lowerCase) : bytes.ToBase64();
-            }
+            var bytes = stream.ToArray();
+            return hex ? bytes.ToHex(lowerCase) : bytes.ToBase64();
         }
 
         /// <summary>
@@ -124,13 +122,11 @@ namespace ZhonTai.Common.Helpers
                 Padding = PaddingMode.PKCS7
             };
 
-            using (var mStream = new MemoryStream())
-            {
-                var cStream = new CryptoStream(mStream, provider.CreateDecryptor(), CryptoStreamMode.Write);
-                cStream.Write(inputByteArray, 0, inputByteArray.Length);
-                cStream.FlushFinalBlock();
-                return Encoding.UTF8.GetString(mStream.ToArray());
-            }
+            using var mStream = new MemoryStream();
+            var cStream = new CryptoStream(mStream, provider.CreateDecryptor(), CryptoStreamMode.Write);
+            cStream.Write(inputByteArray, 0, inputByteArray.Length);
+            cStream.FlushFinalBlock();
+            return Encoding.UTF8.GetString(mStream.ToArray());
         }
     }
 }

src/platform/ZhonTai.Common/Helpers/FileHelper.cs

@@ -42,7 +42,7 @@ namespace ZhonTai.Common.Helpers
             {
                 File.Create(Path).Close();
             }
-            StreamWriter streamWriter = new StreamWriter(Path, false);
+            var streamWriter = new StreamWriter(Path, false);
             streamWriter.Write(Strings);
             streamWriter.Close();
             streamWriter.Dispose();
@@ -60,7 +60,7 @@ namespace ZhonTai.Common.Helpers
             {
                 File.Create(Path).Close();
             }
-            StreamWriter streamWriter = new StreamWriter(Path, false, encode);
+            var streamWriter = new StreamWriter(Path, false, encode);
             streamWriter.Write(Strings);
             streamWriter.Close();
             streamWriter.Dispose();
@@ -82,7 +82,7 @@ namespace ZhonTai.Common.Helpers
                 s = "不存在相应的目录";
             else
             {
-                StreamReader streamReader = new StreamReader(Path);
+                var streamReader = new StreamReader(Path);
                 s = streamReader.ReadToEnd();
                 streamReader.Close();
                 streamReader.Dispose();
@@ -104,7 +104,7 @@ namespace ZhonTai.Common.Helpers
                 s = "不存在相应的目录";
             else
             {
-                StreamReader streamReader = new StreamReader(Path, encode);
+                var streamReader = new StreamReader(Path, encode);
                 s = streamReader.ReadToEnd();
                 streamReader.Close();
                 streamReader.Dispose();

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

@@ -19,10 +19,8 @@ namespace ZhonTai.Common.Helpers
             if (password.IsNull())
                 return null;
 
-            using (var md5 = MD5.Create())
-            {
-                return md5.ComputeHash(Encoding.UTF8.GetBytes(password)).ToHex();
-            }
+            using var md5 = MD5.Create();
+            return md5.ComputeHash(Encoding.UTF8.GetBytes(password)).ToHex();
         }
 
         /// <summary>
@@ -35,16 +33,14 @@ namespace ZhonTai.Common.Helpers
             if (password.IsNull())
                 return null;
 
-            using (var md5 = MD5.Create())
+            using var md5 = MD5.Create();
+            string pwd = string.Empty;
+            byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
+            foreach (var item in s)
             {
-                string pwd = string.Empty;
-                byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
-                foreach (var item in s)
-                {
-                    pwd = string.Concat(pwd, item.ToString("X"));
-                }
-                return pwd;
+                pwd = string.Concat(pwd, item.ToString("X"));
             }
+            return pwd;
         }
 
         /// <summary>
@@ -57,11 +53,9 @@ namespace ZhonTai.Common.Helpers
             if (password.IsNull())
                 return null;
 
-            using (var md5 = MD5.Create())
-            {
-                byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
-                return s.ToBase64();
-            }
+            using var md5 = MD5.Create();
+            byte[] s = md5.ComputeHash(Encoding.UTF8.GetBytes(password));
+            return s.ToBase64();
         }
     }
 }

src/platform/ZhonTai.Common/Helpers/UnicodeHelper.cs

@@ -14,7 +14,7 @@ namespace ZhonTai.Common.Helpers
         public static string StringToUnicode(string value)
         {
             byte[] bytes = Encoding.Unicode.GetBytes(value);
-            StringBuilder stringBuilder = new StringBuilder();
+            var stringBuilder = new StringBuilder();
             for (int i = 0; i < bytes.Length; i += 2)
             {
                 // 取两个字符，每个字符都是右对齐。

src/tests/ZhonTai.Tests/BaseControllerTest.cs

@@ -29,7 +29,7 @@ namespace ZhonTai.Tests
             _appConfig = GetService<AppConfig>();
         }
 
-        public ByteArrayContent GetHttpContent(object input, string contentType = "application/json;charset=UTF-8")
+        public static ByteArrayContent GetHttpContent(object input, string contentType = "application/json;charset=UTF-8")
         {
             // HttpContent httpContent = new StringContent(JsonConvert.SerializeObject(input));
             var content = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(input));
@@ -165,7 +165,7 @@ namespace ZhonTai.Tests
             Client.DefaultRequestHeaders.Add("Authorization", $"Bearer {token}");
         }
 
-        public string ToParams(object source)
+        public static string ToParams(object source)
         {
             var stringBuilder = new StringBuilder(string.Empty);
             if (source == null)

src/tests/ZhonTai.Tests/BaseTest.cs

@@ -17,7 +17,7 @@ namespace ZhonTai.Tests
 
         protected BaseTest()
         {
-            AppConfig = new ConfigHelper().Get<AppConfig>("appconfig") ?? new AppConfig();
+            AppConfig = ConfigHelper.Get<AppConfig>("appconfig") ?? new AppConfig();
             var application = new WebApplicationFactory<Program>();
             Client = application.CreateClient();
             Server = application.Server;

src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj

@@ -6,11 +6,11 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>