From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/setupProxy.js |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/setupProxy.js b/src/setupProxy.js
index c5707d5..3902dd3 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -2,7 +2,7 @@
 // const host = 'http://qingqiumarket.cn'
 // const service = 'mkwms/'
 
-module.exports = function() {}
+module.exports = function(app) {}
 // module.exports = function(app) {
 //   app.use(proxy('/webapi', { 
 //     target: `${host}/${service}webapi`,
@@ -42,11 +42,14 @@
 //   }))
 
 //   app.use(proxy('/trans', {
-//     target: `${host}/${service}trans`,
+//     target: `${host}/${service}`,
 //     secure: false,
-//     changeOrigin: true,
-//     pathRewrite: {
-//     '^/trans': '/'
-//     }
+//     changeOrigin: true
+//   }))
+
+//   app.use(proxy('/api', { // 鏃疯闈㈡澘鏈烘帴鍙f祴璇�
+//     target: `http://192.168.1.66:80`,
+//     secure: false,
+//     changeOrigin: true
 //   }))
 // }
\ No newline at end of file

--
Gitblit v1.8.0