diff --git a/docker/Dockerfile b/docker/Dockerfile index e42a695b..91924b30 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 &&\ diff --git a/docker/config_docker.ini b/docker/config_docker.ini index 56bb0357..846de7bf 100644 --- a/docker/config_docker.ini +++ b/docker/config_docker.ini @@ -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=404 Not Found> 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();