aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-19 11:57:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,686 Commits 27 Branches 1 Tag 209 MiB
46bf5b7a39
Commit Graph

1910 Commits

Author SHA1 Message Date
648540858
7c833f3d12 1078-文本信息下发 2024-05-01 15:07:38 +08:00
648540858
e5acf7f1e4 1078-人工确认报警消息+链路检测 2024-05-01 10:05:33 +08:00
648540858
eb43ffd98f 1078-临时提交 2024-05-01 00:01:55 +08:00
648540858
e45b2479d3 1078-临时位置跟踪控制+位置信息查询 2024-04-30 23:37:44 +08:00
648540858
2ae4226e89 修复云端录像按年月查询时时间条件错误的BUG 2024-04-30 15:45:39 +08:00
648540858
edfd528dd5 Merge remote-tracking branch 'origin/master' 2024-04-30 15:01:43 +08:00
648540858
d4cdf5510b 优化拉流代理调用流程 2024-04-30 14:39:53 +08:00
648540858
7bdde6907a 1078-添加设备属性查询接口 2024-04-30 12:13:49 +08:00
648540858
5be7c7636e 1078-查询终端属性完成 2024-04-30 00:42:22 +08:00
648540858
76580d8fdc 1078-查询终端属性... 2024-04-30 00:28:40 +08:00
648540858
5b489d7c26 1078-设置终端参数-添加接口 2024-04-29 23:06:15 +08:00
648540858
5a392372cb 1078-添加设备控制 2024-04-29 22:15:21 +08:00
648540858
8aa97ba695 1078-添加设备控制 2024-04-29 22:12:27 +08:00
648540858
516c5ce3d1 1078-添加设备控制 2024-04-29 22:01:26 +08:00
648540858
9facff13b1 1078-添加发送分包支持 2024-04-29 21:24:08 +08:00
648540858
91b81ceb7a 1078-添加发送分包支持 2024-04-29 16:27:01 +08:00
648540858
06b27beedc 1078-设置终端参数... 2024-04-29 07:00:00 +08:00
648540858
bc356849c7 1078-设置终端参数... 2024-04-29 00:05:04 +08:00
WuPeng
424c0b6333 修改on_stream_none_reader返回值 2024-04-28 14:31:38 +08:00
648540858
8ade012a6e 合并分支 2024-04-26 17:49:28 +08:00
648540858
5e359b64d6 合并分支 2024-04-26 17:41:00 +08:00
648540858
6bd3a187a0 合并分支 2024-04-26 15:42:31 +08:00
648540858
3f6ef955f5 修复空指针异常 2024-04-26 15:02:49 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858
225940825b 1078-设置终端参数... 2024-04-24 23:34:21 +08:00
648540858
62122f95f0 1078-完善查询终端参数接口 2024-04-24 23:15:07 +08:00
648540858
67b846fe2f 1078-支持8103 修改注释错误 2024-04-24 22:21:47 +08:00
648540858
b89af9a693 Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2024-04-24 20:51:28 +08:00
648540858
2113e8cf27 优化notify消息中目录的处理 2024-04-24 20:33:52 +08:00
648540858
44aa37ad6e 优化notify消息中目录的处理 2024-04-24 16:12:42 +08:00
648540858
c21d973977 修复收到catalog消息是更新导致是否有音频的设置失效的BUG 2024-04-24 14:59:41 +08:00
648540858
1a30992985 合并270 2024-04-24 09:11:53 +08:00
648540858
d41d6b34af Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.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/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-04-23 20:59:20 +08:00
648540858
66a681d679 优化notify消息中目录和移动位置的处理 2024-04-23 20:45:12 +08:00
648540858
901dee2bf4 修复转发国标notify-update时信息错误的问题 2024-04-23 10:12:00 +08:00
648540858
8cba63642f 优化notify消息处理 2024-04-22 20:29:36 +08:00
648540858
714e1ff62c 1078-支持8103 设置终端参数 2024-04-21 23:54:06 +08:00
648540858
0058f1b0a9 1078-解析104... 2024-04-21 00:24:24 +08:00
648540858
34b6b516ab 1078-解析104... 2024-04-21 00:16:07 +08:00
648540858
f9c22fcb3d 1078-解析104中... 2024-04-20 18:59:23 +08:00
648540858
b57dbeac13 优化通道更新 2024-04-20 18:58:53 +08:00
648540858
c5ac7e218a 1078-解析104中... 2024-04-20 14:23:05 +08:00
648540858
975e94eee1 1078-支持分包消息 2024-04-20 13:03:39 +08:00
648540858
50e2565643 1078-处理分包发送 2024-04-20 00:07:37 +08:00
648540858
1aa197510f 临时提交 2024-04-19 14:39:35 +08:00
648540858
87629b7fc7 临时提交 2024-04-19 10:32:28 +08:00
648540858
0d0b31f715 临时提交 2024-04-19 10:27:24 +08:00
648540858
0dab86f0b8 临时提交 2024-04-19 10:22:34 +08:00
648540858
dd5ab573f2 1078-解析104... 2024-04-19 07:19:40 +08:00
648540858
a6236a2c13 1078-解析104... 2024-04-19 00:01:20 +08:00
648540858
16143a3fff 1078-解析104中 2024-04-18 20:11:13 +08:00
648540858
94436de3e1 临时提交 2024-04-18 18:31:37 +08:00
648540858
73559cc6b3 临时提交 2024-04-18 18:19:27 +08:00
648540858
38ce529dd2 临时提交 2024-04-18 18:14:59 +08:00
648540858
678bb33562 临时提交 2024-04-18 18:07:47 +08:00
648540858
5d36c2a337 临时提交 2024-04-18 17:51:56 +08:00
648540858
9adf12ca6a 临时提交 2024-04-18 17:34:00 +08:00
648540858
3639d2224d 临时提交 2024-04-18 17:22:25 +08:00
648540858
f536123b11 修改toString方法 2024-04-18 17:05:03 +08:00
648540858
2a765a93eb 添加RedisRpcResponse的toString 2024-04-18 17:00:13 +08:00
648540858
6025eb29fd 添加注释 2024-04-18 16:30:21 +08:00
648540858
55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858
407a5edebf 优化多wvp国标级联推流时推流信息的清理 2024-04-17 23:31:48 +08:00
648540858
e85cef4345 优化多wvp国标级联推流时缓存的清理 2024-04-17 23:23:42 +08:00
648540858
313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858
bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
648540858
f357bece62 优化回调设置方式 2024-04-16 22:22:00 +08:00
648540858
9c6765d44e 重构多wvp国标级联机制 2024-04-16 22:10:35 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00
648540858
cdeb3acf7c 移除多余文件 2024-04-15 16:13:56 +08:00
648540858
bd0fafde81 修复目录订阅发送订阅未携带经纬度的问题 2024-04-15 15:51:10 +08:00
648540858
fce96def9f 1078-添加查询终端参数 2024-04-15 00:40:36 +08:00
648540858
570307669e 1078-添加查询指定终端参数 2024-04-15 00:31:11 +08:00
648540858
205e529660 1078-补充终端设置参数 2024-04-14 23:03:43 +08:00
648540858
21e7ca0e46 1078-临时提交 2024-04-12 23:36:02 +08:00
648540858
6729df4992 合并主线 2024-04-12 22:15:26 +08:00
648540858
9f3cab6486 Merge branch 'master' into 1078 2024-04-12 10:38:45 +08:00
648540858
f34143df6d 修改totalReaderCount类型 2024-04-12 10:36:18 +08:00
648540858
da54cdf3b8 解决空指针异常 2024-04-12 09:00:39 +08:00
648540858
4005a12403 Merge remote-tracking branch 'origin/1078' into 1078 2024-04-11 22:46:03 +08:00
648540858
59c91bdaf8 1078-暂时注释位置附加信息读取 2024-04-11 22:45:50 +08:00
648540858
5c0183a422 修复无法下载较长时间时间录像的BUG 2024-04-11 22:25:57 +08:00
648540858
8750f0f3dd 去除多余代码 2024-04-11 16:58:56 +08:00
648540858
ab20f76885 去除多余代码 2024-04-11 16:58:03 +08:00
648540858
e222095636 修复流数据写入缓存 2024-04-11 16:55:34 +08:00
648540858
651d4a1b0e 优化代码调用 2024-04-11 14:28:42 +08:00
648540858
7d08b56267 Merge branch 'master' into 1078 2024-04-11 09:39:12 +08:00
648540858
05c83cf6ef Merge branch 'master' into 1078 2024-04-11 09:39:04 +08:00
648540858
9978d30aa1 Merge branch '2.7.0' 2024-04-11 09:36:48 +08:00
648540858
b45d71ba6d
Merge pull request #1389 from ancienter/develop-add-api-key 
[add]新增ApiKey管理功能
 2024-04-10 22:56:14 +08:00
