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 f24a8283..b0e30f62 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ 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