From 0662ed4d69b6270dec5c2214454023dfe8d46308 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 18:42:33 +0800
Subject: [PATCH] 变更
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 6e79b6e..c5b28e0 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
@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.wxopenidConfig.WxOpenIDAuthenticationToken;
import com.ruoyi.system.mapper.SysUserMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
@@ -36,6 +37,7 @@
*
* @author ruoyi
*/
+@Slf4j
@Component
public class SysLoginService {
@Autowired
@@ -66,7 +68,18 @@
* @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
- public String login(String username, String password, String code, String uuid, String openId) {
+ public String login(String username, String password, String code, String uuid, String openId, String dingUserId) {
+ log.info("username鏄惁涓虹┖锛歿},password鏄惁涓虹┖锛歿},dingUserId鏄惁涓虹┖锛歿}",username,password,dingUserId);
+ //鍏嶇櫥
+ if (StringUtils.isNotEmpty(dingUserId)) {
+ SysUser sysUser = sysUserMapper.selectUserByDingUserId(dingUserId);
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(sysUser.getUserId());
+ loginUser.setDeptId(sysUser.getDeptId());
+ loginUser.setUser(sysUser);
+ return tokenService.createToken(loginUser);
+ }
+
SysUser sysUser = sysUserMapper.selectUserByUserName(username);
if (sysUser.getErrorNums() >= 3) {
//鏍￠獙澶辫触娆℃暟
--
Gitblit v1.9.3