From 67af3a7eeb072c2e50a80de5e84dafeba947029d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 30 May 2024 18:48:06 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E4=BD=BF=E7=94=A8websocket=E6=9C=BA=E5=88=B6=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exportCenter/manage/ExportCenterManage.java |  4 ++--
 .../io/dataease/websocket/aop/WSTrigger.java    |  4 ++--
 .../dataease/websocket/service/WsService.java   | 11 -----------
 .../service/impl/StandaloneWsService.java       |  4 ++--
 core/core-frontend/src/views/share/link/pwd.vue |  1 -
 .../visualized/data/dataset/ExportExcel.vue     |  5 ++---
 core/core-frontend/src/websocket/index.ts       | 17 +++++++++++++----
 de-xpack                                        |  2 +-
 .../java/io/dataease/websocket}/WsMessage.java  |  2 +-
 .../java/io/dataease/websocket/WsService.java   | 10 ++++++++++
 10 files changed, 33 insertions(+), 27 deletions(-)
 delete mode 100644 core/core-backend/src/main/java/io/dataease/websocket/service/WsService.java
 rename {core/core-backend/src/main/java/io/dataease/websocket/entity => sdk/common/src/main/java/io/dataease/websocket}/WsMessage.java (88%)
 create mode 100644 sdk/common/src/main/java/io/dataease/websocket/WsService.java

diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index d191dff6f6..2d435bc732 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -14,8 +14,8 @@ import io.dataease.exportCenter.dao.auto.entity.CoreExportTask;
 import io.dataease.exportCenter.dao.auto.mapper.CoreExportTaskMapper;
 import io.dataease.utils.*;
 import io.dataease.visualization.server.DataVisualizationServer;
-import io.dataease.websocket.entity.WsMessage;
-import io.dataease.websocket.service.WsService;
+import io.dataease.websocket.WsMessage;
+import io.dataease.websocket.WsService;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
diff --git a/core/core-backend/src/main/java/io/dataease/websocket/aop/WSTrigger.java b/core/core-backend/src/main/java/io/dataease/websocket/aop/WSTrigger.java
index fadc688b1a..ab55bc2f11 100644
--- a/core/core-backend/src/main/java/io/dataease/websocket/aop/WSTrigger.java
+++ b/core/core-backend/src/main/java/io/dataease/websocket/aop/WSTrigger.java
@@ -1,7 +1,7 @@
 package io.dataease.websocket.aop;
 
-import io.dataease.websocket.entity.WsMessage;
-import io.dataease.websocket.service.WsService;
+import io.dataease.websocket.WsMessage;
+import io.dataease.websocket.WsService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
diff --git a/core/core-backend/src/main/java/io/dataease/websocket/service/WsService.java b/core/core-backend/src/main/java/io/dataease/websocket/service/WsService.java
deleted file mode 100644
index 922e61de96..0000000000
--- a/core/core-backend/src/main/java/io/dataease/websocket/service/WsService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.dataease.websocket.service;
-
-import io.dataease.websocket.entity.WsMessage;
-
-
-public interface WsService {
-
-    void releaseMessage(WsMessage wsMessage);
-
-
-}
diff --git a/core/core-backend/src/main/java/io/dataease/websocket/service/impl/StandaloneWsService.java b/core/core-backend/src/main/java/io/dataease/websocket/service/impl/StandaloneWsService.java
index ce6ac6f0e2..8f0d781869 100644
--- a/core/core-backend/src/main/java/io/dataease/websocket/service/impl/StandaloneWsService.java
+++ b/core/core-backend/src/main/java/io/dataease/websocket/service/impl/StandaloneWsService.java
@@ -1,7 +1,7 @@
 package io.dataease.websocket.service.impl;
 
