update

xc

2021-03-20 1be7edf5fbbd984f35f5c48d89686caf23b9873e

update

 src/main/resources/application.properties

@@ -39,7 +39,6 @@

#renite famehistory info
famehistory.ip=192.168.1.120

#springmvc访问静态页
spring.mvc.static-path-pattern=/public/*


 src/main/resources/public/index.html

@@ -127,11 +127,11 @@
            return;
        }
        isPlaying = true;
        $.get("http://127.0.0.1:8088/monica/test/video", function (data) {
/*        $.get("http://127.0.0.1:8088/monica/test/video", function (data) {
                h5lc.play(data)
            }
        );
        //play();
        );*/
        play();
        $playDom.style.display = 'none';
        $stopDom.style.display = 'block';
    }, false);
@@ -158,7 +158,8 @@
        //h5lc.play("ws://" + (firstResponseIp || source) + ":8080/live/" + stream)
        //h5lc.play("ws://pull2.afb1188.com/live/" + stream + ".flv")
        //h5lc.play("ws://localhost:8080/live/" + stream)
        //h5lc.play("ws://localhost:8080/live/test.flv")
        h5lc.play("ws://localhost:8080/live/test.flv")
        //h5lc.play("ws://localhost:8072/live/test.flv")
        // h5lc.play("ws://119.9.118.39:8080/live/user1", canvas)
        // h5lc.play("ws://test.qihaipi.com/gnddragon/test.flv", canvas)
        //  h5lc.play("ws://localhost:8080/live/test.flv", canvas)

 src/test/java/com/hbbh/adapter/HttpClientUtilTest.java

@@ -1,9 +1,11 @@
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;

public class HttpClientUtilTest {
@@ -20,7 +22,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]
@@ -124,12 +126,13 @@
    @Test
    void init() {
        String result = createInstance();
        if (result.contains("success")){
        System.out.println(result);
        /*if (result.contains("success")) {
            startInstance();
        }else {
            //创建实例失败
            System.out.println("创建实例失败");
        }
        }*/
    }

    /**
@@ -145,6 +148,172 @@
        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();
    }

    /**
@@ -164,8 +333,8 @@
     * 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(){