From 8ed5c75c6ae8f59652a2caad2a669ec2fbe56718 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 05 十二月 2023 12:56:33 +0800
Subject: [PATCH] update 优化 删除 hikaricp 官方不推荐使用的配置 jdbc4 协议自带校验方法
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
index 84e0b4d..37802b7 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -3,6 +3,7 @@
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -78,13 +79,13 @@
bo.setUserName(authUserData.getUsername());
bo.setNickName(authUserData.getNickname());
// 鏌ヨ鏄惁宸茬粡缁戝畾鐢ㄦ埛
- SysSocialVo vo = sysSocialService.selectByAuthId(authId);
- if (ObjectUtil.isEmpty(vo)) {
+ List<SysSocialVo> list = sysSocialService.selectByAuthId(authId);
+ if (CollUtil.isEmpty(list)) {
// 娌℃湁缁戝畾鐢ㄦ埛, 鏂板鐢ㄦ埛淇℃伅
sysSocialService.insertByBo(bo);
} else {
// 鏇存柊鐢ㄦ埛淇℃伅
- bo.setId(vo.getId());
+ bo.setId(list.get(0).getId());
sysSocialService.updateByBo(bo);
}
}
@@ -96,6 +97,9 @@
public void logout() {
try {
LoginUser loginUser = LoginHelper.getLoginUser();
+ if (ObjectUtil.isNull(loginUser)) {
+ return;
+ }
if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
// 瓒呯骇绠＄悊鍛� 鐧诲嚭娓呴櫎鍔ㄦ�佺鎴�
TenantHelper.clearDynamic();
--
Gitblit v1.9.3