1、前端直播消息发送，websocket多租户连接，主库的连接调整

src/utils/liveWS.js

@@ -16,7 +16,7 @@ export class LiveWS {
       CryptoJS.enc.Utf8.parse('' + liveId + userId + userType + timestamp),
       CryptoJS.enc.Utf8.parse(timestamp)).toString(CryptoJS.enc.Hex)
     let query = `?liveId=${liveId}&userId=${userId}&userType=${userType}&timestamp=${timestamp}&signature=${signature}`
-    if (tenantCode) {
+    if (tenantCode && tenantCode !== 'undefined' && tenantCode !== 'null') {
       query += `&tenantCode=${encodeURIComponent(tenantCode)}`
     }
     this.url = url + query;

src/views/live/liveConsole/LiveConsole.vue

@@ -842,7 +842,7 @@ export default {
         liveWsUrl: this.liveWsUrl,
         liveId: this.liveId,
         userId: this.userId,
-        tenantCode: Cookies.get('tenantCode') || ''
+        tenantCode: (Cookies.get('tenantCode') && Cookies.get('tenantCode') !== 'undefined') ? Cookies.get('tenantCode') : ''
       })
       this.socket = this.$store.state.liveWs[this.liveId]
       this.socket.onmessage = (event) => this.handleWsMessage(event)

src/views/live/liveConsole/index-backup.vue

@@ -1098,7 +1098,7 @@ export default {
         liveWsUrl: this.liveWsUrl,
         liveId: this.liveId,
         userId: this.userId,
-        tenantCode: Cookies.get('tenantCode') || ''
+        tenantCode: (Cookies.get('tenantCode') && Cookies.get('tenantCode') !== 'undefined') ? Cookies.get('tenantCode') : ''
       })
       this.socket = this.$store.state.liveWs[this.liveId]
       this.socket.onmessage = (event) => this.handleWsMessage(event)

src/views/login.vue

@@ -211,8 +211,12 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          // 多租户SaaS：tenantCode 始终存储，WebSocket连接需要使用
-          Cookies.set('tenantCode', this.loginForm.tenantCode);
+          // 多租户SaaS：tenantCode 始终存储，WebSocket连接需要使用（主库登录时无tenantCode）
+          if (this.loginForm.tenantCode) {
+            Cookies.set('tenantCode', this.loginForm.tenantCode);
+          } else {
+            Cookies.remove('tenantCode');
+          }
           if (this.loginForm.rememberMe) {
             Cookies.set("username", this.loginForm.username, { expires: 30 });
             Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });