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/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);
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
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