From 76d7d384741f5d1e7f2cd8564aba13974d983ee1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 18:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5_meeting/manifest.json |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/h5_meeting/manifest.json b/h5_meeting/manifest.json
index 56005ca..6167242 100644
--- a/h5_meeting/manifest.json
+++ b/h5_meeting/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "瀹夋嘲浼氳瀹�",
-    "appid" : "__UNI__EF8BAA7",
+    "appid" : "__UNI__C77DAC4",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -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,30 @@
             }
         }
     },
+    "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鍦板潃
+
+                    // "target" : "http://192.168.0.173/gateway_interface", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+                    // "target" : "https://atwl.ahzyssl.com/zhyq_interface", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+                    "changeOrigin" : true, // 鍏佽璺ㄥ煙 
+                    "pathRewrite" : {
+                        "^/gateway_interface" : ""
+                    }
+                }
+            },
+            "https" : false
+        }
+    },
     /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
     "quickapp" : {},
     /* 灏忕▼搴忕壒鏈夌浉鍏� */
@@ -104,5 +131,5 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "3"
+    "vueVersion" : "2"
 }

--
Gitblit v1.9.3