From d92dc98413d6a697b806f07453c2f1c569704d05 Mon Sep 17 00:00:00 2001
From: pojianbing <76243339@qq.com>
Date: Sat, 12 Mar 2022 22:05:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lazy.Captcha.Core/DefaultCaptcha.cs           |  70 ++------
 Lazy.Captcha.Core/ICaptcha.cs                 |  26 ++-
 Lazy.Captcha.Core/Lazy.Captcha.Core.csproj    |   4 +-
 Lazy.Captcha.Core/Storage/DefaultStorage.cs   |  57 +-----
 Lazy.Captcha.Core/Storage/IStorage.cs         |  14 +-
 Lazy.Captcha.Test/Demo1.cs                    | 101 -----------
 Lazy.Captcha.Test/Demo2.cs                    |  46 -----
 Lazy.Captcha.Test/Demo3.cs                    | 164 ------------------
 Lazy.Captcha.Test/Demo4.cs                    |  28 ---
 Lazy.Captcha.Test/Demo5.cs                    | 135 --------------
 Lazy.Captcha.Test/Demo6.cs                    |  63 -------
 Lazy.Captcha.Test/Demo7.cs                    |  49 ------
 Lazy.Captcha.Test/Demo8.cs                    |  76 --------
 Lazy.Captcha.Test/Lazy.Captcha.Test.csproj    |  20 ---
 Lazy.Captcha.Test/Program.cs                  |  13 --
 Lazy.Captcha.Test/inputs/fb.jpg               | Bin 15787 -> 0 bytes
 .../Controllers/CaptchaController.cs          |  14 +-
 Lazy.Captcha.Web/appsettings.json             |   2 +-
 LazyCaptcha.sln                               |   8 +-
 19 files changed, 51 insertions(+), 839 deletions(-)
 delete mode 100644 Lazy.Captcha.Test/Demo1.cs
 delete mode 100644 Lazy.Captcha.Test/Demo2.cs
 delete mode 100644 Lazy.Captcha.Test/Demo3.cs
 delete mode 100644 Lazy.Captcha.Test/Demo4.cs
 delete mode 100644 Lazy.Captcha.Test/Demo5.cs
 delete mode 100644 Lazy.Captcha.Test/Demo6.cs
 delete mode 100644 Lazy.Captcha.Test/Demo7.cs
 delete mode 100644 Lazy.Captcha.Test/Demo8.cs
 delete mode 100644 Lazy.Captcha.Test/Lazy.Captcha.Test.csproj
 delete mode 100644 Lazy.Captcha.Test/Program.cs
 delete mode 100644 Lazy.Captcha.Test/inputs/fb.jpg

