XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.6.8' into wvp-28181-2.0

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
This commit is contained in:
648540858
2023-06-07 20:21:10 +08:00
parent db3240d918 97b04c4dba
commit b7f2a6b25b
9 changed files with 91 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/application.yml
View File

@@ -2,4 +2,4 @@ spring:
application:
name: wvp
profiles:
active: local
active: local268