From de0e3e6b98d7d2b7f7ccf88a008eb9cd8a9fa4c3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 十月 2024 13:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5_meeting/manifest.json |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/h5_meeting/manifest.json b/h5_meeting/manifest.json
index 56005ca..c727230 100644
--- a/h5_meeting/manifest.json
+++ b/h5_meeting/manifest.json
@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 妯″潡閰嶇疆 */
-        "modules" : {},
+        "modules" : {
+            "VideoPlayer" : {}
+        },
         /* 搴旂敤鍙戝竷淇℃伅 */
         "distribute" : {
             /* android鎵撳寘閰嶇疆 */
@@ -46,7 +48,8 @@
             },
             /* SDK閰嶇疆 */
             "sdkConfigs" : {
-                "ad" : {}
+                "ad" : {},
+                "oauth" : {}
             },
             "icons" : {
                 "android" : {
@@ -82,6 +85,27 @@
             }
         }
     },
+    "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