From 8d41de6c0aacb1d860667599f6c8fe2c3084bf60 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Thu, 21 Jan 2021 15:09:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/sms/modular/aliyun/AliyunSmsSender.java | 12 ++++++------ .../aliyun/msign/impl/MapBasedMultiSignManager.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java index 6219f26b..8700c7fb 100644 --- a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java +++ b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java @@ -39,7 +39,7 @@ public class AliyunSmsSender implements SmsSender { @Override public void sendSms(String phone, String templateCode, Map params) { - log.info("开始发送阿里云短信,手机号是:" + phone + ",模板号是:" + templateCode + ",参数是:" + params); + log.info(">>> 开始发送阿里云短信,手机号是:" + phone + ",模板号是:" + templateCode + ",参数是:" + params); // 检验参数是否合法 assertSendSmsParams(phone, templateCode, params, aliyunSmsProperties); @@ -62,7 +62,7 @@ public class AliyunSmsSender implements SmsSender { errorMessage = smsExceptionEnum.getMessage(); } } - log.error("发送短信异常!code = " + code + ",message = " + errorMessage); + log.error(">>> 发送短信异常!code = " + code + ",message = " + errorMessage); throw new AliyunSmsException(code, errorMessage); } } @@ -112,10 +112,10 @@ public class AliyunSmsSender implements SmsSender { commonResponse = acsClient.getCommonResponse(request); String data = commonResponse.getData(); String jsonResult = data.replaceAll("'\'", ""); - log.info("获取到发送短信的响应结果!{}", jsonResult); + log.info(">>> 获取到发送短信的响应结果!{}", jsonResult); return JSON.parseObject(jsonResult); } catch (ClientException e) { - log.error("初始化阿里云sms异常!可能是accessKey和secret错误!", e); + log.error(">>> 初始化阿里云sms异常!可能是accessKey和secret错误!", e); throw new AliyunSmsException(AliyunSmsResultEnum.INIT_SMS_CLIENT_ERROR.getCode(), AliyunSmsResultEnum.INIT_SMS_CLIENT_ERROR.getMessage()); } @@ -130,7 +130,7 @@ public class AliyunSmsSender implements SmsSender { private void assertSendSmsParams(String phoneNumber, String templateCode, Map params, AliyunSmsProperties aliyunSmsProperties) { if (ObjectUtil.hasEmpty(phoneNumber, templateCode, params, aliyunSmsProperties)) { - log.error("阿里云短信发送异常!请求参数存在空!"); + log.error(">>> 阿里云短信发送异常!请求参数存在空!"); throw new AliyunSmsException(AliyunSmsResultEnum.PARAM_NULL.getCode(), AliyunSmsResultEnum.PARAM_NULL.getMessage()); } } @@ -146,7 +146,7 @@ public class AliyunSmsSender implements SmsSender { // 如果是单个签名就用一个签名发 if (!signName.contains(",")) { - log.info("发送短信,签名为:" + signName + ",电话为:" + phone); + log.info(">>> 发送短信,签名为:" + signName + ",电话为:" + phone); return signName; } else { return multiSignManager.getSign(phone, signName); diff --git a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/msign/impl/MapBasedMultiSignManager.java b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/msign/impl/MapBasedMultiSignManager.java index c333a301..81a033f0 100644 --- a/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/msign/impl/MapBasedMultiSignManager.java +++ b/xiaonuo-base/xiaonuo-core/src/main/java/com/cn/xiaonuo/core/sms/modular/aliyun/msign/impl/MapBasedMultiSignManager.java @@ -33,18 +33,18 @@ public class MapBasedMultiSignManager implements MultiSignManager { Object lastSignName = cacheMap.get(phone); if (lastSignName == null) { cacheMap.put(phone, signNames[0]); - log.info("发送短信,签名为:" + signNames[0] + ",电话为:" + phone); + log.info(">>> 发送短信,签名为:" + signNames[0] + ",电话为:" + phone); return signNames[0]; } else { for (String name : signNames) { if (!name.equals(lastSignName)) { cacheMap.put(phone, name); - log.info("发送短信,签名为:" + name + ",电话为:" + phone); + log.info(">>> 发送短信,签名为:" + name + ",电话为:" + phone); return name; } } cacheMap.put(phone, signNames[0]); - log.info("发送短信,签名为:" + signNames[0] + ",电话为:" + phone); + log.info(">>> 发送短信,签名为:" + signNames[0] + ",电话为:" + phone); return signNames[0]; } } From ae368dc1172c36330d8b9993bf80aaab37a404b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E5=AE=9D=E5=B1=B1?= <1253070437@qq.com> Date: Fri, 22 Jan 2021 00:38:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _web/src/api/modular/system/loginManage.js | 6 +- _web/src/components/verifition/Verify.vue | 110 +++--- .../verifition/Verify/VerifyPoints.vue | 228 ++++++------ .../verifition/Verify/VerifySlide.vue | 327 ++++++++++-------- _web/src/components/verifition/utils/ase.js | 12 +- _web/src/components/verifition/utils/axios.js | 10 +- _web/src/components/verifition/utils/util.js | 24 +- .../constant/ConstantContextHolder.java | 10 +- .../exception/enums/AuthExceptionEnum.java | 4 +- .../auth/controller/SysLoginController.java | 42 ++- .../provider/CaptchaCacheServiceProvider.java | 73 ++-- 11 files changed, 454 insertions(+), 392 deletions(-) diff --git a/_web/src/api/modular/system/loginManage.js b/_web/src/api/modular/system/loginManage.js index df575074..23415eeb 100644 --- a/_web/src/api/modular/system/loginManage.js +++ b/_web/src/api/modular/system/loginManage.js @@ -76,11 +76,11 @@ export function getSmsCaptcha (parameter) { }) } - /** * 获取验证码开关 + * * @author Jax - * @param parameter + * @date 2021/1/22 00:00 */ export function getCaptchaOpen (parameter) { return axios({ @@ -88,4 +88,4 @@ export function getCaptchaOpen (parameter) { method: 'get', params: parameter }) -} \ No newline at end of file +} diff --git a/_web/src/components/verifition/Verify.vue b/_web/src/components/verifition/Verify.vue index 9c6f32bd..e7b6d1ae 100644 --- a/_web/src/components/verifition/Verify.vue +++ b/_web/src/components/verifition/Verify.vue @@ -1,30 +1,31 @@