648540858
f458c9b793 优化代码调用 2024-04-10 22:38:12 +08:00
leesam
ce950dea4a Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 22:18:40 +08:00
leesam
53199b32f6 适配postgres数据库 2024-04-10 22:16:56 +08:00
648540858
6c0087db88 优化代码调用 2024-04-10 20:56:45 +08:00
leesam
16b7e4a7ef Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 20:49:44 +08:00
leesam
10e2180c72 [bugfix]支持context-path配置 2024-04-10 19:07:37 +08:00
648540858
9bb5ef6522 修复多个wvp执行推流转发失败的BUG 2024-04-10 18:22:42 +08:00
648540858
82ca3a778a 优化媒体节点redis数据格式 2024-04-09 22:52:06 +08:00
648540858
54b878d2e1 优化代码，升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858
cf8320e749
Merge pull request #1400 from Anyuei/master 
处理可能会出现的空指针异常
 2024-04-09 20:57:50 +08:00
648540858
a1861038e5 修复录像下载 2024-04-09 19:53:43 +08:00
648540858
7a59acc8e6 合并主线 2024-04-09 17:30:18 +08:00
648540858
de5d025cee 修复单端口收流时音频禁用失败的问题 2024-04-09 16:10:02 +08:00
648540858
ab318fcf70 修复点播错误时关闭rtpserver 2024-04-09 14:53:11 +08:00
648540858
6dd870e74c 修复点播端口为空 2024-04-09 10:59:59 +08:00
648540858
bbf19c7909 合并主线 2024-04-09 10:40:16 +08:00
648540858
b1b6fae22c Merge branch 'master' into dev/zlm 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.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/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 2024-04-09 10:35:11 +08:00
648540858
0b2f635176 移除非主线内容 2024-04-09 10:30:00 +08:00
ancienter
25ff2fc4ef
Merge branch '648540858:master' into develop-add-api-key 2024-04-09 09:52:23 +08:00
648540858
ae239c8848 Merge branch 'master' into 1078 2024-04-08 18:15:06 +08:00
648540858
9badf1c7fe 1078-添加位置附加信息定义 2024-04-08 18:15:02 +08:00
648540858
a890b62fa1 Merge branch '2.7.0' 2024-04-08 18:13:33 +08:00
648540858
48351c875e 国标级联支持制定200OK中sdp的IP 2024-04-08 18:13:15 +08:00
648540858
d54787f323 1078-添加读取位置信息汇报附加信息读取 2024-04-07 23:50:58 +08:00
648540858
8a2dc6031e 1078-实现云台控制接口 2024-04-07 22:06:41 +08:00
648540858
9255ea802f 1078-添加云台控制接口 2024-04-07 20:59:21 +08:00
648540858
349b0442d6 Merge remote-tracking branch 'origin/1078' into 1078 2024-04-07 20:42:32 +08:00
648540858
403eb4499d Merge branch 'master' into 1078 2024-04-07 20:42:10 +08:00
648540858
7d0aebd311 Merge branch '2.7.0' 2024-04-07 20:26:01 +08:00
648540858
aeb75c0df1 优化推流结束后发送BYE 2024-04-07 20:25:44 +08:00
648540858
7d53009987 优化推流通知 2024-04-07 20:06:48 +08:00
648540858
6757f4b719 1078-云台变倍控制 2024-04-07 07:21:21 +08:00
648540858
8ba30e83ef 1078-修复错别字 2024-04-07 07:19:02 +08:00
648540858
98d9eb5314 1078-添加云台红外补光控制 2024-04-07 07:17:35 +08:00
648540858
a8a4aecc15 1078-添加云台雨刷控制 2024-04-07 07:15:43 +08:00
648540858
b649464753 1078-添加云台光圈控制 2024-04-07 07:12:51 +08:00
648540858
ebdd9ab534 1078-添加云台焦距控制 2024-04-07 07:09:49 +08:00
648540858
a1ab834875 1078-添加云台旋转 2024-04-07 07:07:27 +08:00
648540858
4ec4d618d6 1078-添加文件上传控制 2024-04-07 07:02:06 +08:00
648540858
5fc1000fcc 1078-添加文件上传完成通知 2024-04-07 06:56:39 +08:00
648540858
302eb98d51 1078-添加文件上传指令 2024-04-07 06:44:52 +08:00
648540858
984d8743be 1078-优化录像回放开始和停止 2024-04-06 00:42:54 +08:00
648540858
26bbeac6c7 1078-添加录像回放开始和停止 2024-04-06 00:06:40 +08:00
648540858
81c2b5715c 1078-添加录像回放列表查询 2024-04-04 16:54:08 +08:00
648540858
3e5da98539 1078-支持点播暂停/继续 2024-04-04 07:19:46 +08:00
648540858
a7b7371e74 1078-增加结束点播 2024-04-03 18:00:48 +08:00
648540858
0f420c43ac 1078-优化点播 2024-04-03 16:59:33 +08:00
648540858
abc3766556 1078-优化点播 2024-04-03 16:33:49 +08:00
648540858
603ce18573 1078-添加点播支持 2024-04-02 23:26:40 +08:00
648540858
6acc395ad2 Merge branch 'master' into 1078 2024-04-02 18:33:53 +08:00
648540858
a1c02605c1 abl-实现closeRtpServer 2024-04-02 14:41:02 +08:00
648540858
86a35f3612 合并开源主线 2024-04-02 11:25:19 +08:00
648540858
1bb813758a Merge branch 'master' into dev/abl支持 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2024-04-02 11:20:51 +08:00
648540858
67688d4a4b 优化停止国标收流 2024-04-02 11:20:19 +08:00
648540858
969ff86ebe 放行abl hook 接口 2024-04-02 09:53:47 +08:00
648540858
8b90fade9e 支持使用abl接收国标流 2024-04-02 00:05:09 +08:00
648540858
b78769f997 临时提交 2024-04-01 18:35:26 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
4d6f881460 修复空指针异常 2024-04-01 16:20:30 +08:00