From 5bd552eec6cc822278691e3495a1f6a97038dbb7 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 26 六月 2023 18:17:12 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/vue.config.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 5259a48..74e4714 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,16 +26,16 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
+ // target: 'http://192.168.1.46:37000',
+ target: 'http://192.168.1.46:37000',
+ // target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
//target: 'http://192.168.3.7:37000',
-<<<<<<< HEAD
// target: 'http://dev.vci-tech.com:37000',
- target: 'http://192.168.1.51:37000/',
-=======
- target: 'http://dev.vci-tech.com:37000',
- // target: 'http://192.168.1.51:37000/',
->>>>>>> a3c7b3f7a4778a777a78a72c968b0e172488df03
+ //target: 'http://192.168.1.51:37000/',
+ // target:'http://192.168.1.104:37000',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3