From e5bbf0b2986a0040339c81fd3a0343133dda1129 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: Wed, 1 Dec 2021 16:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysConfigController.cs |   2 ++
 .../Controllers/System/SysLoginController.cs  |  27 ++++++++++++++++--
 .../Business/IBusService/ISysConfigService.cs |   1 +
 ZR.Service/System/SysConfigService.cs         |   5 ++++
 ZR.Vue/src/utils/request.js                   |   2 +-
 ZR.Vue/src/views/login.vue                    |   8 ++++--
 document/admin-mysql.sql                      |   4 +--
 document/admin-sqlserver.sql                  | Bin 116298 -> 115836 bytes
 8 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
index 6a48e29..3bd9a6a 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
@@ -17,6 +17,7 @@ using ZR.Common;
 using ZR.Service.System;
 using ZR.Model.System;
 using Infrastructure.Extensions;
+using Microsoft.AspNetCore.Authorization;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -83,6 +84,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <param name="configKey"></param>
         /// <returns></returns>
         [HttpGet("configKey/{configKey}")]
+        [AllowAnonymous]
         public IActionResult GetConfigKey(string configKey)
         {
             //TODO 增加缓存
diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
index 13cfd24..b76f953 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
@@ -15,6 +15,7 @@ using ZR.Model.System.Dto;
 using ZR.Service.System.IService;
 using Hei.Captcha;
 using ZR.Common;
+using ZR.Service.System;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -30,6 +31,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         private readonly ISysLoginService sysLoginService;
         private readonly ISysPermissionService permissionService;
         private readonly SecurityCodeHelper SecurityCodeHelper;
+        private readonly ISysConfigService sysConfigService;
 
         public SysLoginController(
             IHttpContextAccessor contextAccessor,
@@ -37,6 +39,7 @@ namespace ZR.Admin.WebApi.Controllers.System
             ISysUserService sysUserService,
             ISysLoginService sysLoginService,
             ISysPermissionService permissionService,
+            ISysConfigService configService,
             SecurityCodeHelper captcha)
         {
             httpContextAccessor = contextAccessor;
@@ -45,6 +48,7 @@ namespace ZR.Admin.WebApi.Controllers.System
             this.sysUserService = sysUserService;
             this.sysLoginService = sysLoginService;
             this.permissionService = permissionService;
+            this.sysConfigService = configService;
         }
 
 
@@ -60,7 +64,8 @@ namespace ZR.Admin.WebApi.Controllers.System
         {
             if (loginBody == null) { throw new CustomException("请求参数错误"); }
             loginBody.LoginIP = HttpContextExtension.GetClientUserIp(HttpContext);
-            if (CacheHelper.Get(loginBody.Uuid) is string str && !str.ToLower().Equals(loginBody.Code.ToLower()))
+            SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
+            if (sysConfig?.ConfigValue != "off" && CacheHelper.Get(loginBody.Uuid) is string str && !str.ToLower().Equals(loginBody.Code.ToLower()))
             {
                 throw new CustomException(ResultCode.CAPTCHA_ERROR, "验证码错误");
             }
@@ -136,8 +141,26 @@ namespace ZR.Admin.WebApi.Controllers.System
         public ApiResult CaptchaImage()
         {
             string uuid = Guid.NewGuid().ToString().Replace("-", "");
+
+            SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
             var code = SecurityCodeHelper.GetRandomEnDigitalText(4);
-            var imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);
+            byte[] imgByte;
+            if (sysConfig.ConfigValue == "1")
+            {
+                imgByte = SecurityCodeHelper.GetGifEnDigitalCodeByte(code);//动态gif数字字母
+            }
+            else if (sysConfig.ConfigValue == "2")
+            {
+                imgByte = SecurityCodeHelper.GetGifBubbleCodeByte(code);//动态gif泡泡
+            }
+            else if (sysConfig.ConfigValue == "3")
+            {
+                imgByte = SecurityCodeHelper.GetBubbleCodeByte(code);//泡泡
+            }
+            else
+            {
+                imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);//英文字母加数字
+            }
             string base64Str = Convert.ToBase64String(imgByte);
             CacheHelper.SetCache(uuid, code);
             var obj = new { uuid, img = base64Str };// File(stream, "image/png")
diff --git a/ZR.Service/Business/IBusService/ISysConfigService.cs b/ZR.Service/Business/IBusService/ISysConfigService.cs
index 182b403..a8c68f8 100644
--- a/ZR.Service/Business/IBusService/ISysConfigService.cs
+++ b/ZR.Service/Business/IBusService/ISysConfigService.cs
@@ -12,5 +12,6 @@ namespace ZR.Service.System
     /// </summary>
     public interface ISysConfigService: IBaseService<SysConfig>
     {
+        SysConfig GetSysConfigByKey(string key);
     }
 }
