From 60b61d7c303f20a89dae07a911fb9ed4cccb8586 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Sun, 13 Oct 2024 20:38:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D273=E7=89=88=E6=9C=ACsql?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
数据库/2.7.3/{初始化-mysql-2.7.2.sql => 初始化-mysql-2.7.3.sql} | 0
...stgresql-kingbase-2.7.2.sql => 初始化-postgresql-kingbase-2.7.3.sql} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename 数据库/2.7.3/{初始化-mysql-2.7.2.sql => 初始化-mysql-2.7.3.sql} (100%)
rename 数据库/2.7.3/{初始化-postgresql-kingbase-2.7.2.sql => 初始化-postgresql-kingbase-2.7.3.sql} (100%)
diff --git a/数据库/2.7.3/初始化-mysql-2.7.2.sql b/数据库/2.7.3/初始化-mysql-2.7.3.sql
similarity index 100%
rename from 数据库/2.7.3/初始化-mysql-2.7.2.sql
rename to 数据库/2.7.3/初始化-mysql-2.7.3.sql
diff --git a/数据库/2.7.3/初始化-postgresql-kingbase-2.7.2.sql b/数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
similarity index 100%
rename from 数据库/2.7.3/初始化-postgresql-kingbase-2.7.2.sql
rename to 数据库/2.7.3/初始化-postgresql-kingbase-2.7.3.sql
From 38f476c86b7d62a81920d3232d843822a43dab5f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Sun, 13 Oct 2024 20:54:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AF=A6=E6=83=85=E5=90=8D=E7=A7=B0=E4=BE=BF?=
=?UTF-8?q?=E4=BA=8E=E6=96=B0=E6=89=8B=E7=90=86=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/_content/introduction/config.md | 4 ++--
pom.xml | 2 +-
src/main/resources/{all-application.yml => 配置详情.yml} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename src/main/resources/{all-application.yml => 配置详情.yml} (100%)
diff --git a/doc/_content/introduction/config.md b/doc/_content/introduction/config.md
index c73bc625..ea4c7c78 100644
--- a/doc/_content/introduction/config.md
+++ b/doc/_content/introduction/config.md
@@ -17,7 +17,7 @@ WVP-PRO通过调用ZLMediaKit的RESTful接口实现对ZLMediaKit行为的控制;
## 1 WVP配置文件位置
基于spring boot的开发方式，配置文件的加载是很灵活的。默认在src/main/resources/application.yml，部分配置项是可选，你不需要全部配置在配置文件中，
-完全的配置说明可以参看all-application.yml。
+完全的配置说明可以参看"src/main/resources/配置详情.yml"。
### 1.1 默认加载配置文件方式
@@ -166,7 +166,7 @@ user-settings:
stream-on-demand: true
```
-更多完整的配置信息参考all-application.yml文件，需要那个配置项，复制到正在使用的配置文件中对应的文件即可。
+更多完整的配置信息参考"src/main/resources/配置详情.yml"文件，需要那个配置项，复制到正在使用的配置文件中对应的文件即可。
如果配置信息无误，你可以启动zlm，再启动wvp来测试了，启动成功的话，你可以在wvp的日志下看到zlm已连接的提示。
接下来[部署到服务器](./_content/introduction/deployment.md)， 如果你只是本地运行直接在本地运行即可。
diff --git a/pom.xml b/pom.xml
index 7d4b23a3..4bd3e924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -408,7 +408,7 @@
3.3.0
- **/all-application.yml
+ **/配置详情.yml
**/application.yml
**/application-*.yml
**/local.jks
diff --git a/src/main/resources/all-application.yml b/src/main/resources/配置详情.yml
similarity index 100%
rename from src/main/resources/all-application.yml
rename to src/main/resources/配置详情.yml
From feb08dfc4ac144a23d3e1f5d11ca19cb6ff2f82d Mon Sep 17 00:00:00 2001
From: Kairlec
Date: Tue, 15 Oct 2024 14:53:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=B3=A8?=
=?UTF-8?q?=E9=94=80=E6=B5=81=E6=97=B6=E6=B2=A1=E6=9C=89=E4=B8=8E=E4=B9=8B?=
=?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E5=9B=BD=E6=A0=87=E9=80=9A=E9=81=93?=
=?UTF-8?q?=E6=97=B6=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=9A=84NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../vmp/streamPush/service/impl/StreamPushServiceImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
index 0b41086e..aeabcc83 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
@@ -284,7 +284,10 @@ public class StreamPushServiceImpl implements IStreamPushService {
}
streamPush.setPushing(false);
if (userSetting.isUsePushingAsStatus()) {
- gbChannelService.offline(streamPush.buildCommonGBChannel());
+ CommonGBChannel commonGBChannel = streamPush.buildCommonGBChannel();
+ if (commonGBChannel != null) {
+ gbChannelService.offline(commonGBChannel);
+ }
}
sendRtpServerService.deleteByStream(streamPush.getStream());
mediaServerService.stopSendRtp(mediaServer, streamPush.getApp(), streamPush.getStream(), null);