From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 c5da313..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);
// 鐢ㄦ埛楠岃瘉
@@ -246,7 +243,7 @@
recordLoginInfo(loginUser.getUserId());
// 鍒涘缓鐧诲綍淇℃伅
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(userInfo.getEmployeeId(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.single.login.success")));
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(userInfo.getEmployeeId(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.sso.login.success")));
redisTemplate.opsForValue().set("ssoOauthToken:idToken:" + userInfo.getEmployeeId(), tokenModel.getId_token(), 3, TimeUnit.DAYS);
// 鐢熸垚token
return tokenService.createToken(loginUser);
@@ -262,7 +259,7 @@
Authentication authentication = null;
SysUser sysUser = sysUserService.selectUserByUserName(username);
if (sysUser == null) {
- throw new ServiceException("鐢ㄦ埛涓嶅瓨鍦�");
+ throw new ServiceException("褰撳墠绯荤粺娌℃湁璇ョ敤鎴�");
}
try
{
@@ -273,7 +270,7 @@
{
if (e instanceof BadCredentialsException)
{
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.sso.not.match")));
throw new UserPasswordNotMatchException();
}
else
@@ -286,7 +283,7 @@
{
AuthenticationContextHolder.clearContext();
}
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.sso.login.success")));
return (LoginUser) authentication.getPrincipal();
}
--
Gitblit v1.9.3