From c80135e5c3f7bfab96ba558a910a06f1e587c53c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:14:04 +0800
Subject: [PATCH] 1.新增@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") 2.将新增orgid的拦截器关掉 3.登陆新增campusid
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 93f9f7e..af9e233 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
@@ -2,6 +2,8 @@
import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
@@ -33,6 +35,7 @@
*
* @author ruoyi
*/
+@Slf4j
@Component
public class SysLoginService {
@Autowired
@@ -59,7 +62,7 @@
* @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
- public String login(String username, String password, String code, String uuid, String orgid) {
+ public String login(String username, String password, String code, String uuid, String orgid, String campusid) {
boolean captchaEnabled = configService.selectCaptchaEnabled();
// 楠岃瘉鐮佸紑鍏�
if (captchaEnabled) {
@@ -68,7 +71,7 @@
// 鐢ㄦ埛楠岃瘉
Authentication authentication = null;
try {
- UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid, password);
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid, password);
AuthenticationContextHolder.setContext(authenticationToken);
// 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
authentication = authenticationManager.authenticate(authenticationToken);
@@ -90,6 +93,23 @@
return tokenService.createToken(loginUser);
}
+
+ public String loginByUserName(String userName) {
+ SysUser sysUser = userService.selectUserByUserNameAndDeptId(userName);
+ log.info("---------sysUser鐨勫�间负:{}", sysUser);
+ if (ObjectUtils.isNotEmpty(sysUser)) {
+ // 鏋勫缓鐧诲綍鐢ㄦ埛瀵硅薄
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUser(sysUser);
+ loginUser.setUserId(sysUser.getUserId());
+ // 鍒涘缓 token
+ String token = tokenService.createToken(loginUser);
+ // 鐢熸垚token
+ return token;
+ }
+ return null;
+ }
+
/**
* 鏍￠獙楠岃瘉鐮�
*
--
Gitblit v1.9.3