From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001 From: ZZJ <10913410+zzj2100@user.noreply.gitee.com> Date: 星期四, 28 七月 2022 10:22:41 +0800 Subject: [PATCH] 解决冲突 --- vue.config.js | 58 ++++++++++++++++++---------------------------------------- 1 files changed, 18 insertions(+), 40 deletions(-) diff --git a/vue.config.js b/vue.config.js index 53c46cf..b93cf4e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,49 +12,27 @@ // https: false, // hotOnly: false, // 鐑洿鏂� proxy: { - "/track": { - //target: 'http://bsic.asuscomm.com:7003', - // target: 'http://222.128.87.51:8000', - target: "http://192.168.20.10:7004", - // ws: true, - changeOrigin: true, - }, - "/ws": { - //target: 'http://bsic.asuscomm.com:7004', - // target: 'http://222.128.87.51:7003', - target: "http://192.168.20.10:7004", - // ws: true, - changeOrigin: true, - }, - "/api-v": { - //target: 'http://192.168.20.145:8000', - // target: "http://192.168.20.230:8000", - target: "http://192.168.20.189:7009", - changeOrigin: true, - }, "/api": { - target: "http://192.168.20.10:7004", - // target: "http://192.168.20.117:7080", - // secure: false, + target: "http://192.168.20.115:7070", + }, + + "/httpImage": { + target: "http://192.168.20.115:7070", + + changeOrigin: true, //寮�鍚唬鐞� + }, + + "/ws": { + target: "http://192.168.20.115:7070", + // ws: true, changeOrigin: true, }, - "/httpImage": { - //target: "http://bsic.asuscomm.com:7003", - // target: "http://222.128.87.51:7003", - // target: "http://192.168.20.10:7009", - target: "http://192.168.20.117:7080", - - // target: "http://192.168.20.189:7009", - // target: "http://192.168.20.117:7080", - - changeOrigin: true, //寮�鍚唬鐞� - }, - "/files": { - //target: "http://bsic.asuscomm.com:7003", - // target: "http://222.128.87.51:7003", - target: "http://192.168.20.10:7004", - changeOrigin: true, //寮�鍚唬鐞� - }, + /* + "/api-v": { + target: "http://192.168.20.10:7009", + // ws: true, + changeOrigin: true, + }, */ }, }, }; -- Gitblit v1.8.0