From ca047a34b67275f2a6058c904c8b4927541157f0 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Mon, 18 Sep 2023 11:27:40 +0800
Subject: [PATCH] 冲突修改

---
 src/api/http/config.ts |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/api/http/config.ts b/src/api/http/config.ts
index 7a7d3e0..706c51f 100644
--- a/src/api/http/config.ts
+++ b/src/api/http/config.ts
@@ -3,7 +3,7 @@
   // license
   appId: '136971', // You need to go to the development website to apply.
   appKey: '3e56cb20958060caeb1071cdb32400e', // You need to go to the development website to apply.
-  appLicense: 'eS2rczbPpEUZZkOuek7hB1fugv3TE0RdKyEU319A2cxmVKs7Bc11RadcPcHnQJjBq/Peja5R6bp2IILCypa2lskCUGXkXHmqxdPIVTyMQpkZtjM+eXLut/VHPdXVZOvYxKFMVel6jfEyd4rWL9jBI1N34rCvwSgad6T49mRC8R0=', // You need to go to the development website to apply.
+  appLicense: 'eS2rczbPpEUZZkOuek7hB1fugv3TE0RdKyEU319A2cxmVKs7Bc11RadcPcHnQJjBq/Peja5R6bp2IILCypa2lskCUGXkXHmqxdPIVTyMQpkZtjM+eXLut/VHPdXVZOvYxKFMVel6jfEyd4rWL9jBI1N34rCvwSgad6T49mRC8R0=', // You need to go to the development website to apply
 
   // http
   // http://172.16.13.64:8100
@@ -16,22 +16,29 @@
 
   // livestreaming
   // RTMP  Note: This IP is the address of the streaming server. If you want to see livestream on web page, you need to convert the RTMP stream to WebRTC stream.
-  rtmpURL: 'Please enter the rtmp access address.', // Example: 'rtmp://192.168.1.1/live/'
+  rtmpURL: 'rtmp://171.34.76.175:735/uav/', // Example: 'rtmp://192.168.1.1/live/'
   // GB28181 Note:If you don't know what these parameters mean, you can go to Pilot2 and select the GB28181 page in the cloud platform. Where the parameters same as these parameters.
-  gbServerIp: '171.34.76.175',
-  gbServerPort: '15060',
-  gbServerId: '34020000002000000001',
-  gbPassword: '12345678',
-  gbAgentId: '34020000002000000001',
-  gbAgentPort: '15060',
-  gbAgentChannel: '34020000001320000001',
+  // gbServerIp: '171.34.76.175',
+  // gbServerPort: '15060',
+  // gbServerId: '34020000002000000001',
+  // gbPassword: '12345678',
+  // gbAgentId: '34020000001320000001',
+  // gbAgentPort: '8080',
+  // gbAgentChannel: '34020000001320000001',
+  gbServerIp: '',
+  gbServerPort: '',
+  gbServerId: '',
+  gbPassword: '',
+  gbAgentId: '',
+  gbAgentPort: '',
+  gbAgentChannel: '',
   // RTSP
   rtspUserName: 'Please enter the username.',
   rtspPassword: 'Please enter the password.',
   rtspPort: '8554',
   // Agora
   agoraAPPID: '0a472a3b0f1543ab9e66d1ad4e6a91c8',
-  agoraToken: '007eJxTYPjg5tiwf+1PqwcHGApaMiLWbbtx60DWxUXthox8uTxS9U8UGAwSTcyNEo2TDNIMTU2ME5MsU83MUgwTU0xSzRItDZMtXPKZUhsCGRmm7VjFxMgAgSA+M0NiZgUDAwBxjB9/',
+  agoraToken: '007eJxTYLgR7L7yzoUww9Lj530XRDExB/68L/1CN1Ps7vnJmn/vWfQqMBgkmpgbJRonGaQZmpoYJyZZppqZpRgmppikmiVaGiZbrDzKnNoQyMhg98uLmZEBAkF8ZobEzAoGBgB1nB/x',
   agoraChannel: 'aix',
 
   // map

--
Gitblit v1.9.3