From ee99ed8e763e688821a381ea309dbb216fb3b138 Mon Sep 17 00:00:00 2001 From: wll8 Date: Fri, 16 Aug 2024 12:22:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E6=A8=A1=E5=BC=8F=E7=AE=80=E5=8C=96=E9=A2=84=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.ts | 55 +------------------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index f8b1200d..d5aede11 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -76,60 +76,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => { 'tiny-svg', 'image-conversion', - 'element-plus/es/components/text/style/css', - 'element-plus/es/components/collapse-item/style/css', - 'element-plus/es/components/collapse/style/css', - 'element-plus/es/components/space/style/css', - 'element-plus/es/components/container/style/css', - 'element-plus/es/components/aside/style/css', - 'element-plus/es/components/main/style/css', - 'element-plus/es/components/header/style/css', - 'element-plus/es/components/button-group/style/css', - 'element-plus/es/components/radio-button/style/css', - 'element-plus/es/components/checkbox-group/style/css', - 'element-plus/es/components/form/style/css', - 'element-plus/es/components/form-item/style/css', - 'element-plus/es/components/button/style/css', - 'element-plus/es/components/input/style/css', - 'element-plus/es/components/input-number/style/css', - 'element-plus/es/components/switch/style/css', - 'element-plus/es/components/upload/style/css', - 'element-plus/es/components/menu/style/css', - 'element-plus/es/components/col/style/css', - 'element-plus/es/components/icon/style/css', - 'element-plus/es/components/row/style/css', - 'element-plus/es/components/tag/style/css', - 'element-plus/es/components/dialog/style/css', - 'element-plus/es/components/loading/style/css', - 'element-plus/es/components/radio/style/css', - 'element-plus/es/components/radio-group/style/css', - 'element-plus/es/components/popover/style/css', - 'element-plus/es/components/scrollbar/style/css', - 'element-plus/es/components/tooltip/style/css', - 'element-plus/es/components/dropdown/style/css', - 'element-plus/es/components/dropdown-menu/style/css', - 'element-plus/es/components/dropdown-item/style/css', - 'element-plus/es/components/sub-menu/style/css', - 'element-plus/es/components/menu-item/style/css', - 'element-plus/es/components/divider/style/css', - 'element-plus/es/components/card/style/css', - 'element-plus/es/components/link/style/css', - 'element-plus/es/components/breadcrumb/style/css', - 'element-plus/es/components/breadcrumb-item/style/css', - 'element-plus/es/components/table/style/css', - 'element-plus/es/components/tree-select/style/css', - 'element-plus/es/components/table-column/style/css', - 'element-plus/es/components/select/style/css', - 'element-plus/es/components/option/style/css', - 'element-plus/es/components/pagination/style/css', - 'element-plus/es/components/tree/style/css', - 'element-plus/es/components/alert/style/css', - 'element-plus/es/components/checkbox/style/css', - 'element-plus/es/components/date-picker/style/css', - 'element-plus/es/components/transfer/style/css', - 'element-plus/es/components/tabs/style/css', - 'element-plus/es/components/image/style/css', - 'element-plus/es/components/tab-pane/style/css' + 'element-plus/es/components/**/css' ] } }; -- Gitee From ca3d0114d8a89be7bf8a42e3280eb383067712a2 Mon Sep 17 00:00:00 2001 From: wll8 Date: Wed, 21 Aug 2024 17:11:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=AE=9A=E4=B9=89=E5=B7=B2=E8=B7=A8=E5=9F=9F=E7=9A=84?= =?UTF-8?q?=20BASE=5FAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 + .env.production | 1 + src/layout/index.vue | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 52553ff9..1be2541d 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,7 @@ VITE_APP_ENV = 'development' # 开发环境 VITE_APP_BASE_API = '/dev-api' +VITE_APP_WS_BASE_API = '/dev-api/resource/websocket' # 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' diff --git a/.env.production b/.env.production index bf9e6444..6add1919 100644 --- a/.env.production +++ b/.env.production @@ -15,6 +15,7 @@ VITE_APP_SNAILJOB_ADMIN = '/snail-job' # 生产环境 VITE_APP_BASE_API = '/prod-api' +VITE_APP_WS_BASE_API = '/prod-api/resource/websocket' # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/src/layout/index.vue b/src/layout/index.vue index 29fb5ff5..715334b5 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -68,7 +68,9 @@ onMounted(() => { onMounted(() => { let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'; - initWebSocket(protocol + window.location.host + import.meta.env.VITE_APP_BASE_API + '/resource/websocket'); + const base = import.meta.env.VITE_APP_WS_BASE_API; + const wsUrl = base.includes(`://`) ? base : `${protocol}${window.location.host}${base}`; + initWebSocket(wsUrl); }); const handleClickOutside = () => { -- Gitee