From 1a19c3b3a5e5f5d1766c08fe7d8258bb6d9a138a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 三月 2022 14:05:29 +0800
Subject: [PATCH] update 单独指定oracle心跳检查
---
ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
index a152208..7875c56 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
@@ -2,6 +2,7 @@
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserType;
@@ -12,7 +13,13 @@
/**
* 鐧诲綍閴存潈鍔╂墜
- * 涓洪�傞厤澶氱鐧诲綍鑰屽皝瑁�
+ *
+ * user_type 涓� 鐢ㄦ埛绫诲瀷 鍚屼竴涓敤鎴疯〃 鍙互鏈夊绉嶇敤鎴风被鍨� 渚嬪 pc,app
+ * deivce 涓� 璁惧绫诲瀷 鍚屼竴涓敤鎴风被鍨� 鍙互鏈� 澶氱璁惧绫诲瀷 渚嬪 web,ios
+ * 鍙互缁勬垚 鐢ㄦ埛绫诲瀷涓庤澶囩被鍨嬪瀵瑰鐨� 鏉冮檺鐏垫椿鎺у埗
+ *
+ * 澶氱敤鎴蜂綋绯� 閽堝 澶氱鐢ㄦ埛绫诲瀷 浣嗘潈闄愭帶鍒朵笉涓�鑷�
+ * 鍙互缁勬垚 澶氱敤鎴风被鍨嬭〃涓庡璁惧绫诲瀷 鍒嗗埆鎺у埗鏉冮檺
*
* @author Lion Li
*/
@@ -26,7 +33,6 @@
/**
* 鐧诲綍绯荤粺
- * 閽堝涓ゅ鐢ㄦ埛浣撶郴
*
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
@@ -38,7 +44,7 @@
/**
* 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
- * 閽堝涓�濂楃敤鎴蜂綋绯�
+ * 閽堝鐩稿悓鐢ㄦ埛浣撶郴涓嶅悓璁惧
*
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
@@ -125,12 +131,11 @@
* @return 缁撴灉
*/
public static boolean isAdmin(Long userId) {
- return userId != null && 1L == userId;
+ return UserConstants.ADMIN_ID.equals(userId);
}
public static boolean isAdmin() {
- Long userId = getUserId();
- return userId != null && 1L == userId;
+ return isAdmin(getUserId());
}
}
--
Gitblit v1.9.3