diff --git a/Lazy.Captcha.Core/DefaultCaptcha.cs b/Lazy.Captcha.Core/DefaultCaptcha.cs
index 942c00c..eba6b6f 100644
--- a/Lazy.Captcha.Core/DefaultCaptcha.cs
+++ b/Lazy.Captcha.Core/DefaultCaptcha.cs
@@ -6,24 +6,20 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Lazy.Captcha.Core
 {
-    /// <summary>
-    /// 默认验证码服务
-    /// </summary>
     public class DefaultCaptcha : ICaptcha
     {
-        private readonly CaptchaOptions _options;
+        private readonly IOptionsMonitor<CaptchaOptions> _options;
         private readonly IStorage _storage;
         private readonly ICaptchaCodeGenerator _captchaCodeGenerator;
         private readonly ICaptchaImageGenerator _captchaImageGenerator;
 
         public DefaultCaptcha(IOptionsMonitor<CaptchaOptions> options, IStorage storage)
         {
-            _options = options.CurrentValue;
+            _options = options;
             _storage = storage;
             _captchaCodeGenerator = new DefaultCaptchaCodeGenerator(options.CurrentValue.CaptchaType);
             _captchaImageGenerator = new DefaultCaptchaImageGenerator();
@@ -32,66 +28,38 @@ namespace Lazy.Captcha.Core
         /// <summary>
         /// 生成验证码
         /// </summary>
-        public CaptchaData Generate(string captchaId)
+        /// <param name="captchaId">验证码id</param>
+        /// <param name="expirySeconds">缓存时间，未设定则使用配置时间</param>
+        /// <returns></returns>
+        public CaptchaData Generate(string captchaId, int? expirySeconds = null)
         {
-            var (renderText, code) = _captchaCodeGenerator.Generate(_options.CodeLength);
-            var image = _captchaImageGenerator.Generate(renderText, _options.ImageOption);
-            _storage.Set(captchaId, code, TimeSpan.FromSeconds(_options.ExpirySeconds));
+            var (renderText, code) = _captchaCodeGenerator.Generate(_options.CurrentValue.CodeLength);
+            var image = _captchaImageGenerator.Generate(renderText, _options.CurrentValue.ImageOption);
+            expirySeconds = expirySeconds.HasValue ? expirySeconds.Value : _options.CurrentValue.ExpirySeconds;
+            _storage.Set(captchaId, code, DateTime.Now.AddSeconds(expirySeconds.Value).ToUniversalTime());
 
             return new CaptchaData(captchaId, code, image);
         }
 
-        /// <summary>
-        /// 生成验证码
-        /// </summary>
-        public Task<CaptchaData> GenerateAsync(string captchaId, CancellationToken token = default)
-        {
-            return Task.Run(() => Generate(captchaId), token);
-        }
-
         /// <summary>
         /// 校验
         /// </summary>
-        public bool Validate(string captchaId, string code, TimeSpan? delay = null)
+        /// <param name="captchaId">验证码id</param>
+        /// <param name="code">用户输入的验证码</param>
+        /// <param name="removeIfSuccess">校验成功时是否移除缓存(用于多次验证)</param>
+        /// <returns></returns>
+        public bool Validate(string captchaId, string code, bool removeIfSuccess = true)
         {
             var val = _storage.Get(captchaId);
-            var comparisonType = _options.IgnoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
-            var result = string.Equals(val, code, comparisonType);
+            var comparisonType = _options.CurrentValue.IgnoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
+            var success = string.Equals(val, code, comparisonType);
 
-            // 仅成功并需要延迟移除时
-            if (result && delay != null)
-            {
-                _storage.RemoveLater(captchaId, delay.Value);
-            }
-            // 否则直接移除
-            else
+            if (!success || (success && removeIfSuccess))
             {
                 _storage.Remove(captchaId);
             }
 
-            return result;
-        }
-
-        /// <summary>
-        /// 校验
-        /// </summary>
-        public async Task<bool> ValidateAsync(string captchaId, string code, TimeSpan? delay = null, CancellationToken token = default)
-        {
-            var val = _storage.Get(captchaId);
-            var comparisonType = _options.IgnoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
-            var result = string.Equals(val, code, comparisonType);
-
-            // 仅成功并需要延迟移除时
-            if (result && delay != null)
-            {
-                await _storage.RemoveLaterAsync(captchaId, delay.Value, token);
-            }
-            // 否则直接移除
-            else
-            {
-                await _storage.RemoveAsync(captchaId, token);
-            }
-            return result;
+            return success;
         }
     }
 }
\ No newline at end of file
diff --git a/Lazy.Captcha.Core/ICaptcha.cs b/Lazy.Captcha.Core/ICaptcha.cs
index f6a501c..54ace64 100644
--- a/Lazy.Captcha.Core/ICaptcha.cs
+++ b/Lazy.Captcha.Core/ICaptcha.cs
@@ -2,19 +2,27 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Lazy.Captcha.Core
-{
+{   
     public interface ICaptcha
     {
-        CaptchaData Generate(string captchaId);
+        /// <summary>
+        /// 鐢熸垚楠岃瘉鐮�
+        /// </summary>
+        /// <param name="captchaId">楠岃瘉鐮乮d</param>
+        /// <param name="expirySeconds">缂撳瓨鏃堕棿锛屾湭璁惧畾鍒欎娇鐢ㄩ厤缃椂闂�</param>
+        /// <returns></returns>
+        CaptchaData Generate(string captchaId, int? expirySeconds = null);
 
-        Task<CaptchaData> GenerateAsync(string captchaId, CancellationToken token = default);
-
-        bool Validate(string captchaId, string code, TimeSpan? delay = null);
-
-        Task<bool> ValidateAsync(string captchaId, string code, TimeSpan? delay = null, CancellationToken token = default);
+        /// <summary>
+        /// 鏍￠獙
+        /// </summary>
+        /// <param name="captchaId">楠岃瘉鐮乮d</param>
+        /// <param name="code">鐢ㄦ埛杈撳叆鐨勯獙璇佺爜</param>
+        /// <param name="removeIfSuccess">鏍￠獙鎴愬姛鏃舵槸鍚︾Щ闄ょ紦瀛�(鐢ㄤ簬澶氭楠岃瘉)</param>
+        /// <returns></returns>
+        bool Validate(string captchaId, string code, bool removeIfSuccess = true);
     }
-}
\ No newline at end of file
+}
diff --git a/Lazy.Captcha.Core/Lazy.Captcha.Core.csproj b/Lazy.Captcha.Core/Lazy.Captcha.Core.csproj
index e84a301..a10a876 100644
--- a/Lazy.Captcha.Core/Lazy.Captcha.Core.csproj
+++ b/Lazy.Captcha.Core/Lazy.Captcha.Core.csproj
@@ -6,8 +6,8 @@
     <PackageProjectUrl>https://gitee.com/pojianbing/lazy-captcha</PackageProjectUrl>
     <RepositoryUrl>https://gitee.com/pojianbing/lazy-captcha</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <AssemblyVersion>1.1.0</AssemblyVersion>
-	<Version>1.1.0</Version>
+    <AssemblyVersion>1.1.1</AssemblyVersion>
+	<Version>1.1.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Lazy.Captcha.Core/Storage/DefaultStorage.cs b/Lazy.Captcha.Core/Storage/DefaultStorage.cs
index 2457970..f93d0f7 100644
--- a/Lazy.Captcha.Core/Storage/DefaultStorage.cs
+++ b/Lazy.Captcha.Core/Storage/DefaultStorage.cs
@@ -1,6 +1,4 @@
 锘縰sing System;
-using System.Threading;
-using System.Threading.Tasks;
 using Lazy.Captcha.Core.Storage;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
@@ -28,68 +26,17 @@ namespace Lazy.Captcha.Core.Storeage
             return _cache.GetString(WrapKey(key));
         }
 
-        public Task<string> GetAsync(string key, CancellationToken token = default)
-        {
-            return _cache.GetStringAsync(WrapKey(key), token);
-        }
-
         public void Remove(string key)
         {
             _cache.Remove(WrapKey(key));
         }
 
-        public void RemoveLater(string key, TimeSpan expireTimeSpan)
-        {
-            var value = _cache.GetString(WrapKey(key));
-            if (!string.IsNullOrEmpty(value))
-            {
-                _cache.SetString(WrapKey(key), value, new DistributedCacheEntryOptions
-                {
-                    AbsoluteExpirationRelativeToNow = expireTimeSpan
-                });
-            }
-        }
-
-        /// <summary>
-        /// 閲嶆柊璁剧疆杩囨湡鏃堕棿 TODO锛氱湅鐪嬫湁娌℃湁鍏朵粬浠呰闂竴娆＄紦瀛樼殑鏂瑰紡
-        /// </summary>
-        public async Task RemoveLaterAsync(string key, TimeSpan expireTimeSpan, CancellationToken token = default)
-        {
-            var value = await _cache.GetStringAsync(WrapKey(key), token);
-            if (!string.IsNullOrEmpty(value))
-            {
-                await _cache.SetStringAsync(WrapKey(key), value, new DistributedCacheEntryOptions
-                {
-                    AbsoluteExpirationRelativeToNow = expireTimeSpan
-                });
-            }
-        }
-
-        public Task RemoveAsync(string key, CancellationToken token = default(CancellationToken))
-        {
-            return _cache.RemoveAsync(key, token);
-        }
-
-        /// <summary>
-        /// 缂撳瓨楠岃瘉鐮�
-        /// </summary>
-        public void Set(string key, string value, TimeSpan expireTimeSpan)
+        public void Set(string key, string value, DateTimeOffset absoluteExpiration)
         {
             _cache.SetString(WrapKey(key), value, new DistributedCacheEntryOptions
             {
-                SlidingExpiration = expireTimeSpan
+                AbsoluteExpiration = absoluteExpiration
             });
         }
