From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 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 63adb21..1ec9396 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
@@ -58,6 +58,60 @@
@Autowired
private ZfRegisterService registerService;
+ public String loginWithoutValidate(String username, String password)
+ {
+ // 鐧诲綍鍓嶇疆鏍￠獙
+ loginPreCheck(username, password);
+ // 鐢ㄦ埛楠岃瘉
+ Authentication authentication = null;
+ try
+ {
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+ AuthenticationContextHolder.setContext(authenticationToken);
+ // 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
+ authentication = authenticationManager.authenticate(authenticationToken);
+ }
+ catch (Exception e)
+ {
+ if (e instanceof BadCredentialsException)
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+ throw new UserPasswordNotMatchException();
+ }
+ else
+ {
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+ throw new ServiceException(e.getMessage());
+ }
+ }
+ finally
+ {
+ AuthenticationContextHolder.clearContext();
+ }
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+ LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+ recordLoginInfo(loginUser.getUserId());
+
+
+ SysUser sysUser = userService.selectUserByUserName(username);
+ Long userId = sysUser.getUserId();
+ // 鐢熸垚token
+ String token = tokenService.createToken(loginUser);
+
+ SysUserRole1 sysUserRole = registerService.selectUserRole(userId);
+ if(sysUserRole==null){
+ //濡傛灉鐢ㄦ埛杩樻病鏈夎璧嬩簣瑙掕壊锛岄偅灏辩粰涓�涓粯璁ゆ槸瀹跺涵鎴愬憳鐨勮鑹�
+ registerService.setRoleToUser(userId, 102L);
+ }
+ return token;
+ }
+
+
+
+
+
+
+
/**
* 鐧诲綍楠岃瘉
*
--
Gitblit v1.9.1