Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
This commit is contained in:
648540858
2022-11-08 20:43:25 +08:00
91 changed files with 741 additions and 632 deletions

View File

@@ -192,6 +192,8 @@ user-settings:
use-source-ip-as-stream-ip: true
# 按需拉流, true有人观看拉流无人观看释放 false拉起后不自动释放
stream-on-demand: true
# 推流鉴权, 默认开启
push-authority: true
# 关闭在线文档(生产环境建议关闭)
springdoc: