Commit Graph

1698 Commits (aeb75c0df1998a268114b382083170184ad99324)

Author SHA1 Message Date
648540858 aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858 7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858 cf3d98102a Merge branch 'master' into 2.7.0 2024-03-28 18:08:57 +08:00
648540858 1de344674a 使用冒号分隔redis的key 2024-03-28 18:08:33 +08:00
648540858 53d4d10e1c Merge branch 'master' into 2.7.0 2024-03-28 16:31:08 +08:00
648540858 f1e902af7f 支持级联移动位置订阅通知转发 2024-03-28 16:28:41 +08:00
648540858 39103e53c7 修复点播请求释放的问题 2024-03-27 18:23:22 +08:00
648540858 a2b1065fe9 修复redis推流设备推送bug 2024-03-27 16:51:02 +08:00
648540858 0f18d4cbe1 修复redis推流设备推送bug 2024-03-27 16:20:46 +08:00
648540858 e886aa4833 修复PTZType导致声音开关失效的问题 2024-03-27 11:15:35 +08:00
648540858 1aa347bd2b zlm hook 优化 2024-03-22 14:28:00 +08:00
648540858 3291c4b2e6 修复多平台推流无人观看redis通知 2024-03-21 16:54:44 +08:00
648540858 912c83dfd3 添加日志 2024-03-21 11:16:31 +08:00
648540858 97dc926b28 调整ptzType字段名称 2024-03-18 17:41:49 +08:00
648540858 bfafe45b26
Merge pull request #1371 from ancienter/develop
[bugfix]修复云端录像查询时间转换错误的问题
2024-03-18 15:39:32 +08:00
648540858 f4e41659d8 修复国标级联注册和心跳重复发送的问题 2024-03-18 10:36:15 +08:00
648540858 c6adfd24d9 修复redis开始推流的通知 2024-03-18 10:13:03 +08:00
648540858 267085e945 修复插入国标设备时字段错误 2024-03-17 22:21:01 +08:00
648540858 4677042b12 Merge remote-tracking branch 'origin/master' 2024-03-16 21:38:28 +08:00
648540858 00fb00a4c3 修复dev配置文件中的logback-spring配置 2024-03-16 21:37:44 +08:00
648540858 045f2334d0 修复级联查看国标录像 2024-03-15 15:15:20 +08:00
leesam 00bb8d914a [bugfix]修复云端录像查询时间转换错误的问题 2024-03-15 09:42:25 +08:00
648540858 debfac58b0 时间解析兼容iso861带毫秒 2024-03-14 16:22:24 +08:00
648540858 d4f6ec39b7 优化CivilCode缓存 2024-03-14 14:54:20 +08:00
648540858 e1c8183adf 调整语音对讲超时任务位置 2024-03-14 11:03:52 +08:00
648540858 d1624e2d06 修复取消移动位置订阅失败的问题 2024-03-13 16:13:05 +08:00
648540858 f7e5fff446 Merge remote-tracking branch 'origin/master' 2024-03-13 15:40:47 +08:00
648540858 dc8869be49 优化收到redis推动的推流设备信息更新内容重复的问题 2024-03-13 15:40:30 +08:00
648540858 e1d476a54a 处理收到redis推动的推流设备信息内容重复的问题 2024-03-13 15:24:09 +08:00
648540858 cb5afce55e 优化语音对讲定时任务的删除 2024-03-12 23:55:00 +08:00
648540858 1fcdf5a8f3 Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
2024-03-08 09:30:48 +08:00
648540858 d8b24fc795 XmlUtil添加直接获取Double和Integer的方法 2024-03-07 14:49:46 +08:00
648540858 5bf87ca330
Merge pull request #1270 from hexq/playback
Playback
2024-03-05 10:41:22 +08:00
648540858 bd4598e676 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2024-03-04 14:33:15 +08:00
648540858 38980826f9 修复平台删除时未移除心跳超时重新注册任务的问题 #1329 2024-03-04 14:32:57 +08:00
648540858 5a6044ef4e
Merge pull request #1336 from wendy512/bugfix
bugfix:修复紫光华智录像查询返回日期为2024-02-21T11:10:36+08:00解析报错,兼容多种不同日期格式
2024-03-01 14:51:51 +08:00
648540858 a90098b90b Merge branch 'wvp-28181-2.0' into main-dev 2024-03-01 14:46:33 +08:00
648540858 e932a9b824 Merge branch '2.6.9' into wvp-28181-2.0 2024-03-01 10:55:49 +08:00
wendy512 268869c6a1 bugfix:修复紫光华智录像查询返回StartTime、EndTime为2024-02-21T11:10:36+08:00,兼容多种不同日期格式 2024-02-29 21:10:56 +08:00
648540858 c581974027 使用GetMapping替换RequestMapping 2024-02-29 18:15:55 +08:00
648540858 bb94831177 修复访问assist配置https访问失败的问题 2024-02-29 16:20:46 +08:00
648540858 db6f722d20 优化国标级联语音喊话TCP主动模式 2024-02-27 18:02:12 +08:00
648540858 66210ec51a 支持国标级联语音喊话TCP主动模式 2024-02-27 17:41:14 +08:00
648540858 c8b0e66e0e 合并主线 2024-02-27 10:25:42 +08:00
648540858 509d9b3cbb Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
2024-02-27 10:22:13 +08:00
648540858 5f09692198 添加统一回调管理 2024-02-23 18:48:01 +08:00
648540858 f6c48588da 支持支持主码流子码流切换 2024-02-22 17:22:28 +08:00
648540858 18898e982f 支持读取warning header作为错误消息的内容 #1030 2024-02-20 15:08:06 +08:00
648540858 a9ab5c28e9 优化订阅机制,需要重新订阅时,取消命令发送后再发送订阅命令 #1273 2024-02-20 11:12:42 +08:00
648540858 e5856a9f91 修复ack超时事件异常执行的bug 2024-02-07 21:18:36 +08:00