From 93af1b4454f922ae115768a619ef8178af581567 Mon Sep 17 00:00:00 2001 From: Li Keqing Date: Fri, 1 Nov 2024 09:49:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AF=20auto?= =?UTF-8?q?-apply-play=20=E5=90=8E=E9=80=9A=E8=BF=87=E6=8A=A5=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/service/impl/PlayServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java index 733e87a82..fcc5db8fe 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java @@ -267,7 +267,7 @@ public class PlayServiceImpl implements IPlayService { } if (s.length == 2) { log.info("[ZLM HOOK] 预览流未找到, 发起自动点播：{}->{}->{}/{}", event.getMediaServer().getId(), event.getSchema(), event.getApp(), event.getStream()); - play(event.getMediaServer(), deviceId, channelId, null, null); + play(event.getMediaServer(), deviceId, channelId, null, (code, msg, data) -> {}); } else if (s.length == 4) { // 此时为录像回放， 录像回放格式为> 设备ID_通道ID_开始时间_结束时间 String startTimeStr = s[2]; @@ -283,7 +283,7 @@ public class PlayServiceImpl implements IPlayService { startTime, endTime ); - playBack(event.getMediaServer(), device, deviceChannel, startTime, endTime, null); + playBack(event.getMediaServer(), device, deviceChannel, startTime, endTime, (code, msg, data) -> {}); } } From bdd17ce48e892e9ea131dace38a36516cb7e5634 Mon Sep 17 00:00:00 2001 From: Shynur Date: Fri, 1 Nov 2024 09:58:27 +0800 Subject: [PATCH 2/2] Update compile.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复如 https://doc.wvp-pro.cn/#/_content/introduction/compile?id=_54-%e7%94%9f%e6%88%90war 所示的渲染错误 --- doc/_content/introduction/compile.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_content/introduction/compile.md b/doc/_content/introduction/compile.md index b61d6453b..038eb315e 100644 --- a/doc/_content/introduction/compile.md +++ b/doc/_content/introduction/compile.md @@ -112,7 +112,7 @@ mvn package -P war ``` 编译如果报错, 一般都是网络问题, 导致的依赖包下载失败 -编译完成后在target目录下出现wvp-pro-***.jar/wvp-pro-***.war。 +编译完成后在target目录下出现 `wvp-pro-VERSION.jar` 和 `wvp-pro-VERSION.war` 文件。 接下来[配置服务](./_content/introduction/config.md)