diff --git a/ZR.Service/System/SysConfigService.cs b/ZR.Service/System/SysConfigService.cs
index b477dda..9b2f8a5 100644
--- a/ZR.Service/System/SysConfigService.cs
+++ b/ZR.Service/System/SysConfigService.cs
@@ -18,6 +18,11 @@ namespace ZR.Service.System
 
         #region 业务逻辑代码
 
+        public SysConfig GetSysConfigByKey(string key)
+        {
+            return _SysConfigrepository.Queryable().First(f => f.ConfigKey == key);
+        }
+
         #endregion
     }
 }
\ No newline at end of file
diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js
index 53a54de..85dd568 100644
--- a/ZR.Vue/src/utils/request.js
+++ b/ZR.Vue/src/utils/request.js
@@ -54,7 +54,7 @@ service.interceptors.response.use(res => {
     }
     ).then(() => {
       store.dispatch('LogOut').then(() => {
-        location.href = process.env.VUE_APP_ROUTER_PREFIX + '/index';
+        location.href = '/index';
       })
     })
 
diff --git a/ZR.Vue/src/views/login.vue b/ZR.Vue/src/views/login.vue
index edfe6bc..86c89b3 100644
--- a/ZR.Vue/src/views/login.vue
+++ b/ZR.Vue/src/views/login.vue
@@ -12,7 +12,7 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code">
+      <el-form-item prop="code" v-if="showCaptcha != 'off'">
         <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleLogin" ref="codeTxt">
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
@@ -38,7 +38,7 @@
 <script>
 import { getCodeImg } from "@/api/system/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from "@/utils/jsencrypt";
+// import { encrypt, decrypt } from "@/utils/jsencrypt";
 import defaultSettings from "@/settings";
 
 export default {
@@ -66,6 +66,7 @@ export default {
           { required: true, trigger: "change", message: "验证码不能为空" },
         ],
       },
+			showCaptcha: '',
       loading: false,
       redirect: undefined,
     };
