From 88078aa63c669cffc2d91e1269d460436427d09d Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:21:01 +0800
Subject: [PATCH] gb18186
---
vue.config.js | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index 75d9f3a..9968aaa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,9 +13,18 @@
// hotOnly: false, // 鐑洿鏂�
proxy: {
"/api": {
+<<<<<<< HEAD
// target: "http://192.168.20.10:7004",
+<<<<<<< HEAD
// target: "http://192.168.20.174:7070",
- target: "http://192.168.20.235:7070",
+ target: "http://192.168.20.115:7070",
+=======
+=======
+ // target: "http://192.168.20.10:7009",
+>>>>>>> gb18186
+ target: "http://192.168.20.115:7070",
+ // target: "http://192.168.20.235:7070",
+>>>>>>> bug淇
// target: "http://192.168.20.117:7080",
// secure: false,
changeOrigin: true,
@@ -26,16 +35,26 @@
// target: "http://222.128.87.51:7003",
// target: "http://192.168.20.10:7009",
// target: "http://192.168.20.189:7009",
- target: "http://192.168.20.117:7080",
+<<<<<<< HEAD
+=======
+ // target: "http://192.168.20.235:7070",
+>>>>>>> bug淇
+ target: "http://192.168.20.115:7070",
changeOrigin: true, //寮�鍚唬鐞�
},
"/ws": {
- target: "http://192.168.20.189:7009",
+ target: "http://192.168.20.115:7070",
// ws: true,
changeOrigin: true,
},
+ /*
+ "/api-v": {
+ target: "http://192.168.20.10:7009",
+ // ws: true,
+ changeOrigin: true,
+ }, */
},
},
};
--
Gitblit v1.8.0