From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop

---
 src/api/http/config.ts |   55 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/api/http/config.ts b/src/api/http/config.ts
index 3b76197..0915e36 100644
--- a/src/api/http/config.ts
+++ b/src/api/http/config.ts
@@ -1,20 +1,49 @@
+/*
+ * @Author: 胡思旗 931347610@qq.com
+ * @Date: 2023-08-22 09:55:39
+ * @LastEditors: husq 931347610@qq.com
+ * @LastEditTime: 2023-09-11 12:04:07
+ * @FilePath: \Cloud-API-Demo-Web\src\api\http\config.ts
+ * @Description:
+ *
+ * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
+ */
 export const CURRENT_CONFIG = {
 
-  baseURL: 'Please enter the backend access address prefix.', // This url must end with "/". Example: 'http://192.168.1.1:6789/cloud/'
-  websocketURL: 'Please enter the WebSocket access address.',  // Example: 'ws://192.168.1.1:6789/api/v1/ws'
+  // license
+  appId: 'Please enter the app id.', // You need to go to the development website to apply.
+  appKey: 'Please enter the app key.', // You need to go to the development website to apply.
+  appLicense: 'Please enter the app license.', // You need to go to the development website to apply.
 
-  rtmpURL: 'Please enter the rtmp access address.',  // Example: 'rtmp://192.168.1.1/live/'
-  gb28181Para:
-    'serverIP=Please enter the server ip.&serverPort=Please enter the server port.&serverID=Please enter the server id.' + 
-    '&agentID=Please enter the agent id.&agentPassword=Please enter the agent password' + 
-    '&localPort=Please enter the local port.&channel=Please enter the channel.',
-  rtspPara: 'userName=Please enter the username.&password=Please enter the password&port=Please enter the port.',
-  amapKey: 'Please enter the amap key.',
+  // http
+  // http://172.16.13.64:8100
+  baseURL: 'http://172.16.13.129:8100', // This url must end with "/". Example: 'http://192.168.1.1:6789/'
+  // ws://172.16.13.129:6789/api/v1/ws
+  // ws://192.168.1.198:1883/
+  websocketURL: 'ws://192.168.1.198:8600/drone/api/v1/ws', // Example: 'ws://192.168.1.198:6789/api/v1/ws'
+
+  // 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/'
+  // 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: 'Please enter the server ip.',
+  gbServerPort: 'Please enter the server port.',
+  gbServerId: 'Please enter the server id.',
+  gbAgentId: 'Please enter the agent id',
+  gbPassword: 'Please enter the agent password',
+  gbAgentPort: 'Please enter the local port.',
+  gbAgentChannel: 'Please enter the channel.',
+  // RTSP
+  rtspUserName: 'Please enter the username.',
+  rtspPassword: 'Please enter the password.',
+  rtspPort: '8554',
+  // Agora
   agoraAPPID: 'Please enter the agora app id.',
-  agoraToken: 'Please enter the agora token.',
+  agoraToken: 'Please enter the agora temporary token.',
   agoraChannel: 'Please enter the agora channel.',
 
-  appId: 'Please enter the app id.',  // You need to go to the development website to apply.
-  appKey: 'Please enter the app key.',  // You need to go to the development website to apply.
-  appLicense: 'Please enter the app license.' // You need to go to the development website to apply.
+  // map
+  // You can apply on the AMap website.
+  amapKey: 'Please enter the amap key.',
+
 }

--
Gitblit v1.9.3