From c9ed317e621e98c826be3d0b30d0f9114f0162c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Mon, 3 Oct 2022 22:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E7=BA=BF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=87=8D=E8=BF=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yi-sqlsugar-dev.db | Bin 204800 -> 204800 bytes Yi.Vue3.X.RuoYi/.env.development | 6 ++++++ Yi.Vue3.X.RuoYi/.env.production | 3 +++ Yi.Vue3.X.RuoYi/.env.staging | 3 +++ Yi.Vue3.X.RuoYi/src/App.vue | 2 +- Yi.Vue3.X.RuoYi/src/main.js | 5 +++-- Yi.Vue3.X.RuoYi/vite.config.js | 12 +++++++++++- 7 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index f24a8283682fd5f2751f76e8ff0c294a045dd2a5..b0e30f62d9b79c63863b238a97fb21b5157a9c29 100644 GIT binary patch delta 1063 zcmeH`y=xRf7{=e7(~E??-HC8SvG6v@UG7dH5>RJ9IEA~$-hn9|_|3~Z56`nTu(t;Gi))oV z0AS{3=Ven`d)wWeu658w@Ape}NRp{z)UnYUB(0&f0>2=6<>C8R;s!3yc-LpW8*nds zdZ~J{`tI&w^7ItlY6msOG^LslUopiaCgb`9zV|ifTRBfOlYT^as8|p$OyHN+legbc zCm&CgW}&Yr2^696{5ZaHy8HKdBDD~{;+zvH z_v(Xeo6BZ-s)Imt<_khaq-cNY3;JPy7@(SS(U@bo=cz@^Jx`ot6#X~zpUph8E5^W^ zjcNA`T9wa`Oy9O1ee`NOm1J|@DsMhh&wCi!cByPtPu8k+grSv-)uW*i%|aZM4>2qj z!lV^LqYx&F80v*sTJK?4$VHkW4D*H9Pzb|ZE=&Ln<{8m{{1ffY;B?0e&N8^KUE+Ll zmiri&9y+sed;Gs<;Ve9P)&$cc@RbU=48@by2)~oY228Wem$GO!^P)&il`jk}WZWFl le|mT{%;-@KdE^Vl1&u_!H~}}VWVKC`oYmG$r;O2%$=`*c@XY`K delta 516 zcmZoTz|(MmXM!~EA_fKqBPeE?sA0~ys4<~6fpKdB(~|W9Y`h5!{0;nae7pIyd5`fX zY*tk8;bltEn=Zi1EY5zv{N)}e0mJEfyv*wM5RSf)fsv7}p@FV}p@N~Qm64H^p@p8A zxk*a0t{9stqb(bQH3I_&&^i#w2qZ-z`V6K|;bm5HAYe!%uMW@@PHUJcii#YZoQw>% zFjMrW|Kep@JV^$`lr%rRa0Y6-i&U8P1W<>(-?crxuT6Ta*ft?rVOnGMZ>FgVr>^Cb49Aw(g zzM1JK4+j_j7Y2F0M26{H4vcod7?S3jUca7^ZF~AZrkR2QKusV33Tqt@-Yy`(9LTrX IKwv&20L&PDW&i*H diff --git a/Yi.Vue3.X.RuoYi/.env.development b/Yi.Vue3.X.RuoYi/.env.development index 5dee933e..fa4ea55e 100644 --- a/Yi.Vue3.X.RuoYi/.env.development +++ b/Yi.Vue3.X.RuoYi/.env.development @@ -7,5 +7,11 @@ VITE_APP_ENV = 'development' # 若依管理系统/开发环境 VITE_APP_BASE_API = '/dev-api' +# ws/开发环境 +VITE_APP_BASE_WS = '/dev-ws' + + VITE_APP_BASE_URL='http://localhost:19001/api' + + diff --git a/Yi.Vue3.X.RuoYi/.env.production b/Yi.Vue3.X.RuoYi/.env.production index 2924424d..565a45ef 100644 --- a/Yi.Vue3.X.RuoYi/.env.production +++ b/Yi.Vue3.X.RuoYi/.env.production @@ -7,6 +7,9 @@ VITE_APP_ENV = 'production' # 意框架管理系统/生产环境 VITE_APP_BASE_API = '/prod-api' +# ws/开发环境 +VITE_APP_BASE_WS = '/prod-ws' + # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/Yi.Vue3.X.RuoYi/.env.staging b/Yi.Vue3.X.RuoYi/.env.staging index 039e1a97..58e3fbcd 100644 --- a/Yi.Vue3.X.RuoYi/.env.staging +++ b/Yi.Vue3.X.RuoYi/.env.staging @@ -7,6 +7,9 @@ VITE_APP_ENV = 'staging' # 若依管理系统/生产环境 VITE_APP_BASE_API = '/stage-api' +# ws/开发环境 +VITE_APP_BASE_WS = '/stage-ws' + # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/Yi.Vue3.X.RuoYi/src/App.vue b/Yi.Vue3.X.RuoYi/src/App.vue index 584591d6..a4b9af94 100644 --- a/Yi.Vue3.X.RuoYi/src/App.vue +++ b/Yi.Vue3.X.RuoYi/src/App.vue @@ -22,7 +22,7 @@ onMounted(() => { //这里还需要监视token的变化，重新进行signalr连接 watch(()=>token.value,async (newValue,oldValue)=>{ console.log("重新连接"); - await signalR.close(); + // await signalR.close(); await signalR.start(); }) diff --git a/Yi.Vue3.X.RuoYi/src/main.js b/Yi.Vue3.X.RuoYi/src/main.js index 34c0b176..8d35b53c 100644 --- a/Yi.Vue3.X.RuoYi/src/main.js +++ b/Yi.Vue3.X.RuoYi/src/main.js @@ -79,7 +79,8 @@ app.use(ElementPlus, { size: Cookies.get('size') || 'default' }) // app.prototype.signalr = signalR -signalR.init("http://localhost:19001/api/hub/main"); -signalR.start(); + +signalR.init(`${import.meta.env.VITE_APP_BASE_WS}/hub/main`); +// signalR.start(); app.mount('#app') diff --git a/Yi.Vue3.X.RuoYi/vite.config.js b/Yi.Vue3.X.RuoYi/vite.config.js index 4b57fbf3..0e9fb0ab 100644 --- a/Yi.Vue3.X.RuoYi/vite.config.js +++ b/Yi.Vue3.X.RuoYi/vite.config.js @@ -28,13 +28,23 @@ export default defineConfig(({ mode, command }) => { port: 18000, host: true, open: true, + + proxy: { // https://cn.vitejs.dev/config/#server-proxy '/dev-api': { target: VITE_APP_BASE_URL, changeOrigin: true, - rewrite: (p) => p.replace(/^\/dev-api/, '') + rewrite: (p) => p.replace(/^\/dev-api/, ''), + }, + + '/dev-ws': { + target: VITE_APP_BASE_URL, + changeOrigin: true, + rewrite: (p) => p.replace(/^\/dev-ws/, ''), + ws: true } + } }, //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file