amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

temp

Browse Source
This commit is contained in:
liuziloong 2020-01-19 14:54:31 +08:00
parent 81d3e54d45
commit d2d84680c0
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/Process.cpp
View File

@ -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<char*>(cmd .data());
LPTSTR lpDir = const_cast<char*>(cmd.data());
if (CreateProcess(NULL, lpDir, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)){
//下面两行关闭句柄，解除本进程和新进程的关系，不然有可能 不小心调用TerminateProcess函数关掉子进程

54
server/WebApi.cpp
View File

@ -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,{
//开始推流事件