From 9088209cdd7e3158d2a04caae05e6726ba3b3ad6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 十二月 2023 18:26:17 +0800
Subject: [PATCH] Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkBike into devPartner
---
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index 2c509ff..cf9c37f 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -51,8 +51,8 @@
private SystemDictDataBiz systemDictDataBiz;
- @Value("${captcha_check}")
- private Boolean captchaCheck;
+ @Value("${debug_model}")
+ private Boolean debugModel;
@Override
public String loginByPassword(LoginDTO dto, HttpServletRequest request) {
@@ -87,7 +87,7 @@
loginLog.setServerIp(Utils.Server.getIP());
if(needCheckCode){
// 鏍￠獙楠岃瘉鐮�
- if(captchaCheck) {
+ if(!debugModel) {
try {
captchaService.check(dto.getUuid(), dto.getCode());
} catch (Exception e) {
@@ -120,7 +120,10 @@
loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
loginLog.setSuccess(Constants.ONE);
systemLoginLogService.create(loginLog);
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),e.getCause().getMessage());
+ if (e.getCause() instanceof BusinessException) {
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), e.getCause().getMessage());
+ }
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "瀵逛笉璧凤紝璐﹀彿鎴栧瘑鐮侀敊璇紒");
}
}
--
Gitblit v1.9.3