From 4806b676dbbab4675e5ee43b4018f2cd9d43797f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 23 十月 2023 17:15:09 +0800
Subject: [PATCH] 1. 将sdk动态链接库dll集成到项目内,提升部署便捷性； 2. 增加设备断线重连回调方法，打印相关日志； 3. 删除多余依赖，减小jar包体积； 4. 处理SDK日志打印；
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 65f812c..f3fa8aa 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
@@ -50,6 +50,7 @@
@Autowired
private ISysConfigService configService;
+
@Resource
RongCloudService rongCloudService;
@@ -63,6 +64,8 @@
* @return 缁撴灉
*/
public String login(String username, String password, String code, String uuid) {
+
+
boolean captchaEnabled = configService.selectCaptchaEnabled();
// 楠岃瘉鐮佸紑鍏�
if (captchaEnabled) {
@@ -89,10 +92,10 @@
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
recordLoginInfo(loginUser.getUserId());
+
+ getRongCloudToken(loginUser);
// 鐢熸垚token
String token = tokenService.createToken(loginUser);
- //鑾峰彇铻嶄簯token
- getRongCloudToken(loginUser);
return token;
}
/**
@@ -134,7 +137,7 @@
*
* @param loginUser 鐧诲綍鐢ㄦ埛
*/
- public void getRongCloudToken(LoginUser loginUser) {
+ public String getRongCloudToken(LoginUser loginUser) {
try {
String userId = loginUser.getUserId();
String nickName = loginUser.getUser().getNickName();
@@ -144,6 +147,7 @@
sysUser.setUserId(userId);
sysUser.setRongCloudToken(token);
userService.updateUserProfile(sysUser);
+ return token;
} catch (Exception ex) {
throw ex;
}
--
Gitblit v1.9.3