From 2dd7bcffca52583813ddad22d7838293ab1b365b Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Fri, 3 Jan 2025 21:22:08 +0800 Subject: [PATCH 01/15] =?UTF-8?q?fix=20:=20=E9=9A=A7=E9=81=93=E6=A8=A1?= =?UTF-8?q?=E6=8B=9F=E5=8A=9F=E8=83=BD=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/vite.config.js b/vite.config.js index e70fb2a..ab56ecc 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,19 +1,18 @@ -import {fileURLToPath, URL} from 'node:url' -import {defineConfig} from 'vite' +import { fileURLToPath, URL } from 'node:url' +import { defineConfig } from 'vite' import AutoImport from 'unplugin-auto-import/vite' import Components from 'unplugin-vue-components/vite' -import {ElementPlusResolver} from 'unplugin-vue-components/resolvers' +import { ElementPlusResolver } from 'unplugin-vue-components/resolvers' import Icons from 'unplugin-icons/vite' import IconsResolver from 'unplugin-icons/resolver' import vue from '@vitejs/plugin-vue' import Inspect from 'vite-plugin-inspect' - export default defineConfig({ plugins: [ vue(), AutoImport({ //自动导入vue相关函数 - imports: ['vue', 'vue-router'], + imports: ['vue','vue-router'], resolvers: [ ElementPlusResolver(), @@ -58,14 +57,13 @@ export default defineConfig({ strictPort: false, open: true, proxy: { - // // '/api/tunnel': { - // '/tunnel': { - // + // '/api/tunnel': { // // // target: 'http://gateway.feashow.cn', - // target: 'http://frp.feashow.cn:31800/', + // // target: 'http://frp.feashow.cn:31800/', // // target: 'http://clay.frp.feashow.cn', + // target: 'http://192.168.31.175:9020', // changeOrigin: true, - // rewrite: (path) => path.replace(/^\/api/, ''), + // rewrite: (path) => path.replace(/^\/api\/tunnel/, ''), // }, // '/api/admin': { // // target: 'http://gateway.feashow.cn', @@ -75,6 +73,7 @@ export default defineConfig({ // }, '/api': { target: 'http://tunnel.feashow.com/api', + // target: 'http://frp.toomewhy.top:38000', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, ''), }, @@ -83,11 +82,10 @@ export default defineConfig({ ws: true }, '/websocket': { - target: 'ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment', - // target: 'ws://192.168.31.176:9000/websocket/debug', + target: 'ws://tunnel.feashow.com/api/wstunnel/websocket/simulate', + // target: 'ws://192.168.31.175:9000/websocket/simulate', changeOrigin: true, ws: true, - rewrite: (path) => path.replace(/^\/websocket/, '') } } From e0a92b51f31f925e73f7b9e9afc04be52b1f9330 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Fri, 3 Jan 2025 16:21:02 +0000 Subject: [PATCH 02/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 2ea5122..394f6e3 100644 --- a/nginx.conf +++ b/nginx.conf @@ -30,7 +30,7 @@ http { listen [::]:80; location /api { - proxy_pass http://gateway.pro.svc.cluster.local:8080; + proxy_pass http://gateway.pro.svc.cluster.local:80; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Port $server_port; From 62c8da2ea24f4dd8f5edbb3f304cddb0f044ce09 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Fri, 3 Jan 2025 16:28:17 +0000 Subject: [PATCH 03/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 394f6e3..2ea5122 100644 --- a/nginx.conf +++ b/nginx.conf @@ -30,7 +30,7 @@ http { listen [::]:80; location /api { - proxy_pass http://gateway.pro.svc.cluster.local:80; + proxy_pass http://gateway.pro.svc.cluster.local:8080; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Port $server_port; From d3466fbb8d4e990c82854bad080e1a0141f05c68 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Wed, 8 Jan 2025 10:45:21 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fix=20:=20=E9=9A=A7=E9=81=93=E6=A8=A1?= =?UTF-8?q?=E6=8B=9F=E5=8A=9F=E8=83=BD=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tunnel-simulate/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/tunnel-simulate/index.vue b/src/views/tunnel-simulate/index.vue index f3cf7fe..86b4e84 100644 --- a/src/views/tunnel-simulate/index.vue +++ b/src/views/tunnel-simulate/index.vue @@ -333,8 +333,8 @@ const handleLogout = () => { const initWebSocket = () => { // let wsUrl = `ws://frp.toomewhy.top:38000/wstunnel/websocket/simulate/${token}/123`; // let wsUrl = `ws://192.168.31.175:9000/websocket/simulate/${token}/${serialNumber.value}`; - // let wsUrl = `ws://tunnel.feashow.com/api/wstunnel/websocket/simulate/${token}/${serialNumber.value}`; - let wsUrl = import.meta.env.VITE_BASE_WSURL + `/${token}/${serialNumber.value}`; + let wsUrl = `ws://tunnel.feashow.com/api/wstunnel/websocket/simulate/${token}/${serialNumber.value}`; + // let wsUrl = import.meta.env.VITE_BASE_WSURL + `/${token}/${serialNumber.value}`; // let wsUrl = `ws://clay.frp.feashow.cn/wstunnel/websocket/equipment/${token}/${serialNumber.value}`; // let wsUrl = `ws://frp.toomewhy.top:39000/websocket/simulate/${token}/${serialNumber.value}`; socket = new WebSocket(wsUrl); From 6e8adb775744de163804a46b79862d4bf1dbab79 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Mon, 24 Feb 2025 22:16:54 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E7=94=B5=E9=87=8F=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/content/usedEle/UsedEle.vue | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue index 3a1f2fc..e5ead0b 100644 --- a/src/components/content/usedEle/UsedEle.vue +++ b/src/components/content/usedEle/UsedEle.vue @@ -1,5 +1,5 @@