From af2ddcdb83906ef2966e82810206ce968234d9d9 Mon Sep 17 00:00:00 2001
From: 202206271646 <zhengyikeji888@163.com>
Date: Fri, 5 Aug 2022 17:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E6=88=96=E8=80=85=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=B6=E5=8F=AF=E8=83=BDtenant=5Fid?=
 =?UTF-8?q?=E4=BC=9A=E6=98=AFundefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

http://192.168.195.219:5005/ws/info?access_token=54aaf82e-89ef-488b-a692-f542532f010b&TENANT-ID=undefined
在开启webSocket的时候会有一些请求没有租户的id，前端请求过来会是undefined，还有/actuator/health这个请求的租户id也是undefined，会造成第一次登录的时候，没有直接把当前的sessions添加到WebSocketSessionHolder的USER_SESSION_MAP里面
---
 .../pigx/common/data/tenant/TenantContextHolderFilter.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
index b50eee2f0..d40549e7a 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
@@ -52,10 +52,10 @@ public class TenantContextHolderFilter extends GenericFilterBean {
 
 		log.debug("获取header中的租户ID为:{}", headerTenantId);
 
-		if (StrUtil.isNotBlank(headerTenantId)) {
+		if (StrUtil.isNotBlank(headerTenantId) && !headerTenantId.equals("undefined")) {
 			TenantContextHolder.setTenantId(Long.parseLong(headerTenantId));
 		}
-		else if (StrUtil.isNotBlank(paramTenantId)) {
+		else if (StrUtil.isNotBlank(paramTenantId) && !paramTenantId.equals("undefined") {
 			TenantContextHolder.setTenantId(Long.parseLong(paramTenantId));
 		}
 		else {