648540858
|
ab74d1cff9
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-09-14 20:51:21 +08:00 |
|
648540858
|
5b3dc4d595
|
优化点播结束后关闭RTPServer
|
2022-09-14 16:11:18 +08:00 |
|
648540858
|
2f76fa98bb
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# 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
|
2022-09-08 09:46:35 +08:00 |
|
648540858
|
ec0ec5eb54
|
修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道
|
2022-09-07 16:18:35 +08:00 |
|
648540858
|
d5e8aa62a1
|
添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活
|
2022-09-05 17:10:21 +08:00 |
|
648540858
|
aa6bce35c7
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-09-05 09:44:24 +08:00 |
|
648540858
|
ee7ef0bf41
|
优化级联平台注册的周期时间
|
2022-09-02 15:49:40 +08:00 |
|
648540858
|
3146e63fc0
|
优化异常处理
|
2022-09-01 17:53:00 +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
|
2de4c322f6
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
6e90050db4
|
去除zlm使用redis过期作为心跳超时的方式
|
2022-08-29 11:50:36 +08:00 |
|
648540858
|
9f680a2e9e
|
修复bug以及日志按照，错误/sip/数据库 分割
|
2022-08-26 18:03:09 +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
|
1a9e49d9ff
|
依赖包版本升级
|
2022-08-19 17:11:51 +08:00 |
|
648540858
|
cb16cabb64
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-08-15 15:37:13 +08:00 |
|
648540858
|
c041aaccb4
|
修复录像回放中的信令错误
|
2022-08-15 15:08:51 +08:00 |
|
648540858
|
82ab6b1760
|
去除jedis，方便支持redis集群
|
2022-08-10 18:14:33 +08:00 |
|
648540858
|
116d979d87
|
合并主线
|
2022-08-09 16:58:31 +08:00 |
|
648540858
|
8b0ff3767b
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.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/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
|
2022-08-09 14:41:21 +08:00 |
|
648540858
|
142efdd915
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
648540858
|
e05d0aa0a9
|
修复ssrc变化时端口变化的问题
|
2022-07-29 11:57:04 +08:00 |
|
648540858
|
778969f1eb
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:21:09 +08:00 |
|
648540858
|
fd091e545b
|
优化hook订阅机制
|
2022-07-28 16:18:41 +08:00 |
|
648540858
|
34f2832bef
|
优化gps信息存入数据库
|
2022-07-28 11:22:51 +08:00 |
|
648540858
|
f84eebdb75
|
优化部分hook订阅
|
2022-07-27 16:16:12 +08:00 |
|
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
|
648540858
|
c77c1a956c
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
c48def08cf
|
MediaItem增加callId
|
2022-07-18 20:33:47 +08:00 |
|
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
648540858
|
81f69eb6f4
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:17 +08:00 |
|
648540858
|
cfed860667
|
合并主线
|
2022-07-12 16:54:58 +08:00 |
|
648540858
|
66e6756909
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-07-12 16:28:51 +08:00 |
|
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
5364db2982
|
优化对讲逻辑
|
2022-07-03 22:27:04 +08:00 |
|
648540858
|
7609d7836c
|
优化对讲逻辑
|
2022-07-03 16:23:31 +08:00 |
|
648540858
|
72c1b36d6d
|
优化对讲逻辑
|
2022-07-03 00:44:36 +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
|
dbe6ece653
|
优化播放中zlm离线判断
|
2022-06-15 15:06:22 +08:00 |
|
648540858
|
f7006e4881
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
|
648540858
|
f760134b39
|
Merge pull request #517 from TristingChen/optimize-play-controller
Optimize play controller
|
2022-06-15 14:19:33 +08:00 |
|
chenjialing
|
8f7db635a3
|
优化----okhttp连接访问超时设置，访问异常code设置为-2
|
2022-06-15 14:13:43 +08:00 |
|
648540858
|
e0344ccf97
|
国标级联推送推流 支持多wvp间自动选择与推送
|
2022-06-14 14:37:34 +08:00 |
|
648540858
|
6d4312e383
|
Merge pull request #473 from AlphaWu/Zafu-Dev
添加on_record_ts事件支持
|
2022-06-07 11:12:22 +08:00 |
|
648540858
|
9ae0691c80
|
优化快照的存储与显示
|
2022-06-02 10:55:41 +08:00 |
|
648540858
|
dc6769664e
|
兼容不规范的时间格式iso8601格式；升级fastjson版本
|
2022-05-26 12:10:46 +08:00 |
|
648540858
|
9c555b56b7
|
优化语音广播的TCP主动模式
|
2022-05-18 18:14:46 +08:00 |
|