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

Merge branch 'wvp-28181-2.0' into main-dev

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
This commit is contained in:
648540858
2023-09-11 11:21:50 +08:00
parent d9cfe061b9 f57ed350b3
commit 88350873ee
365 changed files with 3884 additions and 2745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
web_src/src/components/dialog/MediaServerEdit.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/StreamProxyEdit.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/SyncChannelProgress.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/catalogEdit.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/changePassword.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/changePasswordForAdmin.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/changePushKey.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/channelMapInfobox.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/chooseChannel.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/chooseChannelForCatalog.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/chooseChannelForGb.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/chooseChannelForStream.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/configInfo.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/deviceEdit.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/devicePlayer.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/easyPlayer.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/getCatalog.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/importChannel.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/importChannelShowErrorData.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/onvifEdit.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/platformEdit.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/pushStreamEdit.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/queryTrace.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/recordDownload.vue Normal file → Executable file
View File

0
web_src/src/components/dialog/rtcPlayer.vue Normal file → Executable file
View File