From d954874fad36cb31a910a3bbce8bda04cb6e8be7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 10 八月 2023 11:30:42 +0800
Subject: [PATCH] 修改首次用户登录获取不到融云token的bug
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 38 +-------------------------------------
1 files changed, 1 insertions(+), 37 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 cd67a89..65f812c 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
@@ -95,43 +95,6 @@
getRongCloudToken(loginUser);
return token;
}
- public String login(String username, String password, String code, String uuid,Boolean isApp) {
- boolean captchaEnabled = configService.selectCaptchaEnabled();
- // 楠岃瘉鐮佸紑鍏�
- if (captchaEnabled) {
- validateCaptcha(username, code, uuid);
- }
- // 鐢ㄦ埛楠岃瘉
- 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());
- // 鐢熸垚token
- if(StringUtils.isNotNull(isApp))
- {
- loginUser.setIsApp(isApp);
- }
- String token = tokenService.createToken(loginUser);
- //鑾峰彇铻嶄簯token
- getRongCloudToken(loginUser);
- return token;
- }
/**
* 鏍￠獙楠岃瘉鐮�
*
@@ -176,6 +139,7 @@
String userId = loginUser.getUserId();
String nickName = loginUser.getUser().getNickName();
String token = rongCloudService.getToken(userId, nickName);
+ loginUser.setRongCloudToken(token);
SysUser sysUser = new SysUser();
sysUser.setUserId(userId);
sysUser.setRongCloudToken(token);
--
Gitblit v1.9.3