THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1,修复 post api在传递了secret参数还是出现secret缺失提示的问题 

2,修复 zlmedia在 docker 的默认config.ini的错误路径问题(错误 "linux_bin" 正确: "bin")
This commit is contained in:
chenlei 2019-07-29 19:08:23 +08:00
parent 45a1c9f6e7
commit 722bf96634
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/Dockerfile
View File

@ -53,7 +53,7 @@ RUN ["/bin/bash", "./build_for_docker_linux.sh"]
#前端
FROM base as build_f
ENV ZLMEDIAKIT_NVR_UI_VERSION=1.0.3
ENV ZLMEDIAKIT_NVR_UI_VERSION=1.0.4
WORKDIR /usr/src/ZLMediaKitUI
RUN mkdir ui && \
curl -sLO https://github.com/chenxiaolei/ZLMediaKit_NVR_UI/releases/download/${ZLMEDIAKIT_NVR_UI_VERSION}/zlmediakit_nvr_ui.${ZLMEDIAKIT_NVR_UI_VERSION}.tar.gz &&\

8
docker/config_docker.ini
View File

@ -7,7 +7,7 @@ secret=123456
[ffmpeg]
bin=/usr/local/bin/ffmpeg
cmd=-i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s
log=/usr/src/ZLMediaKit/linux_build/bin/ffmpeg/ffmpeg.log
log=/usr/src/ZLMediaKit/build/bin/ffmpeg/ffmpeg.log
[general]
enableVhost=0
@ -25,7 +25,7 @@ streamNoneReaderDelayMS=60000
#HLS文件写缓存大小
fileBufSize=65536
#录制文件路径
filePath=/usr/src/ZLMediaKit/linux_build/bin/httpRoot
filePath=/usr/src/ZLMediaKit/build/bin/httpRoot
#HLS切片时长,单位秒
segDur=3
#HLS切片个数
@ -61,7 +61,7 @@ notFound=<html><head><title>404 Not Found</title></head><body bgcolor="white"><c
#http端口号
port=80
#http 服务器根目录
rootPath=/usr/src/ZLMediaKit/linux_build/bin/httpRoot
rootPath=/usr/src/ZLMediaKit/build/bin/httpRoot
#http 文件发送缓存大小
sendBufSize=65536
sslport=443
@ -78,7 +78,7 @@ udpTTL=64
#查看录像的应用名称
appName=record
#录制文件路径
filePath=/usr/src/ZLMediaKit/linux_build/bin/httpRoot
filePath=/usr/src/ZLMediaKit/build/bin/httpRoot
#MP4文件录制大小,默认一个小时
fileSecond=3600
#每次流化MP4文件的时长,单位毫秒

7
server/WebApi.cpp
View File

@ -170,7 +170,12 @@ static ArgsContentExt getAllArgs(const Parser &parser) {
ss >> jsonArgs;
auto keys = jsonArgs.getMemberNames();
for (auto key = keys.begin(); key != keys.end(); ++key) {
allArgs[*key] = jsonArgs[*key].asString();
Value jVal= jsonArgs[*key];
if(!(jVal.isObject() || jVal.isArray() || jVal.isNull())){
string s = jVal.asString();
allArgs[*key] = s;
}
}
} catch (std::exception &ex) {
WarnL << ex.what();