-
-        /// <summary>
-        /// 缂撳瓨楠岃瘉鐮�
-        /// </summary>
-        public Task SetAsync(string key, string value, TimeSpan expireTimeSpan, CancellationToken token = default)
-        {
-            return _cache.SetStringAsync(WrapKey(key), value, new DistributedCacheEntryOptions
-            {
-                SlidingExpiration = expireTimeSpan
-            }, token);
-        }
     }
 }
\ No newline at end of file
diff --git a/Lazy.Captcha.Core/Storage/IStorage.cs b/Lazy.Captcha.Core/Storage/IStorage.cs
index 4940440..2752285 100644
--- a/Lazy.Captcha.Core/Storage/IStorage.cs
+++ b/Lazy.Captcha.Core/Storage/IStorage.cs
@@ -1,25 +1,13 @@
 锘縰sing System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Lazy.Captcha.Core.Storage
 {
     public interface IStorage
     {
-        void Set(string key, string value, TimeSpan expireTimeSpan);
+        void Set(string key, string value, DateTimeOffset absoluteExpiration);
 
         string Get(string key);
 
         void Remove(string key);
-
-        Task<string> GetAsync(string key, CancellationToken token = default);
-
-        Task RemoveAsync(string key, CancellationToken token = default);
-
-        Task SetAsync(string key, string value, TimeSpan expireTimeSpan, CancellationToken token = default);
-
-        Task RemoveLaterAsync(string key, TimeSpan expireTimeSpan, CancellationToken token = default);
-
-        void RemoveLater(string key, TimeSpan expireTimeSpan);
     }
 }
