From dd4e6d788efb23509248f2119137014a49452839 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 九月 2023 14:05:56 +0800
Subject: [PATCH] 提交

---
 server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index d9abcaa..452b0a0 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -27,6 +27,8 @@
 
     @Value("${project.version}")
     private String systemVersion;
+    @Value("${captcha_check}")
+    private boolean captchaCheck;
 
     @Autowired
     private CaptchaService captchaService;
@@ -35,7 +37,7 @@
     private SystemLoginLogService systemLoginLogService;
 
     @Override
-    public String loginByPassword(LoginDTO dto, HttpServletRequest request) {
+    public String loginByPassword(LoginDTO dto, int type,HttpServletRequest request) {
         SystemLoginLog loginLog = new SystemLoginLog();
         loginLog.setLoginUsername(dto.getUsername());
         loginLog.setLoginTime(new Date());
@@ -48,7 +50,9 @@
         loginLog.setServerIp(Utils.Server.getIP());
         // 鏍¢獙楠岃瘉鐮�
         try {
-            captchaService.check(dto.getUuid(), dto.getCode());
+            if(captchaCheck){
+                captchaService.check(dto.getUuid(), dto.getCode());
+            }
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());

--
Gitblit v1.9.3