From 722bf9663472b54502bd77b8cdab5a8233197737 Mon Sep 17 00:00:00 2001 From: chenlei Date: Mon, 29 Jul 2019 19:08:23 +0800 Subject: [PATCH] =?UTF-8?q?1,=E4=BF=AE=E5=A4=8D=20post=20api=E5=9C=A8?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E4=BA=86secret=E5=8F=82=E6=95=B0=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E5=87=BA=E7=8E=B0secret=E7=BC=BA=E5=A4=B1=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=202,=E4=BF=AE=E5=A4=8D=20z?= =?UTF-8?q?lmedia=E5=9C=A8=20docker=20=E7=9A=84=E9=BB=98=E8=AE=A4config.in?= =?UTF-8?q?i=E7=9A=84=E9=94=99=E8=AF=AF=E8=B7=AF=E5=BE=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98(=E9=94=99=E8=AF=AF=20"linux=5Fbin"=20=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE:=20"bin")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 2 +- docker/config_docker.ini | 8 ++++---- server/WebApi.cpp | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) 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();