修改验证码 为点选

pull/22/head
ZouLiFu 2021-01-22 09:56:36 +08:00
parent d1b1966f25
commit a497693b82
5 changed files with 46 additions and 71 deletions

View File

@ -6,8 +6,8 @@ import { axios } from '@/utils/request'
// 获取验证图片 以及token
export function reqGet(data) {
return axios({
url: '/captcha/code',
method: 'get',
url: '/captcha/get',
method: 'post',
data
})
}
@ -15,7 +15,7 @@ export function reqGet(data) {
// 滑动或者点选验证
export function reqCheck(data) {
return axios({
url: '/captcha/code/check',
url: '/captcha/check',
method: 'post',
data
})

View File

@ -204,19 +204,19 @@ export default {
} = this
state.loginBtn = true
const validateFieldsKey = customActiveKey === 'tab1' ? ['account', 'password'] : ['mobile', 'captcha']
if (this.tenantOpen) {
validateFieldsKey.push('tenantCode')
}
validateFields(validateFieldsKey, { force: true }, (err, values) => {
if (!err) {
this.loginParams = values
//
if (this.captchaOpen) {
this.$refs.verify.show()
state.loginBtn = false
return
}
if (!err) {
const loginParams = { ...values }
delete loginParams.account
loginParams[!state.loginType ? 'email' : 'account'] = values.account
@ -242,6 +242,7 @@ export default {
*/
verifySuccess(params) {
this.loginParams.code = params.captchaVerification
console.log(this.loginParams)
this.Login(this.loginParams).then((res) => this.loginSuccess(res))
.catch(err => this.requestFailed(err))
.finally(() => {

View File

@ -25,10 +25,8 @@ XiaoNuo采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注
package com.cn.xiaonuo.sys.modular.auth.controller;
import cn.hutool.core.lang.Dict;
import com.anji.captcha.model.common.ResponseModel;
import com.anji.captcha.model.vo.CaptchaVO;
import com.anji.captcha.service.CaptchaService;
import com.cn.xiaonuo.core.consts.CommonConstant;
import com.cn.xiaonuo.core.context.constant.ConstantContextHolder;
import com.cn.xiaonuo.core.context.login.LoginContextHolder;
import com.cn.xiaonuo.core.exception.AuthException;
@ -130,31 +128,6 @@ public class SysLoginController {
return new SuccessResponseData(ConstantContextHolder.getCaptchaOpenFlag());
}
/**
* @Description
* @Date 2021/1/21 15:25
* @author Jax
* @return ResponseModel
**/
@GetMapping("/captcha/code")
public ResponseModel getCode() {
CaptchaVO vo = new CaptchaVO();
vo.setCaptchaType(CommonConstant.IMAGE_CODE_TYPE);
return captchaService.get(vo);
}
/**
* @Description
* @Date 2021/1/21 15:26
* @author Jax
* @param captcha
* @return ResponseModel
**/
@PostMapping("/captcha/code/check")
public ResponseModel check(@RequestBody CaptchaVO captcha) {
return captchaService.check(captcha);
}
/**
* @Description
* @Date 2021/1/21 15:27

View File

@ -13,36 +13,36 @@ import java.util.concurrent.TimeUnit;
* @Author Jax
* @Date 2021/1/21 16:27
**/
//public class CaptchaCacheServiceProvider implements CaptchaCacheService {
//
// private static final String REDIS = "redis";
//
// @Autowired
// private StringRedisTemplate stringRedisTemplate;
//
// @Override
// public void set(String key, String value, long expiresInSeconds) {
// stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
// }
//
// @Override
// public boolean exists(String key) {
// return stringRedisTemplate.hasKey(key);
// }
//
// @Override
// public void delete(String key) {
// stringRedisTemplate.delete(key);
// }
//
// @Override
// public String get(String key) {
// return stringRedisTemplate.opsForValue().get(key);
// }
//
// @Override
// public String type() {
// return REDIS;
// }
//
//}
public class CaptchaCacheServiceProvider implements CaptchaCacheService {
private static final String REDIS = "redis";
@Autowired
private StringRedisTemplate stringRedisTemplate;
@Override
public void set(String key, String value, long expiresInSeconds) {
stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public boolean exists(String key) {
return stringRedisTemplate.hasKey(key);
}
@Override
public void delete(String key) {
stringRedisTemplate.delete(key);
}
@Override
public String get(String key) {
return stringRedisTemplate.opsForValue().get(key);
}
@Override
public String type() {
return REDIS;
}
}

View File

@ -59,5 +59,6 @@ jodconverter:
#验证码相关配置
aj:
captcha:
type: clickword #验证码类型 为点选
cache-type: local #分布式部署需要 自己实现CaptchaCacheService 使用redis需要配置redis相关配置
type: clickword #验证码类型 为点选 blockPuzzle 为滑块验证码
font-type: 宋体