-import io.dataease.websocket.entity.WsMessage;
-import io.dataease.websocket.service.WsService;
+import io.dataease.websocket.WsMessage;
+import io.dataease.websocket.WsService;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
diff --git a/core/core-frontend/src/views/share/link/pwd.vue b/core/core-frontend/src/views/share/link/pwd.vue
index 5b950f865f..8f44ed0482 100644
--- a/core/core-frontend/src/views/share/link/pwd.vue
+++ b/core/core-frontend/src/views/share/link/pwd.vue
@@ -96,7 +96,6 @@ const refresh = async (formEl: FormInstance | undefined) => {
   })
 }
 onMounted(() => {
-  debugger
   if (!wsCache.get(appStore.getDekey)) {
     queryDekey()
       .then(res => {
diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
index 2c56677811..ed15387469 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
-import { ref, h, onUnmounted, onMounted } from 'vue'
+import { ref, h, onUnmounted } from 'vue'
 import { EmptyBackground } from '@/components/empty-background'
 import { ElButton, ElMessage, ElMessageBox, ElTabPane, ElTabs } from 'element-plus-secondary'
 import { RefreshLeft } from '@element-plus/icons-vue'
-import eventBus from '@/utils/eventBus'
 import {
   exportTasks,
   exportRetry,
@@ -327,7 +326,7 @@ const delAll = () => {
     })
 }
 
-eventBus.on('task-export-topic-call', taskExportTopicCall)
+useEmitt({ name: 'task-export-topic-call', callback: taskExportTopicCall })
 
 defineExpose({
   init
diff --git a/core/core-frontend/src/websocket/index.ts b/core/core-frontend/src/websocket/index.ts
index 8cafff267a..3c7229a81f 100644
--- a/core/core-frontend/src/websocket/index.ts
+++ b/core/core-frontend/src/websocket/index.ts
@@ -1,11 +1,13 @@
 import SockJS from 'sockjs-client/dist/sockjs.min.js'
 import Stomp from 'stompjs'
-import eventBus from '@/utils/eventBus'
 import { useCache } from '@/hooks/web/useCache'
+import { useEmitt } from '@/hooks/web/useEmitt'
 const { wsCache } = useCache()
 let stompClient: Stomp.Client
 let timeInterval: NodeJS.Timer | null = null
-const basePath = import.meta.env.VITE_API_BASEPATH
+import dev from '../../config/dev'
+const env = import.meta.env
+const basePath = env.VITE_API_BASEPATH
 
 export default {
   install() {
@@ -13,6 +15,10 @@ export default {
       {
         topic: '/task-export-topic',
         event: 'task-export-topic-call'
+      },
+      {
+        topic: '/report-notici',
+        event: 'report-notici-call'
       }
     ]
     function isLoginStatus() {
@@ -32,6 +38,9 @@ export default {
       } else {
         const href = window.location.href
         prefix = href.substring(0, href.indexOf('#'))
+        if (env.MODE === 'dev') {
+          prefix = dev.server.proxy[basePath].target + '/'
+        }
       }
       const socket = new SockJS(prefix + 'websocket?userId=' + wsCache.get('user.uid'))
       stompClient = Stomp.over(socket)
@@ -40,10 +49,10 @@ export default {
       }
       stompClient.connect(
         heads,
-        res => {
+        () => {
           channels.forEach(channel => {
             stompClient.subscribe('/user/' + wsCache.get('user.uid') + channel.topic, res => {
-              res && res.body && eventBus.emit(channel.event, res.body)
+              res && res.body && useEmitt().emitter.emit(channel.event, res.body)
             })
           })
         },
diff --git a/de-xpack b/de-xpack
index 4f83c4df67..afbf1f3843 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 4f83c4df67befbd90eb219b2d6d04c04e213179f
+Subproject commit afbf1f3843f0c2f32da55ed7ea83a9c65e144a2e
diff --git a/core/core-backend/src/main/java/io/dataease/websocket/entity/WsMessage.java b/sdk/common/src/main/java/io/dataease/websocket/WsMessage.java
similarity index 88%
rename from core/core-backend/src/main/java/io/dataease/websocket/entity/WsMessage.java
rename to sdk/common/src/main/java/io/dataease/websocket/WsMessage.java
index 6e8b147206..da40be3ce4 100644
--- a/core/core-backend/src/main/java/io/dataease/websocket/entity/WsMessage.java
+++ b/sdk/common/src/main/java/io/dataease/websocket/WsMessage.java
@@ -1,4 +1,4 @@
-package io.dataease.websocket.entity;
+package io.dataease.websocket;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/sdk/common/src/main/java/io/dataease/websocket/WsService.java b/sdk/common/src/main/java/io/dataease/websocket/WsService.java
new file mode 100644
index 0000000000..0a8b65b00a
--- /dev/null
+++ b/sdk/common/src/main/java/io/dataease/websocket/WsService.java
@@ -0,0 +1,10 @@
+package io.dataease.websocket;
+
+
+
+public interface WsService {
+
+    void releaseMessage(WsMessage wsMessage);
+
+
+}