add mq监听

nb-common/config-common/src/main/java/com/nb/common/config/mybatisplus/interceptor/DefaultTenantLineInnerInterceptor.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import com.nb.auth.bean.LoginUser;
+import com.nb.auth.enums.StpTypeEnum;
 import com.nb.auth.utils.SecurityUtil;
 import com.nb.core.entity.TenantGenericEntity;
 import net.sf.jsqlparser.expression.Expression;
@@ -86,6 +87,9 @@ public class DefaultTenantLineInnerInterceptor {
                 if(request==null||request.getRequest() instanceof MockHttpServletRequest){
                     return true;
                 }
+                if (StpTypeEnum.ASSISTANT.getText().equals(SecurityUtil.getStpLogic().loginType)) {
+                    return true;
+                }
                 StringBuffer url = request.getRequest().getRequestURL();
                 if(ignoreUrlTenantId.stream().anyMatch(ignoreUrl->url.toString().endsWith(ignoreUrl))){
                     return true;

nb-common/ws-common/src/main/java/com/nb/common/websocket/WebSocketConstant.java

@@ -48,7 +48,7 @@ public class WebSocketConstant {
      */
     public static TopicWrapper getTopic(String id,String productName,String param,String tenantId){
         productName=StrUtil.isEmptyIfStr(productName)?"default":productName;
-        tenantId=StrUtil.isNullOrUndefined(tenantId)?"*":tenantId;
+        tenantId=StrUtil.isNullOrUndefined(tenantId)||StrUtil.isBlank(tenantId)?"*":tenantId;
         return TopicWrapper.of(id+"-"+productName+"-"+param+"-"+tenantId,param);
     }