648540858 96bb3814f6 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

2022-11-08 20:43:25 +08:00

..

all-application.yml

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

2022-11-08 20:43:25 +08:00

application-dev.yml

为User-Agent添加必要的版本信息

2022-09-09 23:19:19 +08:00

application-docker.yml

为User-Agent添加必要的版本信息

2022-09-09 23:19:19 +08:00

application.yml

补充缺失的文件

2022-03-29 12:17:54 +08:00

banner.txt

为User-Agent添加必要的版本信息

2022-09-09 23:19:19 +08:00

logback-spring-local.xml

修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道

2022-09-07 16:18:35 +08:00

wvpssl.jks

修复点播与录像回放sdp信息sdp-ip的取值错误，修复回放信令错误

2021-10-15 15:05:02 +08:00