From 970ede7dd4c77893836d2721fe1bdfd18bfa1afc Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Thu, 14 Sep 2023 15:56:48 +0800
Subject: [PATCH] Merge branch 'demo' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into demo

---
 src/api/http/config.ts |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/api/http/config.ts b/src/api/http/config.ts
index cced454..daa346d 100644
--- a/src/api/http/config.ts
+++ b/src/api/http/config.ts
@@ -1,24 +1,16 @@
-/*
- * @Author: 胡思旗 931347610@qq.com
- * @Date: 2023-08-22 09:55:39
- * @LastEditors: 胡思旗 931347610@qq.com
- * @LastEditTime: 2023-08-22 14:23:46
- * @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 = {
 
   // license
-  appId: 'Please enter the app id.', // You need to go to the development website to apply.
+  appId: '0a472a3b0f1543ab9e66d1ad4e6a91c8', // 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.
 
   // 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://192.168.1.198:6789', // 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:6789/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.
@@ -42,6 +34,6 @@
 
   // map
   // You can apply on the AMap website.
-  amapKey: 'Please enter the amap key.',
+  amapKey: '5221d3ca929a7bf59c301be186c03791',
 
 }

--
Gitblit v1.9.3