From d2d84680c0d1b044d2c684b338aaffcb1fba4429 Mon Sep 17 00:00:00 2001 From: liuziloong <18675721@qq.com> Date: Sun, 19 Jan 2020 14:54:31 +0800 Subject: [PATCH] temp --- server/Process.cpp | 2 +- server/WebApi.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/server/Process.cpp b/server/Process.cpp index d64ae72a..eb8eac4d 100644 --- a/server/Process.cpp +++ b/server/Process.cpp @@ -53,7 +53,7 @@ void Process::run(const string &cmd, const string &log_file_tmp) { ZeroMemory(&si, sizeof(si)); //结构体初始化; ZeroMemory(&pi, sizeof(pi)); - LPTSTR lpDir = const_cast(cmd .data()); + LPTSTR lpDir = const_cast(cmd.data()); if (CreateProcess(NULL, lpDir, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)){ //下面两行关闭句柄,解除本进程和新进程的关系,不然有可能 不小心调用TerminateProcess函数关掉子进程 diff --git a/server/WebApi.cpp b/server/WebApi.cpp index b2eb6713..c303b154 100644 --- a/server/WebApi.cpp +++ b/server/WebApi.cpp @@ -771,6 +771,60 @@ void installWebApi() { val["status"] = (int)status; }); + //获取录像列表(按月) + //http://127.0.0.1/index/api/getMp4RecordMonthly?app=pzstll&stream=stream_4&period=2020-01 + API_REGIST(api, getMp4RecordMonthly, { + CHECK_SECRET(); + CHECK_ARGS("app", "stream", "period"); + + GET_CONFIG(string, recordAppName, Record::kAppName); + GET_CONFIG(string, recordPath, Record::kFilePath); + GET_CONFIG(bool, enableVhost, General::kEnableVhost); + + auto _vhost = allArgs["vhost"]; + auto _app = allArgs["app"]; + auto _stream = allArgs["stream"]; + auto _period = allArgs["period"]; + + //TODO:判断日期格式 + + //Vhost为空的话,存储路径不一样 + if (_vhost.empty()) + { + _vhost = DEFAULT_VHOST; + } + + string strMp4RecordPath; + if (enableVhost) + { + strMp4RecordPath = recordPath + "/" + _vhost + "/" + recordAppName + "/" + _app + "/" + _stream; + } + else + { + strMp4RecordPath = recordPath + "/" + recordAppName + "/" + _app + "/" + _stream; + } + DebugL << strMp4RecordPath; + + Json::Value nVal; + nVal["vhost"] = _vhost.data(); + nVal["app"] = _app.data(); + nVal["stream"] = _stream.data(); + nVal["app"] = _app.data(); + + val["data"] = nVal; + + }); + + //获取录像列表(按天) + //http://127.0.0.1/index/api/getMp4RecordDaily?app=pzstll&stream=stream_4&period=2020-01-17 + API_REGIST(api, getMp4RecordDaily, { + CHECK_SECRET(); + CHECK_ARGS("app", "stream", "period"); + + + + }); + ////////////以下是注册的Hook API//////////// API_REGIST(hook,on_publish,{ //开始推流事件