From 3b20b8b1316e47b0d92cc64f965a78d198b29944 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 18 四月 2025 08:56:15 +0800
Subject: [PATCH] 1.添加设备使用授权 2.报告编制添加导出功能

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index c0b181b..bc666cb 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -4,13 +4,10 @@
 import javax.net.ssl.SSLContext;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.config.SsoBean;
-import com.ruoyi.common.core.domain.entity.User;
 import com.ruoyi.framework.model.SsoOauthTokenModel;
 import com.ruoyi.framework.model.SsoUserInfoModel;
 import com.ruoyi.framework.web.ssoAuth.SsoCodeAuthenticationToken;
-import com.ruoyi.system.mapper.UserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
@@ -106,8 +103,8 @@
      */
     public String login(String username, String password, String code, String uuid)
     {
-        // 楠岃瘉鐮佹牎楠�
-        validateCaptcha(username, code, uuid);
+//        // 楠岃瘉鐮佹牎楠�
+//        validateCaptcha(username, code, uuid);
         // 鐧诲綍鍓嶇疆鏍¢獙
         loginPreCheck(username, password);
         // 鐢ㄦ埛楠岃瘉
@@ -262,7 +259,7 @@
         Authentication authentication = null;
         SysUser sysUser = sysUserService.selectUserByUserName(username);
         if (sysUser == null) {
-            throw new ServiceException("鍗曠偣鐧诲綍楠岃瘉澶辫触");
+            throw new ServiceException("褰撳墠绯荤粺娌℃湁璇ョ敤鎴�");
         }
         try
         {

--
Gitblit v1.9.3