@@ -81,6 +82,9 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
+    this.getConfigKey("sys.account.captchaOnOff").then((response) => {
+      this.showCaptcha = response.data;
+    });
   },
   methods: {
     getCode() {
diff --git a/document/admin-mysql.sql b/document/admin-mysql.sql
index 9515c72..5ca36d6 100644
--- a/document/admin-mysql.sql
+++ b/document/admin-mysql.sql
@@ -525,7 +525,7 @@ CREATE TABLE `sys_user`  (
 -- ----------------------------
 INSERT INTO `sys_user` VALUES (1, 0, 'admin', '管理员', '0', '', '', '0', '', 'e10adc3949ba59abbe56e057f20f883e', '0', '0', '127.0.0.1', '2021-08-23 14:03:17', 'admin', '2020-11-26 11:52:59', 'admin', '2021-08-03 10:11:24', '管理员');
 INSERT INTO `sys_user` VALUES (2, 0, 'zr', 'zr', '0', NULL, NULL, '0', '', 'e10adc3949ba59abbe56e057f20f883e', '0', '0', '', '0001-01-01 00:00:00', 'admin', '2021-07-05 17:29:13', 'admin', '2021-08-02 16:53:04', '普通用户2');
-INSERT INTO `sys_user` VALUES (3, 100, 'editor', '编辑人员', '0', NULL, NULL, '2', 'http://www.izhaorui.cn/static/pay.jpg', 'E10ADC3949BA59ABBE56E057F20F883E', '0', '0', '127.0.0.1', '2021-08-19 09:27:46', 'admin', '2021-08-18 18:24:53', '', NULL, NULL);
+INSERT INTO `sys_user` VALUES (3, 100, 'editor', '编辑人员', '0', NULL, NULL, '2', '', 'E10ADC3949BA59ABBE56E057F20F883E', '0', '0', '127.0.0.1', '2021-08-19 09:27:46', 'admin', '2021-08-18 18:24:53', '', NULL, NULL);
 
 SET FOREIGN_KEY_CHECKS = 1;
 
@@ -636,7 +636,7 @@ create table sys_config (
 insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
 insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 'admin', sysdate(), '', null, '初始化密码 123456' );
 insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' );
--- insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaOnOff',      'true',          'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）');
+insert into sys_config values(4, '账号自助-验证码开关',           'sys.account.captchaOnOff',      'true',          'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（off、关闭，1、动态验证码 2、动态gif泡泡 3、泡泡 4、静态验证码）');
 
 -- ----------------------------
 -- 18、代码生成业务表
diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index 7ee2ff01971fdcdf2ab9c67aef260810c6b4f893..49a0cff3f728c581c6d50d76ee77faae7752e771 100644
GIT binary patch
delta 391
zcmX@r!~Um(y<rQZQ-C}t11EzzLn1>8LoP!mLmrT=0~T3W%~lc-qCVZwo>6?dK@elb
zWQPK_$rs%DCL5e%o1C{-VDg0*ER*XD`KE6RWb~7T7*oYi1T_F;D4aJvF@Uibr+&X+
z#xO>O=?jAy4W~QUGqQ22gUwK2P?-Kan6Vg_K2EXviT%6$fNtFWJA|>CXZnKmjB=CK
z^G)BC$hZZ};Z$JoV+dvNVepxLJ&AEAn%MTA$&BH?)3>c-w3|L<BV!TJ_WbpXqSFhy
z8Cj;^TFdAW#SpI_(lhH|H)F;8puY_q|MMBrfRNFkIPmRMp8tkG)`}p;1c(X+1|ujx
i9T<#h3=eZ2<|r^21H~XL6Cf*cI!yKUd7Btl2m=6OntbyB

delta 648
zcmbVJOG|=56ulSBtPB$~sHkjFLX^(v=My4ok!=F~dXdq?AXm{s3!;_ng4|6t5J9cl
zR74<1OCeeW1^t8mK#TT;-5FgLM2or1oqO&%hcllCjZekKLJ235!r&b;ox~F-hX6#t
z2dsX$80T*B=CHT}5Cji!Fd$CTAXN?#v7hMgV=zK@PBj2wjo~y6QKxE*FkWJ?x@-GP
zZz@E9xV&;8g>x<scwrB6RELQ`-=)*UPLUjKmR%;c$;T9~{NV0m$StD0w=+WOjMS9F
zh~|!IonT$v?g&#K(!QD2T{Ll79%ZmyzL?l0Sk5li44b%EvdT{rw|>y7Cn1<&budu;
zDyulLh3hI77l)|!5Y<zaRY+9QJ(BrI$hVHR^1}>f?V>Pg`!%;(wqa38^vL-&Ed2>w
z3%RXDg`kYZC|aJu`~NPNo$I(T-7rGAdgSvpj>*eg%r$J&C+*0)E9{nMH#imaX9s6t
y)jwN2tsLU+x%pMFRW$}SK)u_mS;)X9<f+f6-jAEAUimtY%VpyZr(Bj+XohdxK8i2^