648540858 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue		2023-06-27 16:46:26 +08:00
..
assets	添加发送媒体流, 添加媒体服务器节点管理ui,修复修改密码	2021-09-25 22:12:15 +08:00
components	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
layout	fix Notification is not defined on Android Webview or under ios16.4	2023-04-23 17:08:53 +08:00
router	国标录像UI重构	2023-01-09 16:31:51 +08:00
App.vue	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00
main.js	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00