From 54aff4794f199c40323e8704f660819b73fea768 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 28 九月 2025 16:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 43 ++++++++-----------------------------------
1 files changed, 8 insertions(+), 35 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..385d707 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,9 @@
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;
@@ -90,9 +86,6 @@
private ISysConfigService configService;
@Autowired
- private SsoBean ssoBean;
-
- @Autowired
private RedisTemplate redisTemplate;
/**
@@ -106,8 +99,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 +239,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 +255,7 @@
Authentication authentication = null;
SysUser sysUser = sysUserService.selectUserByUserName(username);
if (sysUser == null) {
- throw new ServiceException("鐢ㄦ埛涓嶅瓨鍦�");
+ throw new ServiceException("褰撳墠绯荤粺娌℃湁璇ョ敤鎴�");
}
try
{
@@ -273,7 +266,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 +279,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();
}
@@ -299,21 +292,7 @@
* @return
*/
public SsoOauthTokenModel getSsoAccessToken(String code) {
- List<NameValuePair> list = new LinkedList<>();
- list.add(new BasicNameValuePair("grant_type", "authorization_code"));
- list.add(new BasicNameValuePair("code", code));
- list.add(new BasicNameValuePair("client_id", ssoBean.getClientId()));
- list.add(new BasicNameValuePair("client_secret", ssoBean.getClientSecret()));
- list.add(new BasicNameValuePair("redirect_uri", ssoBean.getCallbackUrl()));
-
- Map<String, String> headers = new HashMap<>();
- headers.put("Content-Type", "application/x-www-form-urlencoded");
- headers.put("Accept", "application/json");
- String result = doPost(ssoBean.getUrl() + "/oauth2/token", headers, list);
- if (org.apache.commons.lang3.StringUtils.isBlank(result)) {
- return null;
- }
- return JSON.parseObject(result, SsoOauthTokenModel.class);
+ return null;
}
/**
@@ -322,13 +301,7 @@
* @return
*/
public SsoUserInfoModel getSsoUserInfo(String accessToken) {
- Map<String, String> headers = new HashMap<>();
- headers.put("Authorization", "Bearer " + accessToken);
- String result = doPost(ssoBean.getUrl() + "/userinfo", headers, null);
- if (org.apache.commons.lang3.StringUtils.isBlank(result)) {
- return null;
- }
- return JSON.parseObject(result, SsoUserInfoModel.class);
+ return null;
}
public static String doPost(String url, Map<String, String> headers, List<NameValuePair> params) {
--
Gitblit v1.9.3