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 | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/api/http/config.ts b/src/api/http/config.ts index cced454..0915e36 100644 --- a/src/api/http/config.ts +++ b/src/api/http/config.ts @@ -1,8 +1,8 @@ /* * @Author: 胡思旗 931347610@qq.com * @Date: 2023-08-22 09:55:39 - * @LastEditors: 胡思旗 931347610@qq.com - * @LastEditTime: 2023-08-22 14:23:46 + * @LastEditors: husq 931347610@qq.com + * @LastEditTime: 2023-09-11 12:04:07 * @FilePath: \Cloud-API-Demo-Web\src\api\http\config.ts * @Description: * @@ -16,9 +16,11 @@ appLicense: 'Please enter the app license.', // You need to go to the development website to apply. // http - baseURL: 'http://172.16.13.129:6789', // This url must end with "/". Example: 'http://192.168.1.1:6789/' + // 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 - websocketURL: '', // Example: 'ws://192.168.1.1: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. -- Gitblit v1.9.3