diff --git a/.env.development b/.env.development index 52553ff..05d6778 100644 --- a/.env.development +++ b/.env.development @@ -28,5 +28,5 @@ VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3C # 客户端id VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' -# websocket 开关 -VITE_APP_WEBSOCKET = true +# websocket 开关 默认使用sse推送 +VITE_APP_WEBSOCKET = false diff --git a/.env.production b/.env.production index bf9e644..c6b1f85 100644 --- a/.env.production +++ b/.env.production @@ -31,5 +31,5 @@ VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3C # 客户端id VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' -# websocket 开关 -VITE_APP_WEBSOCKET = true +# websocket 开关 默认使用sse推送 +VITE_APP_WEBSOCKET = false diff --git a/src/layout/index.vue b/src/layout/index.vue index e7bec82..0919aad 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -70,7 +70,10 @@ onMounted(() => { onMounted(() => { let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'; initWebSocket(protocol + window.location.host + import.meta.env.VITE_APP_BASE_API + '/resource/websocket'); - initSSE(import.meta.env.VITE_APP_BASE_API + '/sse') +}); + +onMounted(() => { + initSSE(import.meta.env.VITE_APP_BASE_API + '/resource/sse') }); const handleClickOutside = () => { diff --git a/src/utils/sse.ts b/src/utils/sse.ts index 7db4aa7..a08f282 100644 --- a/src/utils/sse.ts +++ b/src/utils/sse.ts @@ -6,9 +6,6 @@ let message = ''; // 初始化 export const initSSE = (url: any) => { - if (import.meta.env.VITE_APP_WEBSOCKET === 'false') { - return; - } url = url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID const { data,