From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 18b2ecc..d1a6d7d 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) {
@@ -80,14 +80,14 @@
loginLog.setLoginTime(new Date());
loginLog.setSystemVersion(systemVersion);
loginLog.setIp(Utils.User_Client.getIP(request));
- loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
+// loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
loginLog.setPlatform(Utils.User_Client.getPlatform(request));
loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
loginLog.setOsInfo(Utils.User_Client.getOS(request));
loginLog.setServerIp(Utils.Server.getIP());
if(needCheckCode){
// 鏍￠獙楠岃瘉鐮�
- if(captchaCheck) {
+ if(!debugModel) {
try {
captchaService.check(dto.getUuid(), dto.getCode());
} catch (Exception e) {
@@ -123,12 +123,8 @@
if (e.getCause() instanceof BusinessException) {
throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), e.getCause().getMessage());
}
- throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "鎻愮ず瀵逛笉璧凤紝璐﹀彿鎴栧瘑鐮侀敊璇紒");
+ throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "瀵逛笉璧凤紝璐﹀彿鎴栧瘑鐮侀敊璇紒");
}
}
-
-
-
-
}
--
Gitblit v1.9.3