From c4c88105c069d039165075d172222900885c5c75 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 8 Aug 2022 03:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20SaSession=20=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E4=B8=AD=20TokenSign=20=E5=88=A4=E6=96=AD=E6=9C=89?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E7=A9=BA=E6=8C=87=E9=92=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/session/SaSession.java  |  4 ++--
 .../src/main/java/cn/dev33/satoken/util/SaFoxUtil.java | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index 5f25f1d0..e9be637a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -153,7 +153,7 @@ public class SaSession implements Serializable {
 		// 返回筛选后的 
 		List<TokenSign> list = new ArrayList<>();
 		for (TokenSign tokenSign : tokenSignListCopy()) {
-			if(tokenSign.getDevice().equals(device)) {
+			if(SaFoxUtil.equals(tokenSign.getDevice(), device)) {
 				list.add(tokenSign);
 			}
 		}
@@ -168,7 +168,7 @@ public class SaSession implements Serializable {
 	 */
 	public TokenSign getTokenSign(String tokenValue) {
 		for (TokenSign tokenSign : tokenSignListCopy()) {
-			if (tokenSign.getValue().equals(tokenValue)) {
+			if (SaFoxUtil.equals(tokenSign.getValue(), tokenValue)) {
 				return tokenSign;
 			}
 		}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index 62765b86..be672192 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -75,6 +75,16 @@ public class SaFoxUtil {
 		return isEmpty(str) == false;
 	}
 	
+	/**
+	 * 比较两个对象是否相等 
+	 * @param a 第一个对象 
+	 * @param b 第二个对象 
+	 * @return 两个对象是否相等 
+	 */
+	public static boolean equals(Object a, Object b) {
+        return (a == b) || (a != null && a.equals(b));
+    }
+	
 	/**
 	 * 以当前时间戳和随机int数字拼接一个随机字符串
 	 *