From 416daf0fa191376828fe22dd612916e7e7a5023a Mon Sep 17 00:00:00 2001
From: xc <double72cheng@gmail.com>
Date: Thu, 29 Apr 2021 15:53:27 +0800
Subject: [PATCH] 修改精确时间 更改时间轴
---
src/test/java/com/hbbh/adapter/HttpClientUtilTest.java | 259 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 222 insertions(+), 37 deletions(-)
diff --git a/src/test/java/com/hbbh/adapter/HttpClientUtilTest.java b/src/test/java/com/hbbh/adapter/HttpClientUtilTest.java
index 713fabb..2a0b185 100644
--- a/src/test/java/com/hbbh/adapter/HttpClientUtilTest.java
+++ b/src/test/java/com/hbbh/adapter/HttpClientUtilTest.java
@@ -1,15 +1,20 @@
package com.hbbh.adapter;
+import com.alibaba.fastjson.JSON;
import com.google.common.collect.Maps;
import com.hbbh.adapter.utils.HttpClientUtil;
import org.junit.jupiter.api.Test;
+import java.util.List;
import java.util.Map;
+/*
+@Deprecated
public class HttpClientUtilTest {
- /**
+ */
+/**
* GET /api/instance/create?path=E:\store\live&name=live&info=%5BMonibuca%5D%0A%23%20%E6%98%AF%E5%90%A6%E7%AD%89%E5%BE%85%E6%B5%81%EF%BC%8C%E5%A6%82%E6%9E%9C%E4%B8%BAtrue%E5%88%99%E8%AE%A2%E9%98%85%E4%B8%80%E4%B8%AA%E5%B0%9A%E6%9C%AA%E5%8F%91%E5%B8%83%E7%9A%84%E6%B5%81%E4%BC%9A%E8%BF%9B%E5%85%A5%E7%AD%89%E5%BE%85%E5%8F%91%E5%B8%83%E7%9A%84%E7%8A%B6%E6%80%81%EF%BC%8C%E5%90%A6%E5%88%99%E8%BF%94%E5%9B%9E%E8%AE%A2%E9%98%85%E5%A4%B1%E8%B4%A5%0AEnableWaitStream%20%3D%20true%0AEnableAudio%20%3D%20true%0AEnableVideo%20%3D%20true%0A%23%20%E7%BC%93%E5%86%B2%E7%8E%AF%E5%A4%A7%E5%B0%8F%E9%BB%98%E8%AE%A4%E6%98%AF2%E7%9A%8410%E6%AC%A1%E6%96%B9%0ARingSize%20%3D%2010%0A%23%20%E5%8F%91%E5%B8%83%E6%B5%81%E9%BB%98%E8%AE%A4%E8%BF%87%E6%9C%9F%E6%97%B6%E9%97%B4%201%E5%88%86%E9%92%9F%0APublishTimeout%20%3D%2060000000000%0A%5BRTSP%5D%0A%23%20%E7%AB%AF%E5%8F%A3%E6%8E%A5%E6%94%B6%E6%8E%A8%E6%B5%81%0AListenAddr%20%3D%20%22%3A554%22%0A%23%20%E5%BC%80%E5%90%AF%E8%87%AA%E5%8A%A8%E6%8B%89%E6%B5%81%E5%90%8E%EF%BC%8C%E4%B8%80%E6%97%A6%E6%9C%89%E8%AE%A2%E9%98%85%E6%B5%81%EF%BC%8C%E5%B0%B1%E4%BC%9A%E4%BB%8ERemoteAddr%E8%BF%9B%E8%A1%8C%E6%8B%89%E6%B5%81%0AAutoPull%20%3D%20false%0AReconnect%20%3D%20true%0A%23%20%E8%BF%9C%E7%A8%8B%E5%9C%B0%E5%9D%80%E9%85%8D%E5%90%88AutoPull%E9%85%8D%E7%BD%AE%E8%B5%B7%E4%BD%9C%E7%94%A8%0ARemoteAddr%20%3D%20%22rtsp%3A%2F%2Fadmin%3Aadmin%40192.168.1.212%3A554%2Fcam%2Frealmonitor%3Fchannel%3D1%26subtype%3D1%22%0A%23%20%E5%8F%91%E5%B8%83%E6%B5%81%E7%9A%84%E5%90%8D%E7%A7%B0%E9%85%8D%E5%90%88AutoPull%E9%85%8D%E7%BD%AE%E8%B5%B7%E4%BD%9C%E7%94%A8%20%E8%BF%9C%E7%A8%8B%E6%8B%89%E6%B5%81%E5%90%8E%E5%9C%A8%E6%9C%AC%E5%9C%B0%E8%B5%B7%E7%9A%84%E6%B5%81%E5%90%8D%E7%A7%B0%0AStreamPath%20%3D%20%22live%2Frtsp%22%0A%23%5B%5BRTSP.AutoPullList%5D%5D%0A%23URL%20%3D%20%22rtsp%3A%2F%2Fadmin%3Aadmin%40192.168.1.212%3A554%2Fcam%2Frealmonitor%3Fchannel%3D1%26subtype%3D1%22%0A%23StreamPath%20%3D%20%22live%2Frtsp2%22&clear=true HTTP/1.1
* Host: 192.168.1.109:3000
* Connection: keep-alive
@@ -20,7 +25,7 @@
* Referer: http://192.168.1.109:3000/
* Accept-Encoding: gzip, deflate
* Accept-Language: zh-CN,zh;q=0.9
- *
+ * <p>
* path: E:\store\live
* name: live
* info: [Monibuca]
@@ -46,8 +51,9 @@
* #URL = "rtsp://admin:admin@192.168.1.212:554/cam/realmonitor?channel=1&subtype=1"
* #StreamPath = "live/rtsp2"
* clear: true
- */
- private String info="[Monibuca]\n" +
+ *//*
+
+ private String info = "[Monibuca]\n" +
"# 是否等待流,如果为true则订阅一个尚未发布的流会进入等待发布的状态,否则返回订阅失败\n" +
"EnableWaitStream = true\n" +
"EnableAudio = true\n" +
@@ -124,69 +130,248 @@
@Test
void init() {
String result = createInstance();
- if (result.contains("success")){
+ System.out.println(result);
+ */
+/*if (result.contains("success")) {
startInstance();
- }else {
+ } else {
//创建实例失败
System.out.println("创建实例失败");
- }
+ }*//*
+
}
- /**
+ */
+/**
* 创建实例
* GET
- */
- private String createInstance(){
- String url="http://127.0.0.1:3000/api/instance/create";
+ *//*
+
+ private String createInstance() {
+ String url = "http://127.0.0.1:3000/api/instance/create";
Map<String, String> params = Maps.newLinkedHashMap();
- params.put("path","/Users/xucheng/Downloads/store/live");
- params.put("name","live");
- params.put("info",info);
- params.put("clear","true");
+ params.put("path", "/Users/xucheng/Downloads/store/live");
+ params.put("name", "live");
+ params.put("info", info);
+ params.put("clear", "true");
String result = HttpClientUtil.doGet(url, params);
return result;
}
- /**
+ */
+/**
+ * [{
+ * "Name": "history",
+ * "Path": "/Users/xucheng/Downloads/store/history",
+ * "config": {
+ * "Monibuca": {
+ * "EnableWaitStream": true,
+ * "EnableAudio": true,
+ * "EnableVideo": true,
+ * "RingSize": 10,
+ * "PublishTimeout": 60000000000
+ * },
+ * "RTMP": {
+ * "ListenAddr": ":1933"
+ * },
+ * "GateWay": {
+ * "ListenAddr": ":8071"
+ * },
+ * "Jessica": {
+ * "ListenAddr": ":8072"
+ * },
+ * "LogRotate": {
+ * "Path": "logs",
+ * "Size": 0,
+ * "Days": 1
+ * },
+ * "Cluster": {
+ * "ListenAddr": ":2011",
+ * "OriginServer": "",
+ * "Push": true
+ * },
+ * "HLS": {
+ * "EnableWrite": false,
+ * "EnableMemory": false,
+ * "Fragment": 10,
+ * "Window": 2,
+ * "Path": "resource"
+ * },
+ * "HDL": {
+ * "ListenAddr": ":2012"
+ * },
+ * "TS": {
+ * "AutoPublish": false,
+ * "Path": "resource"
+ * },
+ * "Record": {
+ * "Path": "resource",
+ * "AutoPublish": false,
+ * "AutoRecord": false
+ * },
+ * "RTSP": {
+ * "ListenAddr": ":551",
+ * "AutoPull": true,
+ * "Reconnect": true,
+ * "RemoteAddr": "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov",
+ * "StreamPath": "live/rtsp"
+ * },
+ * "WebRTC": {
+ * "PublicIP": ["127.0.0.1"]
+ * },
+ * "GB28181": {
+ * "Serial": "34020000002000000001",
+ * "Realm": "3402000000",
+ * "Expires": 3600,
+ * "AutoInvite": false,
+ * "ListenAddr": "192.168.1.120:5062"
+ * }* },
+ * "pid": "46533",
+ * "status": "offline"
+ * }, {
+ * "Name": "live",
+ * "Path": "/Users/xucheng/Downloads/store/live",
+ * "config": {
+ * "Monibuca": {
+ * "EnableWaitStream": true,
+ * "EnableAudio": true,
+ * "EnableVideo": true,
+ * "RingSize": 10,
+ * "PublishTimeout": 60000000000
+ * } ,
+ * "RTMP": {
+ * "ListenAddr": ":1935"
+ * },
+ * "GateWay": {
+ * "ListenAddr": ":8081"
+ * },
+ * "Jessica": {
+ * "ListenAddr": ":8080"
+ * },
+ * "LogRotate": {
+ * "Path": "logs",
+ * "Size": 0,
+ * "Days": 1
+ * },
+ * "Cluster": {
+ * "ListenAddr": ":2019",
+ * "OriginServer": "",
+ * "Push": true
+ * },
+ * "HLS": {
+ * "EnableWrite": false,
+ * "EnableMemory": false,
+ * "Fragment": 10,
+ * "Window": 2,
+ * "Path": "resource"
+ * },
+ * "HDL": {
+ * "ListenAddr": ":2020"
+ * },
+ * "TS": {
+ * "AutoPublish": false,
+ * "Path": "resource"
+ * },
+ * "Record": {
+ * "Path": "resource",
+ * "AutoPublish": false,
+ * "AutoRecord": false
+ * },
+ * "RTSP": {
+ * "ListenAddr": ":554",
+ * "AutoPull": true,
+ * "Reconnect": true,
+ * "RemoteAddr": "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov",
+ * "StreamPath": "live/rtsp"
+ * },
+ * "WebRTC": {
+ * "PublicIP": ["127.0.0.1"]
+ * },
+ * "GB28181": {
+ * "Serial": "34020000002000000001",
+ * "Realm": "3402000000",
+ * "Expires": 3600,
+ * "AutoInvite": false,
+ * "ListenAddr": "192.168.1.120:5060"
+ * }
+ * },
+ * "pid": "17003",
+ * "status": "offline"
+ * }]
+ *
+ * @return
+ *//*
+
+ private String findList() {
+ String url = "http://localhost:3000/api/instance/list";
+ String result = HttpClientUtil.doGet(url);
+ return result;
+ }
+
+ @Test
+ public void findListTest() throws Exception {
+ String list = findList();
+ List<Map> maps = JSON.parseObject(list, List.class);
+ for (Map map : maps) {
+ String name = map.get("Name") + "";//实例名称
+ String path = map.get("Path") + "";//实例存放路径
+ String status = map.get("status") + "";// offline 不在线 online 在线
+ System.out.println(status);
+ }
+
+ }
+
+ @Test
+ public void test01() throws Exception {
+ startInstance();
+ }
+
+ */
+/**
* 启动实例
* POST
* http://localhost:3000/api/instance/start?name=live
- */
- private void startInstance(){
- String url="http://localhost:3000/api/instance/start?name=live";
+ *//*
+
+ private void startInstance() {
+ String url = "http://localhost:3000/api/instance/start?name=live";
String result = HttpClientUtil.doPost(url);
System.out.println(result);
}
- /**
+ */
+/**
* 放入rtsp链接
* GET
* http://localhost:8081/rtsp/pull?
* target=rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov&
* streamPath=live/test
- *
- *
+ * <p>
+ * <p>
* return :http://localhost:2020/live/test1.flv
- */
- private void pullRTSPURL(){
- String url="http://localhost:8081/rtsp/pull";
+ *//*
+
+ private void pullRTSPURL() {
+ String url = "http://localhost:8081/rtsp/pull";
Map<String, String> params = Maps.newLinkedHashMap();
- /* params.put("target","rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov");
+ */
+/* params.put("target","rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov");
params.put("streamPath","live/test");
HttpClientUtil.doGet(url,params);
params.clear();
params.put("target","rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov");
params.put("streamPath","live/test1");
-*/
+*//*
+
for (int i = 0; i < 10; i++) {
- params.put("target","rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov");
- params.put("streamPath","live/test"+i);
+ params.put("target", "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov");
+ params.put("streamPath", "live/test" + i);
String result = HttpClientUtil.doGet(url, params);
- if (result.contains("0")){
- }else {
- System.out.println("第"+i+"次创建失败");
+ if (result.contains("0")) {
+ } else {
+ System.out.println("第" + i + "次创建失败");
}
params.clear();
@@ -195,13 +380,13 @@
}
@Test
- public void pullRTSP(){
- String url="http://localhost:8081/rtsp/pull";
+ public void pullRTSP() {
+ String url = "http://localhost:8081/rtsp/pull";
Map<String, String> params = Maps.newLinkedHashMap();
- params.put("target","rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov");
- params.put("streamPath","live/test");
+ params.put("target", "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov");
+ params.put("streamPath", "live/test");
String result = HttpClientUtil.doGet(url, params);
System.out.println(result);
}
-}
\ No newline at end of file
+}*/
--
Gitblit v1.9.1