From 3821dc55664384df25b6f7d712b889c17537bf06 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 29 五月 2023 17:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/vue.config.js | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 4933f0c..81c05fb 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,19 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
- //target: 'http://dev.vci-tech.com:37000',
+<<<<<<< HEAD
+ // target: 'http://localhost:37000',
+ //target: 'http://192.168.3.7:37000',
+ target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.51:37000/',
+=======
+ target: 'http://localhost:37000',
+ // target: 'http://192.168.3.7:37000',
+ // target: 'http://dev.vci-tech.com:37000',
+ //target: 'http://192.168.1.51:37000/',
+>>>>>>> 1a5351f560e5833cc10127f8188c627b54146478
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
- //target: 'https://saber.bladex.vip/api',
+ // target: 'https://saber.bladex.vip/api',
ws: true,
pathRewrite: {
'^/api': '/'
--
Gitblit v1.9.3