From d5edf87014863eceaa44f28809ae4b54a39b9a8e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:54:05 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/setupProxy.js |   74 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/setupProxy.js b/src/setupProxy.js
index 1aca9db..4d69c53 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -1,44 +1,50 @@
 const proxy = require('http-proxy-middleware')
-const host = 'http://qingqiumarket.cn'
-const service = 'mkwms/'
-// const host = 'http://cloud.mk9h.cn'
-// const service = ''
+const options = require('../public/options.json')
 
 module.exports = function(app) {
-  app.use(proxy('/webapi', { 
-    target: `${host}/${service}webapi`,
-    secure: false,
-    changeOrigin: true,
-    pathRewrite: {
-    '^/webapi': '/'
-    }
-    // cookieDomainRewrite: "http://localhost:3000"
-  }))
+//   app.use(proxy('/webapi', { 
+//     target: `${host}/${service}webapi`,
+//     secure: false,
+//     changeOrigin: true,
+//     pathRewrite: {
+//     '^/webapi': '/'
+//     }
+//     // cookieDomainRewrite: "http://localhost:3000"
+//   }))
   
-  app.use(proxy('/zh-CN', { // 鐧诲綍鎺ュ彛
-    target: `${host}/${service}zh-CN`,
-    secure: false,
-    changeOrigin: true,
-    pathRewrite: {
-    '^/zh-CN': '/'
-    }
-  }))
+//   app.use(proxy('/zh-CN', { // 鐧诲綍鎺ュ彛
+//     target: `${host}/${service}zh-CN`,
+//     secure: false,
+//     changeOrigin: true,
+//     pathRewrite: {
+//     '^/zh-CN': '/'
+//     }
+//   }))
 
-  app.use(proxy('/Upload', {
-    target: `${host}/${service}zh-CN/Home/Upload`,
-    secure: false,
-    changeOrigin: true,
-    pathRewrite: {
-    '^/Upload': '/'
-    }
-  }))
+//   app.use(proxy('/Upload', {
+//     target: `${host}/${service}zh-CN/Home/Upload`,
+//     secure: false,
+//     changeOrigin: true,
+//     pathRewrite: {
+//     '^/Upload': '/'
+//     }
+//   }))
 
   app.use(proxy('/wxpay', {
-    target: `${host}/${service}wxpay`,
+    target: `${options.host}/${options.service}`,
     secure: false,
-    changeOrigin: true,
-    pathRewrite: {
-    '^/wxpay': '/'
-    }
+    changeOrigin: true
   }))
+
+//   app.use(proxy('/trans', {
+//     target: `${host}/${service}`,
+//     secure: false,
+//     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