From 04dba6a17f836b5fbdf0eedff8a129c6785fd8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 18:25:00 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java |   17 ++++++++---------
 1 files changed, 8 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 8c22890..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) {
@@ -120,12 +120,11 @@
             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.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