aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-16 02:27:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,322 Commits 27 Branches 1 Tag 209 MiB
bfc063e4f7
Commit Graph

2336 Commits

Author SHA1 Message Date
guo
e8c65bed62 fix: 新增更新分组时校验节点编码唯一性 2025-02-19 09:19:14 +08:00
lin
676e2d7ea9 message消息适配新的回调模式 2025-02-18 17:04:13 +08:00
JerryYan
d0d0776d4a
[BUG] 修复执行录像计划定时任务时，没有录像任务导致的java.util.ConcurrentModificationException 
报错内容：
```
java.util.ConcurrentModificationException: null
        at java.util.HashMap$HashIterator.nextNode(HashMap.java:1469)
        at java.util.HashMap$KeyIterator.next(HashMap.java:1493)
        at com.genersoft.iot.vmp.service.impl.RecordPlanServiceImpl.stopStreams(RecordPlanServiceImpl.java:143)
        at com.genersoft.iot.vmp.service.impl.RecordPlanServiceImpl.execution(RecordPlanServiceImpl.java:92)
```

做出的修改：
按照下面的逻辑搬上来了
 2025-02-18 09:36:15 +08:00
lin
3da6444baa 调整设备控制相关的接口 2025-02-13 15:15:36 +08:00
648540858
c5eca3ca0e 修复sip消息订阅事件移除失败的BUG 2025-02-12 22:55:51 +08:00
lin
b7d0eb793d 去除多余注释 2025-02-12 20:58:58 +08:00
lin
9618f23af8 修复message和sip消息超时未回复的判断机制 2025-02-12 20:54:20 +08:00
lin
5808c7aff5 [集群] 重构message消息接受返回值的方式 2025-02-12 17:20:12 +08:00
lin
b6c3f42a1f Merge branch 'refs/heads/master' into dev/数据库统合2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	src/main/resources/配置详情.yml
 2025-02-11 19:30:20 +08:00
lin
d08248aae9 调整心跳间隔的设置机制以及状态的判断 2025-02-11 18:16:05 +08:00
lin
ea12e3465f 修复语音对讲后停止点播失败的BUG 2025-02-11 16:06:18 +08:00
lin
3fe131eed3 修复录制计划以来全局录像配置， 目前去除依赖，目前录制计划开启录像 2025-02-11 11:08:52 +08:00
lin
c38c4e3979 [集群] 增加强制关键帧/看守位控制/拉框放大缩小/设备状态查询 2025-02-08 20:52:46 +08:00
lin
71390a7b51 [集群] 增加远程重启/录像控制/布防（或撤防）/重置报警， 增加关闭推流接口 2025-02-08 17:29:31 +08:00
lin
8ca982485c [集群] 增加设备基本配置和设备配置查询 2025-02-08 10:45:47 +08:00
lin
547432e194 优化jwk.json读取 2025-02-07 17:48:06 +08:00
648540858
39de934f89
Merge pull request #1762 from BeatTime/bugfix/读取jwk.json异常 
fix: 修复jwk.json无法读取的问题，同时增加jwkFile配置项
 2025-02-05 16:46:08 +08:00
648540858
c059bd08dd
Merge pull request #1759 from guobi777/master 
fix: 在SpringBoot 2.4及以上版本处理跨域时，遇到错误提示：当allowCredentials为true时，allowed…
 2025-01-27 07:40:06 +08:00
liyexin
2f53a4d01e fix: 修复jwk.json无法读取的问题，同时增加jwkFile配置项 2025-01-23 16:05:12 +08:00
648540858
0cde02c397 [集群] 修复语音对讲支持 2025-01-21 17:45:48 +08:00
648540858
5f07db7ed4 [集群] 修复语音对讲支持 2025-01-21 17:43:14 +08:00
648540858
2297a2ffa7 [集群] 修复语音对讲支持 2025-01-21 17:37:57 +08:00
648540858
ba27819874 [集群] 增加语音对讲支持 2025-01-21 17:35:21 +08:00
南宫茜
3553c2911c
修复收到 Bye 时触发的一个 NPE 2025-01-21 17:11:28 +08:00
648540858
135f3054e6 [集群] 修复获取国标设备未赋值serverId的BUG 2025-01-21 17:08:21 +08:00
648540858
4e66e2bc6d [集群] 增加通道刷新状态消息 2025-01-21 17:04:51 +08:00
648540858
01f491c026 [集群] 修复同步通道时的通道上下线消息发送 2025-01-21 17:00:37 +08:00
南宫茜
cf3204de71
修复一个可能触发 NPE 的问题 
ZLMediaKit 回应中可能没有 tracks 字段，导致报 NPE，使得资源没有被正确释放
 2025-01-21 16:57:44 +08:00