\ No newline at end of file
diff --git a/Lazy.Captcha.Test/Demo1.cs b/Lazy.Captcha.Test/Demo1.cs
deleted file mode 100644
index 726eeb6..0000000
--- a/Lazy.Captcha.Test/Demo1.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public static class Demo1
-    {
-        public static void Run()
-        {
-            System.IO.Directory.CreateDirectory("output");
-
-            using (var img = Image.Load("inputs/fb.jpg"))
-            {
-                using (var destRound = img.Clone(x => x.ConvertToAvatar(new Size(200, 200), 20)))
-                {
-                    destRound.Save("output/fb.png");
-                }
-            }
-        }
-
-        private static IImageProcessingContext ConvertToAvatar(this IImageProcessingContext processingContext, Size size, float cornerRadius)
-        {
-            return processingContext.Resize(new ResizeOptions
-            {
-                Size = size,
-                Mode = ResizeMode.Crop
-            }).ApplyRoundedCorners(cornerRadius);
-        }
-
-        // This method can be seen as an inline implementation of an `IImageProcessor`:
-        // (The combination of `IImageOperations.Apply()` + this could be replaced with an `IImageProcessor`)
-        private static IImageProcessingContext ApplyRoundedCorners(this IImageProcessingContext ctx, float cornerRadius)
-        {
-            Size size = ctx.GetCurrentSize();
-            IPathCollection corners = BuildCorners(size.Width, size.Height, cornerRadius);
-
-            //clear Both the color and the alpha of the destination are cleared. Neither the source nor the destination are used(except for destinations size and other meta - data which is always preserved.
-            //src The source is copied to the destination.The destination is not used as input, though it is cleared.
-            //dst The destination is left untouched. The source image is completely ignored.
-            //src - over    The source is composited over the destination. this is the default alpha blending compose method, when neither the compose setting is set, nor is set in the image meta - data.
-            //dst - over    The destination is composited over the source and the result replaces the destination.
-            //src -in	The part of the source lying inside of the destination replaces the destination.
-            //dst -in	The part of the destination lying inside of the source replaces the destination.Areas not overlaid are cleared.
-            //src -out	The part of the source lying outside of the destination replaces the destination.
-            //dst -out	The part of the destination lying outside of the source replaces the destination.
-            //src - atop    The part of the source lying inside of the destination is composited onto the destination.
-            //dst - atop    The part of the destination lying inside of the source is composited over the source and replaces the destination.Areas not overlaid are cleared.
-            //xor The part of the source that lies outside of the destination is combined with the part of the destination that lies outside of the source.Source or Destination, but not both.
-            // 1. 浜岄�変竴 src, dst
-            // 2. 浜岄�変竴锛屼絾鍙彇閮ㄥ垎 src - in(src鍐呴儴)锛宒st -in锛宻rc -out锛宒st -out
-            // 3. 浜岄�変竴锛屼絾鍙彇閲嶅彔閮ㄥ垎 鍙栧嚭鐨勯儴鍒嗚鐩栧湪Dst src - atop dst - atop
-            // 4. 涓よ�呭彔鍔� src - over dst - over
-            ctx.SetGraphicsOptions(new GraphicsOptions()
-            {
-                Antialias = true,
-                AlphaCompositionMode = PixelAlphaCompositionMode.DestOut // enforces that any part of this shape that has color is punched out of the background
-            });
-
-            // mutating in here as we already have a cloned original
-            // use any color(not Transparent), so the corners will be clipped
-            foreach (var c in corners)
-            {
-                ctx = ctx.Fill(Color.Red, c);
-            }
-
-            //ctx.Fill(Color.Red, new Star(x: 100.0f, y: 100.0f, prongs: 5, innerRadii: 20.0f, outerRadii: 30.0f));
-
-            return ctx;
-        }
-
-        private static IPathCollection BuildCorners(int imageWidth, int imageHeight, float cornerRadius)
-        {
-            // first create a square
-            var rect = new RectangularPolygon(-0.5f, -0.5f, cornerRadius, cornerRadius);
-
-            // then cut out of the square a circle so we are left with a corner
-            IPath cornerTopLeft = rect.Clip(new EllipsePolygon(cornerRadius - 0.5f, cornerRadius - 0.5f, cornerRadius));
-
-            // corner is now a corner shape positions top left
-            //lets make 3 more positioned correctly, we can do that by translating the original around the center of the image
-
-            float rightPos = imageWidth - cornerTopLeft.Bounds.Width + 1;
-            float bottomPos = imageHeight - cornerTopLeft.Bounds.Height + 1;
-
-            // move it across the width of the image - the width of the shape
-            IPath cornerTopRight = cornerTopLeft.RotateDegree(90).Translate(rightPos, 0);
-            IPath cornerBottomLeft = cornerTopLeft.RotateDegree(-90).Translate(0, bottomPos);
-            IPath cornerBottomRight = cornerTopLeft.RotateDegree(180).Translate(rightPos, bottomPos);
-
-            return new PathCollection(cornerTopLeft, cornerBottomLeft, cornerTopRight, cornerBottomRight);
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Demo2.cs b/Lazy.Captcha.Test/Demo2.cs
deleted file mode 100644
index dc7f1c7..0000000
--- a/Lazy.Captcha.Test/Demo2.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-锘縰sing SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Processing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public static class Demo2
-    {
-        public static void Run()
-        {
-            System.IO.Directory.CreateDirectory("output");
-
-            using (Image image = Image.Load("inputs/fb.jpg"))
-            {
-                var outerRadii = Math.Min(image.Width, image.Height) / 2;
-                var star = new Star(new PointF(image.Width / 2, image.Height / 2), 5, outerRadii / 2, outerRadii);
-
-                // we want to clone out our source image so we can apply 
-                // various effects to it without mutating the original yet.
-                using (var clone = image.Clone(p =>
-                {
-                    p.GaussianBlur(15); // apply the effect here you and inside the shape
-                }))
-                {
-                    // crop the cloned down to just the size of the shape (this is due to the way ImageBrush works)
-                    clone.Mutate(x => x.Crop((Rectangle)star.Bounds));
-
-                    // use an image brush to apply section of cloned image as the source for filling the shape
-                    var brush = new ImageBrush(clone);
-
-                    // now fill the shape with the image brush containing the portion of 
-                    // cloned image with the effects applied
-                    image.Mutate(c => c.Fill(brush, star));
-                }
-
-                image.Save("output/fb.png");
-            }
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Demo3.cs b/Lazy.Captcha.Test/Demo3.cs
deleted file mode 100644
index 51ba0a5..0000000
--- a/Lazy.Captcha.Test/Demo3.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-锘縰sing SixLabors.Fonts;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Processing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public static class Demo3
-    {
-        const string LongText = @"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec aliquet lorem at magna mollis, non semper erat aliquet. In leo tellus, sollicitudin non eleifend et, luctus vel magna. Proin at lacinia tortor, malesuada molestie nisl. Quisque mattis dui quis eros ultricies, quis faucibus turpis dapibus. Donec urna ipsum, dignissim eget condimentum at, condimentum non magna. Donec non urna sit amet lectus tincidunt interdum vitae vitae leo. Aliquam in nisl accumsan, feugiat ipsum condimentum, scelerisque diam. Vivamus quam diam, rhoncus ut semper eget, gravida in metus.
-Nullam quis malesuada metus. In hac habitasse platea dictumst. Aliquam faucibus eget eros nec vulputate. Quisque sed dolor lacus. Proin non dolor vitae massa rhoncus vestibulum non a arcu. Morbi mollis, arcu id pretium dictum, augue dui cursus eros, eu pharetra arcu ante non lectus. Integer quis tellus ipsum. Integer feugiat augue id tempus rutrum. Ut eget interdum leo, id fermentum lacus. Morbi euismod, mi at tempus finibus, ante risus ornare eros, eu ultrices ipsum dolor vitae risus. Mauris molestie pretium massa vitae maximus. Fusce ut egestas ex, vitae semper nulla. Proin pretium elit libero, et interdum enim molestie ac.
-Pellentesque fermentum vitae lacus non aliquet. Sed nulla ipsum, hendrerit sit amet vulputate varius, volutpat eget est. Pellentesque eget ante erat. Vestibulum venenatis ex quis pretium sagittis. Etiam vel nibh sit amet leo gravida efficitur. In hac habitasse platea dictumst. Nullam lobortis euismod sem dapibus aliquam. Proin accumsan velit a magna gravida condimentum. Nam non massa ac nibh viverra rutrum. Phasellus elit tortor, malesuada et purus nec, placerat mattis neque. Proin auctor risus vel libero ultrices, id fringilla erat facilisis. Donec rutrum, enim sit amet faucibus viverra, velit tellus aliquam tellus, et tempus tellus diam sed dui. Integer fringilla convallis nisl venenatis elementum. Sed volutpat massa ut mauris accumsan, mollis finibus tortor pretium.";
-        const string LongText1 = "abc";
-
-
-        public static void Run()
-        {
-            System.IO.Directory.CreateDirectory("output");
-            using (var img = Image.Load("inputs/fb.jpg"))
-            {
-                // For production application we would recommend you create a FontCollection
-                // singleton and manually install the ttf fonts yourself as using SystemFonts
-                // can be expensive and you risk font existing or not existing on a deployment
-                // by deployment basis.
-                Font font = SystemFonts.CreateFont("Arial", 10); // for scaling water mark size is largely ignored.
-
-                using (var img2 = img.Clone(ctx => ctx.ApplyScalingWaterMark(font, "A short piece of text", Color.HotPink, 5, false)))
-                {
-                    img2.Save("output/simple.png");
-                }
-
-
-                using (var img2 = img.Clone(ctx => ctx.ApplyScalingWaterMark(font, LongText, Color.HotPink, 5, true)))
-                {
-                    img2.Save("output/wrapped.png");
-                }
-
-                // the original `img` object has not been altered at all.
-            }
-        }
-
-        private static IImageProcessingContext ApplyScalingWaterMark(this IImageProcessingContext processingContext,
-            Font font,
-            string text,
-            Color color,
-            float padding,
-            bool wordwrap)
-        {
-            if (wordwrap)
-            {
-                return processingContext.ApplyScalingWaterMarkWordWrap(font, text, color, padding);
-            }
-            else
-            {
-                return processingContext.ApplyScalingWaterMarkSimple(font, text, color, padding);
-            }
-        }
-
-        private static IImageProcessingContext ApplyScalingWaterMarkSimple(this IImageProcessingContext processingContext,
-            Font font,
-            string text,
-            Color color,
-            float padding)
-        {
-            Size imgSize = processingContext.GetCurrentSize();
-
-            float targetWidth = imgSize.Width - (padding * 2);
-            float targetHeight = imgSize.Height - (padding * 2);
-
-            // measure the text size
-            FontRectangle size = TextMeasurer.Measure(text, new RendererOptions(font));
-
-            //find out how much we need to scale the text to fill the space (up or down)
-            float scalingFactor = Math.Min(imgSize.Width / size.Width, imgSize.Height / size.Height);
-
-            //create a new font
-            Font scaledFont = new Font(font, scalingFactor * font.Size);
-
-            var center = new PointF(imgSize.Width / 2, imgSize.Height / 2);
-            var textGraphicOptions = new DrawingOptions()
-            {
-                TextOptions = {
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    VerticalAlignment = VerticalAlignment.Center
-                }
-            };
-            return processingContext.DrawText(textGraphicOptions, text, scaledFont, color, center);
-        }
-
-        private static IImageProcessingContext ApplyScalingWaterMarkWordWrap(this IImageProcessingContext processingContext,
-            Font font,
-            string text,
-            Color color,
-            float padding)
-        {
-            Size imgSize = processingContext.GetCurrentSize();
-            float targetWidth = imgSize.Width - (padding * 2);
-            float targetHeight = imgSize.Height - (padding * 2);
-
-            float targetMinHeight = imgSize.Height - (padding * 3); // must be with in a margin width of the target height
-
-            // now we are working i 2 dimensions at once and can't just scale because it will cause the text to
-            // reflow we need to just try multiple times
-
-            var scaledFont = font;
-            FontRectangle s = new FontRectangle(0, 0, float.MaxValue, float.MaxValue);
-
-            float scaleFactor = (scaledFont.Size / 2); // every time we change direction we half this size
-            int trapCount = (int)scaledFont.Size * 2;
-            if (trapCount < 10)
-            {
-                trapCount = 10;
-            }
-
-            bool isTooSmall = false;
-
-            while ((s.Height > targetHeight || s.Height < targetMinHeight) && trapCount > 0)
-            {
-                if (s.Height > targetHeight)
-                {
-                    if (isTooSmall)
-                    {
-                        scaleFactor = scaleFactor / 2;
-                    }
-
-                    scaledFont = new Font(scaledFont, scaledFont.Size - scaleFactor);
-                    isTooSmall = false;
-                }
-
-                if (s.Height < targetMinHeight)
-                {
-                    if (!isTooSmall)
-                    {
-                        scaleFactor = scaleFactor / 2;
-                    }
-                    scaledFont = new Font(scaledFont, scaledFont.Size + scaleFactor);
-                    isTooSmall = true;
-                }
-                trapCount--;
-
-                s = TextMeasurer.Measure(text, new RendererOptions(scaledFont)
-                {
-                    WrappingWidth = targetWidth
-                });
-            }
-
-            var center = new PointF(padding, imgSize.Height / 2);
-            var textGraphicOptions = new DrawingOptions()
-            {
-                TextOptions = {
-                    HorizontalAlignment = HorizontalAlignment.Left,
-                    VerticalAlignment = VerticalAlignment.Center,
-                    WrapTextWidth = targetWidth
-                }
-            };
-            return processingContext.DrawText(textGraphicOptions, text, scaledFont, color, center);
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Demo4.cs b/Lazy.Captcha.Test/Demo4.cs
deleted file mode 100644
index ddff1e9..0000000
--- a/Lazy.Captcha.Test/Demo4.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public class Demo4
-    {
-        public static void Run()
-        {
-            System.IO.Directory.CreateDirectory("output");
-
-            using (Image image = Image.Load("inputs/fb.jpg"))
-            {
-                image.Mutate(x => x
-                     .Resize(image.Width / 2, image.Height / 2)
-                     .Grayscale()
-                     .BlackWhite());
-
-                image.Save("output/fb.png"); // Automatic encoder selected based on extension.
-            }
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Demo5.cs b/Lazy.Captcha.Test/Demo5.cs
deleted file mode 100644
index 4cb019d..0000000
--- a/Lazy.Captcha.Test/Demo5.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-锘縰sing SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.PixelFormats;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public class Demo5
-    {
-        const int QrCodeSize = 25;
-
-        static bool[,] GetQrPattern()
-        {
-            const bool o = true;
-            const bool _ = false;
-            return new[,]
-            {
-                { _, _, _, _, _, _, _, o, _, _, o, o, o, _, o, _, _, o, _, _, _, _, _, _, _ },
-                { _, o, o, o, o, o, _, o, o, o, o, o, o, o, o, o, o, o, _, o, o, o, o, o, _ },
-                { _, o, _, _, _, o, _, o, _, o, o, _, _, _, o, _, _, o, _, o, _, _, _, o, _ },
-                { _, o, _, _, _, o, _, o, _, _, o, _, o, _, _, _, o, o, _, o, _, _, _, o, _ },
-                { _, o, _, _, _, o, _, o, _, _, _, _, o, o, _, o, _, o, _, o, _, _, _, o, _ },
-                { _, o, o, o, o, o, _, o, o, _, o, o, _, o, _, o, o, o, _, o, o, o, o, o, _ },
-                { _, _, _, _, _, _, _, o, _, o, _, o, _, o, _, o, _, o, _, _, _, _, _, _, _ },
-                { o, o, o, o, o, o, o, o, o, _, o, _, o, o, _, _, o, o, o, o, o, o, o, o, o },
-                { _, _, _, _, o, o, _, o, _, o, o, o, o, _, _, o, o, _, o, o, _, _, _, o, _ },
-                { _, _, o, _, o, o, o, _, _, _, o, o, o, o, _, o, o, o, o, _, o, o, o, _, o },
-                { o, o, o, o, _, o, _, _, _, o, o, o, o, _, _, o, _, _, _, o, o, o, o, o, o },
-                { o, _, o, o, o, _, o, o, o, o, o, _, _, _, o, _, o, _, o, _, o, _, _, o, o },
-                { o, _, o, o, o, o, _, _, o, _, o, _, o, _, _, o, o, _, _, o, _, o, _, _, _ },
-                { o, _, o, _, o, o, o, o, _, o, _, _, o, o, o, _, o, o, _, _, _, o, o, o, _ },
-                { o, _, o, o, o, _, _, _, o, _, _, o, _, o, o, o, o, _, o, o, _, o, _, _, o },
-                { _, o, _, o, _, o, o, o, _, o, o, o, _, o, o, _, o, o, _, _, _, o, o, o, _ },
-                { o, o, _, o, o, o, _, o, o, o, _, _, o, o, o, _, _, _, _, _, _, _, _, _, _ },
-                { o, o, o, o, o, o, o, o, _, o, _, o, _, o, _, _, _, o, o, o, _, o, _, o, _ },
-                { _, _, _, _, _, _, _, o, o, o, o, _, _, _, o, o, _, o, _, o, _, o, _, _, _ },
-                { _, o, o, o, o, o, _, o, o, o, _, o, _, o, _, _, _, o, o, o, _, o, o, _, _ },
-                { _, o, _, _, _, o, _, o, o, _, _, _, _, _, o, o, _, _, _, _, _, _, o, _, o },
-                { _, o, _, _, _, o, _, o, _, o, o, o, _, _, o, _, o, o, _, o, _, _, _, _, _ },
-                { _, o, _, _, _, o, _, o, _, _, _, _, _, _, o, _, _, _, _, o, _, o, _, _, o },
-                { _, o, o, o, o, o, _, o, _, o, _, o, o, o, o, o, o, _, _, o, _, o, _, o, o },
-                { _, _, _, _, _, _, _, o, _, _, o, o, _, o, _, o, o, o, o, _, _, _, _, _, _ },
-            };
-        }
-
-        public static void Run()
-        {
-
-            bool[,] pattern = GetQrPattern();
-
-            // L8 is a grayscale pixel format storing a single 8-bit (1 byte) channel of luminance per pixel.
-            // Make sure to Dispose() the image in your app! We do it by a using statement in this example:
-            using Image<L8> image = RenderQrCodeToImage(pattern, 10);
-
-            string fileName = Path.Combine(Directory.GetCurrentDirectory(), "qr.png");
-
-            // Store the result as a grayscale 1 bit per pixel png for maximum compression:
-            image.SaveAsPng(fileName, new PngEncoder()
-            {
-                BitDepth = PngBitDepth.Bit1,
-                ColorType = PngColorType.Grayscale
-            });
-            Console.WriteLine($"Saved to: {fileName}");
-        }
-
-        // ImageSharp 2.0 will break this method: https://github.com/SixLabors/ImageSharp/issues/1739
-        // We will update the example after the release. See ImageSharp 2.0 variant in comments.
-        static Image<L8> RenderQrCodeToImage(bool[,] pattern, int pixelSize)
-        {
-            int imageSize = pixelSize * QrCodeSize;
-            Image<L8> image = new Image<L8>(imageSize, imageSize);
-
-            L8 black = new L8(0);
-            L8 white = new L8(255);
-
-            // Scan the QR pattern row-by-row
-            for (int yQr = 0; yQr < QrCodeSize; yQr++)
-            {
-                // Fill 'pixelSize' number image rows that correspond to the current QR pattern row:
-                for (int y = yQr * pixelSize; y < (yQr + 1) * pixelSize; y++)
-                {
-                    // Get a Span<L8> of pixels for the current image row:
-                    //Span<L8> pixelRow = image.GetPixelRowSpan(y);
-                    image.DangerousTryGetSinglePixelMemory(out Memory<L8> memoryL8);
-                    Span<L8> pixelRow = memoryL8.Span;
-
-                    // Loop through the values for the current QR pattern row:
-                    for (int xQr = 0; xQr < QrCodeSize; xQr++)
-                    {
-                        L8 color = pattern[xQr, yQr] ? white : black;
-
-                        // Fill 'pixelSize' number of image pixels corresponding to the current QR pattern value:
-                        for (int x = xQr * pixelSize; x < (xQr + 1) * pixelSize; x++)
-                        {
-                            pixelRow[x] = color;
-                        }
-                    }
-                }
-            }
-
-            // ImageSharp 2.0 variant:
-            // image.ProcessPixelRows(pixelAccessor =>
-            // {
-            //     // Scan the QR pattern row-by-row
-            //     for (int yQr = 0; yQr < QrCodeSize; yQr++)
-            //     {
-            //         // Fill 'pixelSize' number image rows that correspond to the current QR pattern row:
-            //         for (int y = yQr * pixelSize; y < (yQr + 1) * pixelSize; y++)
-            //         {
-            //             // Get a Span<L8> of pixels for the current image row:
-            //             Span<L8> pixelRow = pixelAccessor.GetRowSpan(y);
-            //
-            //             // Loop through the values for the current QR pattern row:
-            //             for (int xQr = 0; xQr < QrCodeSize; xQr++)
-            //             {
-            //                 L8 color = pattern[xQr, yQr] ? white : black;
-            //
-            //                 // Fill 'pixelSize' number of image pixels corresponding to the current QR pattern value:
-            //                 for (int x = xQr * pixelSize; x < (xQr + 1) * pixelSize; x++)
-            //                 {
-            //                     pixelRow[x] = color;
-            //                 }
-            //             }
-            //         }
-            //     }
-            // });
-
-            return image;
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Demo6.cs b/Lazy.Captcha.Test/Demo6.cs
deleted file mode 100644
index a8178b2..0000000
--- a/Lazy.Captcha.Test/Demo6.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-锘縰sing SixLabors.Fonts;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public class Demo6
-    {
-        public static void Run()
-        {
-            System.IO.Directory.CreateDirectory("output");
-            using (Image img = new Image<Rgba32>(1500, 500))
-            {
-                PathBuilder pathBuilder = new PathBuilder();
-                pathBuilder.SetOrigin(new PointF(500, 0));
-                pathBuilder.AddBezier(new PointF(50, 450), new PointF(200, 50), new PointF(300, 50), new PointF(450, 450));
-                // add more complex paths and shapes here.
-
-                IPath path = pathBuilder.Build();
-
-                // For production application we would recomend you create a FontCollection
-                // singleton and manually install the ttf fonts yourself as using SystemFonts
-                // can be expensive and you risk font existing or not existing on a deployment
-                // by deployment basis.
-                var font = SystemFonts.CreateFont("Arial", 39, FontStyle.Regular);
-
-                string text = "Hello World Hello World Hello World Hello World Hello World";
-                var textGraphicsOptions = new DrawingOptions() // draw the text along the path wrapping at the end of the line
-                {
-                    TextOptions = 
-                    {
-                        WrapTextWidth = path.Bounds.Width
-                    }
-                };
-
-                // lets generate the text as a set of vectors drawn along the path
-                var glyphs = TextBuilder.GenerateGlyphs(text, path, new RendererOptions(font, textGraphicsOptions.TextOptions.DpiX, textGraphicsOptions.TextOptions.DpiY)
-                {
-                    HorizontalAlignment = textGraphicsOptions.TextOptions.HorizontalAlignment,
-                    TabWidth = textGraphicsOptions.TextOptions.TabWidth,
-                    VerticalAlignment = textGraphicsOptions.TextOptions.VerticalAlignment,
-                    WrappingWidth = textGraphicsOptions.TextOptions.WrapTextWidth,
-                    ApplyKerning = textGraphicsOptions.TextOptions.ApplyKerning
-                });
-
-                img.Mutate(ctx => ctx
-                    .Fill(Color.White) // white background image
-                    .Draw(Color.Gray, 3, path) // draw the path so we can see what the text is supposed to be following
-                    .Fill(Color.Black, glyphs));
-
-                img.Save("output/wordart.png");
-            }
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Demo7.cs b/Lazy.Captcha.Test/Demo7.cs
deleted file mode 100644
index c54f44e..0000000
--- a/Lazy.Captcha.Test/Demo7.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-锘縰sing SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats.Gif;
-using SixLabors.ImageSharp.PixelFormats;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public class Demo7
-    {
-        public static void Run()
-        {
-            const int width = 100;
-            const int height = 100;
-
-            // Delay between frames in (1/100) of a second.
-            const int frameDelay = 100;
-
-            // For demonstration: use images with different colors.
-            Color[] colors = {
-                Color.Green,
-                Color.Red
-            };
-
-            // Create empty image.
-            using Image<Rgba32> gif = new(width, height, Color.Blue);
-            gif.Metadata.GetGifMetadata().RepeatCount = 0;
-
-            for (int i = 0; i < colors.Length; i++)
-            {
-                // Create a color image, which will be added to the gif.
-                using Image<Rgba32> image = new(width, height, colors[i]);
-
-                // Set the duration of the frame delay.
-                GifFrameMetadata metadata1 = image.Frames.RootFrame.Metadata.GetGifMetadata();
-                metadata1.FrameDelay = frameDelay;
-
-                // Add the color image to the gif.
-                gif.Frames.AddFrame(image.Frames.RootFrame);
-            }
-
-            // Save the final result.
-            gif.SaveAsGif("a.gif");
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Demo8.cs b/Lazy.Captcha.Test/Demo8.cs
deleted file mode 100644
index ef5c342..0000000
--- a/Lazy.Captcha.Test/Demo8.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-锘縰sing SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Lazy.Captcha.Test
-{
-    public class Demo8
-    {
-        public static void Run()
-        {
-            System.IO.Directory.CreateDirectory("output");
-
-            using (var image = Image.Load("inputs/fb.jpg"))
-            {
-                var outerRadii = Math.Min(image.Width, image.Height) / 2;
-                var star = new Star(new PointF(image.Width / 2, image.Height / 2), 5, outerRadii / 2, outerRadii);
-
-                image.Mutate(x => x.DrawPolygon(Pens.Solid(Color.White, 2), star.Points.ToArray()));
-                image.Mutate(x => x.FillPolygon(Color.ParseHex("#00000088"), star.Points.ToArray()));
-                image.Save("cc2.png");
-
-                //using (var clone = image.Clone(p =>
-                //{
-                //    p.GaussianBlur(15);
-                //}))
-                //{
-                //    //  瑁佸壀鍖哄煙
-                //    var rect = new RectangularPolygon(-0.0f, -0.0f, 200, 200);
-                //    clone.Mutate(c => c.Crop((Rectangle)star.Bounds));
-
-                //    clone.Save("cc1.png");
-
-                //    var brush = new ImageBrush(clone);
-
-                //    // now fill the shape with the image brush containing the portion of 
-                //    // cloned image with the effects applied
-                //    image.Mutate(c => c.Fill(brush, star));
-
-                //    var options = new DrawingOptions()
-                //    {
-                //        GraphicsOptions = new GraphicsOptions
-                //        {
-                //            BlendPercentage = 0.5f
-                //        }
-                //    };
-                //    image.Mutate(x => x.Draw(options, Color.White, 1, star));
-                //}
-
-                //DrawingOptions options = new()
-                //{
-                //    GraphicsOptions = new()
-                //    {
-                //        ColorBlendingMode = PixelColorBlendingMode.Multiply,
-                //    }
-                //};
-
-                //IBrush brush = Brushes.Horizontal(Color.Red, Color.Blue);
-                //IPen pen = Pens.DashDot(Color.Green, 5);
-                //IPath yourPolygon = new Star(x: 100.0f, y: 100.0f, prongs: 5, innerRadii: 20.0f, outerRadii: 30.0f);
-
-                //// Draws a star with horizontal red and blue hatching with a dash dot pattern outline.
-                //image.Mutate(x => x.Fill(options, brush, yourPolygon)
-                //                   .Draw(options, pen, yourPolygon));
-
-                //image.Save("cc.png");
-            }
-        }
-    }
-}
diff --git a/Lazy.Captcha.Test/Lazy.Captcha.Test.csproj b/Lazy.Captcha.Test/Lazy.Captcha.Test.csproj
deleted file mode 100644
index 26e60bb..0000000
--- a/Lazy.Captcha.Test/Lazy.Captcha.Test.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Lazy.Captcha.Core\Lazy.Captcha.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="inputs\fb.jpg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/Lazy.Captcha.Test/Program.cs b/Lazy.Captcha.Test/Program.cs
deleted file mode 100644
index ddf6b15..0000000
--- a/Lazy.Captcha.Test/Program.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-锘�// See https://aka.ms/new-console-template for more information
-using Lazy.Captcha.Core;
-using Lazy.Captcha.Core.Generator;
-using Lazy.Captcha.Core.Generator.Code;
-using Lazy.Captcha.Test;
-using SixLabors.ImageSharp;
-using System.Diagnostics;
-
-Console.WriteLine("Hello, World!");
-
-
-Demo8.Run();
-
diff --git a/Lazy.Captcha.Test/inputs/fb.jpg b/Lazy.Captcha.Test/inputs/fb.jpg
deleted file mode 100644
index 305294f47eee72bcc7fe5ec3fce0d33d39d0b293..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15787
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

diff --git a/Lazy.Captcha.Web/Controllers/CaptchaController.cs b/Lazy.Captcha.Web/Controllers/CaptchaController.cs
index 42e3548..26b19ce 100644
--- a/Lazy.Captcha.Web/Controllers/CaptchaController.cs
+++ b/Lazy.Captcha.Web/Controllers/CaptchaController.cs
@@ -18,6 +18,8 @@ namespace Lazy.Captcha.Web.Controllers
         public IActionResult Captcha(string id)
         {
             var info = _captcha.Generate(id);
+            // 鍙兘浼氭湁澶氬楠岃瘉鐮佷笖杩囨湡鏃堕棿涓嶄竴鏍凤紝鍙紶绗簩涓弬鏁拌鐩栭粯璁ら厤缃�傦紙https://gitee.com/pojianbing/lazy-captcha/issues/I4XHGM锛�
+            //var info = _captcha.Generate(id,120);
             var stream = new MemoryStream(info.Bytes);
             return File(stream, "image/gif");
         }
@@ -26,19 +28,19 @@ namespace Lazy.Captcha.Web.Controllers
         /// 婕旂ず鏃朵娇鐢℉ttpGet浼犲弬鏂逛究锛岃繖閲屼粎鍋氳繑鍥炲鐞�
         /// </summary>
         [HttpGet("validate")]
-        public Task<bool> Validate(string id, string code)
+        public bool Validate(string id, string code)
         {
-            return _captcha.ValidateAsync(id, code);
+            return _captcha.Validate(id, code);
         }
 
         /// <summary>
+        /// 涓�涓獙璇佺爜澶氭鏍￠獙锛坔ttps://gitee.com/pojianbing/lazy-captcha/issues/I4XHGM锛�
         /// 婕旂ず鏃朵娇鐢℉ttpGet浼犲弬鏂逛究锛岃繖閲屼粎鍋氳繑鍥炲鐞�
         /// </summary>
-        [HttpGet("validate_remove_later")]
-        public Task<bool> ValidateAndRemoveLater(string id, string code)
+        [HttpGet("validate2")]
+        public bool Validate2(string id, string code)
         {
-            // 涓轰簡婕旂ず锛岃繖閲屼粎鍋氳繑鍥炲鐞� 涓庝笂闈㈡柟娉曚竴鏍凤紝浣嗘槸杩欓噷鏍￠獙鏃讹紝璁茶繃鏈熸椂闂磋缃负10绉掑悗锛屽鏌ヤ簡涓�娆★紝鎬ц兘涓嶅鐩存帴鍒犻櫎
-            return _captcha.ValidateAsync(id, code, TimeSpan.FromSeconds(10));
+            return _captcha.Validate(id, code, false);
         }
     }
 }
\ No newline at end of file
diff --git a/Lazy.Captcha.Web/appsettings.json b/Lazy.Captcha.Web/appsettings.json
index 3ace6bd..3a5c3e4 100644
--- a/Lazy.Captcha.Web/appsettings.json
+++ b/Lazy.Captcha.Web/appsettings.json
@@ -20,7 +20,7 @@
       "InterferenceLineCount": 4, // 骞叉壈绾挎暟閲�
       "FontFamily": "kaiti", // 鍖呭惈actionj,epilog,fresnel,headache,lexo,prefix,progbot,ransom,robot,scandal,kaiti
       "FrameDelay": 15, // 姣忓抚寤惰繜,Animation=true鏃舵湁鏁�, 榛樿30
-      "BackgroundColor": "#ffff00" //  鏍煎紡: rgb, rgba, rrggbb, or rrggbbaa format to match web syntax, 榛樿#fff
+      "BackgroundColor": "#ffffff" //  鏍煎紡: rgb, rgba, rrggbb, or rrggbbaa format to match web syntax, 榛樿#fff
     }
   }
 }
\ No newline at end of file
diff --git a/LazyCaptcha.sln b/LazyCaptcha.sln
index c5d601e..12fc604 100644
--- a/LazyCaptcha.sln
+++ b/LazyCaptcha.sln
@@ -3,15 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lazy.Captcha.Test", "Lazy.Captcha.Test\Lazy.Captcha.Test.csproj", "{78B1B0D1-0ED3-465E-BAC9-A663AE5A3D4E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lazy.Captcha.Core", "Lazy.Captcha.Core\Lazy.Captcha.Core.csproj", "{B640C86B-87E3-4CBE-94A9-2CA3AC704A08}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lazy.Captcha.Web", "Lazy.Captcha.Web\Lazy.Captcha.Web.csproj", "{18C83A51-3ECB-44FE-8ED4-62F59967487B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lazy.Captcha.Redis", "Lazy.Captcha.Redis\Lazy.Captcha.Redis.csproj", "{EC32628E-195E-4277-8026-EFAFA571432A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lazy.Captcha.xUnit", "Lazy.Captcha.xUnit\Lazy.Captcha.xUnit.csproj", "{4E63EE78-CE03-4D89-BF86-7AF2247082F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lazy.Captcha.xUnit", "Lazy.Captcha.xUnit\Lazy.Captcha.xUnit.csproj", "{4E63EE78-CE03-4D89-BF86-7AF2247082F2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,10 +17,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{78B1B0D1-0ED3-465E-BAC9-A663AE5A3D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78B1B0D1-0ED3-465E-BAC9-A663AE5A3D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78B1B0D1-0ED3-465E-BAC9-A663AE5A3D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78B1B0D1-0ED3-465E-BAC9-A663AE5A3D4E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B640C86B-87E3-4CBE-94A9-2CA3AC704A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B640C86B-87E3-4CBE-94A9-2CA3AC704A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B640C86B-87E3-4CBE-94A9-2CA3AC704A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-- 
Gitee