From 6fe7fc311af41b2e7616522f740fb087f4ad4da8 Mon Sep 17 00:00:00 2001
From: dongxiayu <chinadongxiayu@163.com>
Date: Fri, 4 Jun 2021 16:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=EF=BC=8C=E9=AA=8C=E8=AF=81=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E9=9A=8F=E6=9C=BA=20=E6=BB=91=E5=8A=A8/?=
 =?UTF-8?q?=E7=82=B9=E9=80=89=20=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _web/src/views/userLoginReg/Login.vue         | 17 ++++++++++++++---
 snowy-main/src/main/resources/application.yml |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/_web/src/views/userLoginReg/Login.vue b/_web/src/views/userLoginReg/Login.vue
index 96fb6cdb..538b2728 100644
--- a/_web/src/views/userLoginReg/Login.vue
+++ b/_web/src/views/userLoginReg/Login.vue
@@ -86,7 +86,7 @@
         <Verify
           @success="verifySuccess"
           :mode="'pop'"
-          :captchaType="'clickWord'"
+          :captchaType="captchaType"
           :imgSize="{ width: '330px', height: '155px' }"
           ref="verify"
         ></Verify>
@@ -139,6 +139,17 @@ export default {
     Verify
   },
   data () {
+    var captchaTypeValue = 'clickWord'
+    var min = 0
+    var max = 100
+    var random = Math.floor(Math.random() * (max - min)) + min
+
+    if (random % 2 === 0) {
+      captchaTypeValue = 'blockPuzzle'
+    }
+    if (random % 2 === 1) {
+      captchaTypeValue = 'clickWord'
+    }
     return {
       customActiveKey: 'tab1',
       loginBtn: false,
@@ -159,8 +170,8 @@ export default {
       tenantOpen: false,
       captchaOpen: false, // 是否开启验证码
       tenantsList: [],
-      loginParams: [] // 登录参数
-
+      loginParams: [], // 登录参数
+      captchaType: captchaTypeValue
     }
   },
   created () {
diff --git a/snowy-main/src/main/resources/application.yml b/snowy-main/src/main/resources/application.yml
index d93fd931..8378d9e4 100644
--- a/snowy-main/src/main/resources/application.yml
+++ b/snowy-main/src/main/resources/application.yml
@@ -66,7 +66,7 @@ logging:
 aj:
   captcha:
     cache-type: local #分布式部署需要 自己实现CaptchaCacheService 使用redis需要配置redis相关配置
-    type: clickword #验证码类型 为点选   blockPuzzle 为滑块验证码
+    type: default #验证码类型 clickword 为点选   blockPuzzle 为滑块验证码   default 两种都实例化
     font-type: 宋体
     req-frequency-limit-enable: true #接口请求次数一分钟限制是否开启 true|false
     req-get-lock-limit: 2  # 验证失败2次，get接口锁定