648540858
3bae4ce63e Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
 2025-01-17 10:53:08 +08:00
648540858
464c989986 国标收流时流传输模式默认使用TCP被动 2025-01-12 22:24:47 +08:00
648540858
5480e68b86
Merge pull request #1747 from QianNangong/master 
修复上级点播国标级联的拉流代理相机，当流上线很慢时，收到来自上级的 ACK 早于流注册导致推流失败的问题
 2025-01-11 20:32:40 +08:00
guo
36004d471c fix: 在SpringBoot 2.4及以上版本处理跨域时，遇到错误提示：当allowCredentials为true时，allowedOrigins不能包含特殊值"*" 2025-01-08 16:31:35 +08:00
648540858
8ff68b2291 Merge branch 'master' into dev/数据库统合 2025-01-06 09:35:04 +08:00
648540858
812760efc3 增加日志 2025-01-06 09:34:32 +08:00
Li Keqing
e370cf880d 修复网页观看问题 2025-01-03 21:40:35 +08:00
Li Keqing
469717523b 修复当拉流代理上线很慢时，收到来自上级的 ACK 早于流注册导致推流失败的问题 2025-01-03 19:32:49 +08:00
648540858
63fbafe687 [集群] 支持通道刷新 2025-01-03 17:52:38 +08:00
648540858
5f4c943f26 [集群] 修复BUG 2025-01-03 17:37:01 +08:00
648540858
a2e7cd0323 [集群] 修复catalog 递归循环BUG 2025-01-03 17:34:30 +08:00
648540858
85427497bf Merge branch 'master' into dev/数据库统合 2025-01-03 17:27:25 +08:00
648540858
5cf5c506b1 优化SIP消息回复判定条件，修复目录推送BUG #1725 2025-01-03 17:21:09 +08:00
648540858
81c05e4b8b [集群] 修复BUG 2025-01-03 16:56:54 +08:00
648540858
000b797f48 [集群] 修复BUG 2025-01-03 16:53:59 +08:00
648540858
a9a4c7a4e5 [集群] 修复BUG 2025-01-03 16:34:11 +08:00
648540858
30ab315a15 [集群] 修复BUG 2025-01-03 16:29:35 +08:00
648540858
bfc77a1d11 [集群] 修复BUG 2025-01-03 16:25:33 +08:00
648540858
42322c75cc [集群] 优化国标级联目录更新 2025-01-03 16:21:20 +08:00
648540858
b650d5821d [集群] 修复BUG 2025-01-03 15:43:07 +08:00
648540858
232fa760e2 [集群] 支持国标级联目录更新 2025-01-03 15:34:53 +08:00
648540858
3903bc31b5 Merge branch 'master' into dev/数据库统合 2025-01-03 15:10:23 +08:00
648540858
cb7c41c3c1 [国标级联] 优化catalog推送代码 2025-01-03 15:10:02 +08:00
648540858
b0b3f32e03 [集群] 支持国标级联更新 2025-01-02 18:34:22 +08:00
648540858
7fb07848ab [集群-自动切换过国标级联] 修复BUG 2025-01-02 17:33:10 +08:00
648540858
347b2a6a4c [集群-自动切换过国标级联] 修复BUG 2025-01-02 17:32:27 +08:00
648540858
0566bf916f [集群-自动切换过国标级联] 修复BUG 2025-01-02 17:26:50 +08:00
648540858
ea2ef923ac 增加日志 2025-01-02 17:20:16 +08:00
648540858
5cd509b644 修改平台名称 2025-01-02 17:19:03 +08:00
648540858
5db9033372 [集群-自动切换过国标级联] 修复BUG 2025-01-02 17:07:38 +08:00
648540858
157d0a1e71 修复平台查询sql错误 2025-01-02 16:35:45 +08:00
648540858
91b0ba4d5e [集群-自动切换过国标级联] 启动时自动注册上级只注册本平台的上级 2025-01-02 16:30:02 +08:00
648540858
d022eb72d6 [集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册 2025-01-02 16:16:50 +08:00
648540858
af04669d49 Merge branch 'master' into dev/数据库统合 2025-01-02 14:46:16 +08:00
648540858
b37c0e264c 修复 #1743 2025-01-02 14:45:45 +08:00
648540858
884fcb827f [集群-自动切换过国标级联] 添加数据库脚本 2025-01-02 14:29:13 +08:00
claire
d7ebe93337 增加光圈速度范围判断 2025-01-02 14:20:04 +08:00
claire
daeb48f62a 修复设备云台控制关于速度的错误描述，水平垂直控制速度为00H~FFH(0-255),变倍控制速度为0H~FH(0-15)，聚焦速度为00H~FFH(0-255),光圈速度为00H~FFH(0-255) 2025-01-02 14:16:44 +08:00
648540858
3331a7d931 增加集群模式下自动切换过国标级联的执行服务 2024-12-31 17:07:19 +08:00
648540858
c2eecc43e7 Merge branch 'master' into dev/数据库统合 2024-12-31 16:16:33 +08:00
648540858
3367b70c61 增加日志 2024-12-31 16:15:43 +08:00
648540858
11599b2f05 临时提交 2024-12-31 16:10:00 +08:00
648540858
a8ad586204 临时提交 2024-12-31 15:58:53 +08:00
648540858
fe991f990d 临时提交 2024-12-31 15:46:32 +08:00
648540858
874733fa2c [RPC 云端录像] 修复服务ID 获取 2024-12-31 15:36:48 +08:00
648540858
32e90b2537 [RPC 云端录像] 修复时长显示 2024-12-31 15:13:56 +08:00
648540858
08a75d38a8 [RPC 云端录像] 增加云端录像播放 2024-12-31 14:54:11 +08:00
648540858
c629685cd1 [RPC 拉流代理] 修复停止是误报信息 2024-12-31 11:39:09 +08:00
648540858
5bde5ff5f2 临时提交 2024-12-31 11:27:56 +08:00
648540858
a324e4c95a [RPC] 添加拉流代理支持 2024-12-31 11:19:01 +08:00
648540858
26ee38aebe Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxy.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/bean/StreamProxyParam.java
 2024-12-31 10:33:12 +08:00
648540858
f078c6f7a0 [拉流代理] 修复 #1718 2024-12-31 10:31:03 +08:00
648540858
8f7016878d [拉流代理] 增加单独的字段管理每次拉流需要的节点 2024-12-31 10:17:49 +08:00
648540858
7e89b5f97f 临时提交 2024-12-31 09:31:58 +08:00
648540858
6dc64c05ee [RPC] 修复推流播放 2024-12-30 17:05:31 +08:00
648540858
f70aabc2b2 [RPC] 推流播放 2024-12-30 16:59:08 +08:00
648540858
3d2a87f61d 修复推流流注册时写入节点ID 2024-12-30 16:47:03 +08:00
648540858
c2fb892f2a 修复推流流注册时写入服务ID 2024-12-30 16:39:48 +08:00
648540858
785da6d5ef 调整前端获取服务ID方式 2024-12-30 16:32:37 +08:00
648540858
0cebbee0a9 [RPC] 增加订阅支持 2024-12-30 16:19:14 +08:00
648540858
317f771fa2 Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
#	web_src/src/components/DeviceList.vue
 2024-12-30 16:00:58 +08:00
648540858
0dd2826b9e 优化设备订阅的操作方式 2024-12-30 15:59:15 +08:00
648540858
45337311ec [国标PTZ] 添加调用其他wvp的云台控制 2024-12-30 10:27:49 +08:00
648540858
115b41e001 [国标PTZ] 添加调用其他wvp的云台控制 2024-12-27 17:53:25 +08:00
648540858
45862480aa Merge branch 'master' into dev/数据库统合 2024-12-27 17:38:07 +08:00
648540858
058909197e [国标PTZ] 调整云台控制调用 2024-12-27 17:37:50 +08:00
648540858
a4af7eb9a1 Merge branch 'master' into dev/数据库统合 2024-12-27 17:14:48 +08:00
648540858
f2c7a06516 [推流列表] 播放时根据实际状态更新状态 2024-12-27 17:14:26 +08:00
648540858
c231faeff6 [推流列表] 直接使用节点服务接口校验推流状态 2024-12-27 17:05:49 +08:00
南宫茜
8d662769d7
修复比较符 2024-12-27 15:54:06 +08:00
648540858
7751eae913 Merge branch 'master' into dev/数据库统合 2024-12-27 15:31:27 +08:00
Li Keqing
dade2854b1 修复级联状态推成 0 和 1 而不是 ON 和 OFF 的问题 2024-12-27 15:18:56 +08:00