From a7219048f55af09de72d06cde0b97f28ddfdb907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 11 Oct 2022 21:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysLoginController.cs  | 24 +++++++++++++++----
 ZR.Admin.WebApi/appsettings.json              |  6 ++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
index 0dbbf77c..90cd54b2 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
@@ -155,7 +155,24 @@ namespace ZR.Admin.WebApi.Controllers.System
             SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
             var captchaOff = sysConfig?.ConfigValue ?? "0";
 
-            var code = SecurityCodeHelper.GetRandomEnDigitalText(4);
+            var length = AppSettings.GetAppConfig<int>("CaptchaOptions:length", 4);
+            var code = SecurityCodeHelper.GetRandomEnDigitalText(length);
+            byte[] imgByte = GenerateCaptcha(captchaOff, code);
+            string base64Str = Convert.ToBase64String(imgByte);
+            CacheHelper.SetCache(uuid, code);
+            var obj = new { uuid, img = base64Str };// File(stream, "image/png")
+
+            return ToJson(1, obj);
+        }
+
+        /// <summary>
+        /// 生成图片验证码
+        /// </summary>
+        /// <param name="captchaOff"></param>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        private byte[] GenerateCaptcha(string captchaOff, string code)
+        {
             byte[] imgByte;
             if (captchaOff == "1")
             {
@@ -173,11 +190,8 @@ namespace ZR.Admin.WebApi.Controllers.System
             {
                 imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);//英文字母加数字
             }
-            string base64Str = Convert.ToBase64String(imgByte);
-            CacheHelper.SetCache(uuid, code);
-            var obj = new { uuid, img = base64Str };// File(stream, "image/png")
 
-            return ToJson(1, obj);
+            return imgByte;
         }
 
         /// <summary>
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index 503582b1..0d35c857 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -24,7 +24,7 @@
     "uploadUrl": "http://localhost:8888", //本地存储资源访问路径
     "localSavePath": "uploads", //本地上传默认文件存储目录 wwwroot/uploads
     "maxSize": 15, //上传文件大小限制 15M
-    "notAllowedExt": [ ".bat", ".exe", ".jar", ".js"]
+    "notAllowedExt": [ ".bat", ".exe", ".jar", ".js" ]
   },
   //阿里云存储配置
   "ALIYUN_OSS": {
@@ -105,5 +105,9 @@
       "IpRules": [
       ]
     }
+  },
+  //验证码配置
+  "CaptchaOptions": {
+    "length": 4
   }
 }