From e8a54d02091da6674054d9c3c176ef012df3751e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 十月 2024 10:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5_meeting/manifest.json |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/h5_meeting/manifest.json b/h5_meeting/manifest.json
index df57eb9..c727230 100644
--- a/h5_meeting/manifest.json
+++ b/h5_meeting/manifest.json
@@ -85,30 +85,26 @@
             }
         }
     },
-    "h5" : {
-        "router" : {
-            "mode" : "hash",
-            "base" : "./"
-        },
-        // "base" : "/h5/"
-        "devServer" : {
-            "port" : 8090,
-            "historyApiFallback" : true,
-            "disableHostCheck" : true,
-            "proxy" : {
-                "/gateway_interface" : {
-                    // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
-                    // "target": "http://192.168.137.1:10010", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
-                    // "target" : "http://192.168.31.42:10010", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
-                    "target" : "http://10.50.250.178:8088", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
-                    "changeOrigin" : true, // 鍏佽璺ㄥ煙 
-                    "pathRewrite" : {
-                        "^/gateway_interface" : ""
-                    }
-                }
-            },
-            "https" : false
-        }
+    "h5": {
+    	"router": {
+    		"mode": "hash",
+    		"base": "./"
+    	},
+    	"devServer": {
+    		"port": 8091,
+    		"historyApiFallback": true,
+    		"disableHostCheck": true,
+    		// "proxy": {
+    		// 	"/gateway_interface": {
+    		// 		"target" : "http://10.50.250.253:8088/gateway_interface", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+    		// 		"changeOrigin": true, // 鍏佽璺ㄥ煙 
+    		// 		"pathRewrite": {
+    		// 			"^/gateway_interface": "" 
+    		// 		}
+    		// 	}
+    		// },
+    		"https": false
+    	}
     },
     /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
     "quickapp" : {},

--
Gitblit v1.9.3