Commit Graph

25 Commits (38a85d432ae9bb861dbcbf090d68fb3dca0d85f6)

Author SHA1 Message Date
648540858 f223aad705 Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.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/request/impl/RegisterRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue
2022-11-18 18:39:44 +08:00
648540858 8870f5f5a1 优化使用来源ip作为流ip 2022-11-10 09:40:01 +08:00
WuPeng ab909feedf 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +08:00
648540858 6bfd48776d Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2022-10-17 12:45:56 +08:00
648540858 a4f48a1522 修复回看控制失效 #619 2022-09-30 17:54:58 +08:00
648540858 06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +08:00
648540858 03d6ad289b Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
2022-09-01 14:50:28 +08:00
648540858 275b272160 hook订阅曾增加过期清除功能,防止内存溢出 2022-08-31 13:09:45 +08:00
648540858 020f9ea8a0 Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
2022-08-23 11:01:53 +08:00
648540858 f24b6fa13f 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858 ecf4fbb684 Merge branch 'wvp-28181-2.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/Login.vue
2022-08-22 16:53:16 +08:00
648540858 5461b8ebf2 支持全局异常和统一返回结果,未完待续 2022-08-22 16:17:28 +08:00
648540858 26739237e2 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
#	sql/update.sql
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	web_src/src/components/dialog/deviceEdit.vue
#	web_src/src/components/dialog/devicePlayer.vue
2022-06-27 10:16:21 +08:00
648540858 dc6769664e 兼容不规范的时间格式iso8601格式;升级fastjson版本 2022-05-26 12:10:46 +08:00
648540858 f8f65d473b 优化语音广播流程 2022-05-10 13:08:32 +08:00
648540858 c2aaae9325 初步实现语音喊话 2022-05-09 18:15:30 +08:00
648540858 7d9cc96ef5 优化国标录像下载,添加进度条以及自动合并文件下载,需要结合新版assist服务使用。 2022-03-25 16:05:14 +08:00
648540858 354a39961a 优化点播, 级联点播级联录像。级联列表显示订阅状态 2022-03-14 18:24:30 +08:00
648540858 b2c953fc76 优化ssrc释放逻辑,优化级联点播速度,去除等待流格式的配置项 2022-03-07 01:17:45 +08:00
648540858 2eb1ca2d94 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
648540858 54568adfdd 优化录像下载逻辑以及录像查询逻辑 2021-11-26 23:05:36 +08:00
64850858 3469271ec2 优化集群方案, 每个zlm一套ssrc;
优化集群下的docker接入逻辑;
更正sql脚本;
支持重启不设置设备离线。重启SIP事务不丢失
2021-07-26 11:40:32 +08:00
64850858 89a9ab4534 添加zlm集群支持 2021-07-16 16:34:51 +08:00
panlinlin a004a978fa 规范api 2021-04-11 22:32:28 +08:00
panlinlin b17280522b 增加推流转发到国标,尚不完善 2021-04-02 19:04:01 +08:00