648540858
|
283d317652
|
合并数据库脚本
|
2024-03-11 15:25:57 +08:00 |
|
648540858
|
fb78d49c98
|
临时提交
|
2024-03-11 15:23:21 +08:00 |
|
648540858
|
3c092f4195
|
Merge branch 'master' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
# src/main/java/com/genersoft/iot/vmp/gb28181/task/SipRunner.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.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/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/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.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/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
# 数据库/初始化-postgresql-kingbase.sql
|
2024-03-09 21:37:54 +08:00 |
|
648540858
|
76ec3d1b60
|
移除过时的dockerFile
|
2024-03-08 17:41:52 +08:00 |
|
648540858
|
0c327b3a25
|
添加sql缺失的字段
|
2024-03-08 15:37:17 +08:00 |
|
648540858
|
e9a7e74a6b
|
添加语音对讲文档
|
2024-03-08 15:07:53 +08:00 |
|
648540858
|
f95ca2248e
|
更新readme
|
2024-03-08 09:39:19 +08:00 |
panll
|
b86f0aaae2
|
!28 语音对讲合并
语音对讲合并
|
2024-03-08 01:33:38 +00: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
|
5c15a2b382
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
|
2024-03-05 10:45:53 +08:00 |
|
648540858
|
5bf87ca330
|
Merge pull request #1270 from hexq/playback
Playback
|
2024-03-05 10:41:22 +08:00 |
|
648540858
|
7cbc8c5fc2
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
|
2024-03-04 17:55:01 +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 |
|
648540858
|
f2f70fce98
|
修复合并错误
|
2024-02-07 20:53:13 +08:00 |
|
648540858
|
562dbb0857
|
Merge remote-tracking branch 'origin/main-dev' into main-dev
# Conflicts:
# 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/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2024-02-07 20:37:23 +08:00 |
|
648540858
|
2e7c9a7341
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# pom.xml
# 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/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# src/main/resources/all-application.yml
# src/main/resources/application-dev.yml
|
2024-02-07 20:30:37 +08:00 |
|
648540858
|
9839eb5d30
|
临时提交
|
2024-02-04 15:24:36 +08:00 |
|
648540858
|
7df31fa5eb
|
Merge remote-tracking branch 'origin/结构优化' into 结构优化
|
2024-02-03 09:17:08 +08:00 |
|
648540858
|
ad9e5f8bce
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2024-02-02 21:48:41 +08:00 |
|
648540858
|
0f23c3bb46
|
临时提交
|
2024-02-02 16:11:44 +08:00 |
|
648540858
|
b079039f81
|
修复国标级联上级主动结束时ssrc未释放的问题
|
2024-02-02 09:20:13 +08:00 |
|
648540858
|
241fa9030a
|
临时提交
|
2024-02-01 22:50:41 +08:00 |
|
648540858
|
c4804af026
|
Merge branch 'wvp-28181-2.0' into 结构优化
|
2024-01-31 18:55:31 +08:00 |
|
648540858
|
bf0efc2739
|
Merge branch '2.6.9' into wvp-28181-2.0
|
2024-01-31 18:50:15 +08:00 |
|
648540858
|
105ad25580
|
默认设备状态变化发送通知
|
2024-01-31 18:48:27 +08:00 |
|
648540858
|
09d610830f
|
Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
|
2024-01-31 17:26:00 +08:00 |
|
648540858
|
fc74ce9de4
|
Merge branch '2.6.9' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/resources/application-dev.yml
|
2024-01-31 17:25:32 +08:00 |
|
648540858
|
68fbc8fef1
|
优化跨域配置，默认允许全部跨域
|
2024-01-31 17:23:47 +08:00 |
|
648540858
|
02660913a0
|
临时提交
|
2024-01-31 17:17:28 +08:00 |
|
648540858
|
33b125262b
|
优化jessibuca播放窗口尺寸
|
2024-01-31 11:07:31 +08:00 |
|
648540858
|
9d9681c663
|
优化点播流程
|
2024-01-31 10:49:50 +08:00 |
|
648540858
|
3e1bf69181
|
添加通用通道云台控制接口
|
2024-01-30 23:11:21 +08:00 |
|
648540858
|
f5a7b958b6
|
去除多余注释
|
2024-01-30 21:16:23 +08:00 |