lin
158fbaac9c
Merge branch 'master' into dev/数据库统合
2025-02-19 09:48:26 +08:00
648540858
0de1ee8c19
Merge pull request #1772 from guobi777/master
...
fix: 新增更新分组时校验节点编码唯一性
2025-02-19 09:47:54 +08:00
648540858
1ead85f05b
Merge pull request #1771 from q792602257/patch-1
...
[BUG] 修复执行录像计划定时任务时,没有录像任务导致的java.util.ConcurrentModificationException
2025-02-19 09:45:38 +08:00
648540858
6b7672aa96
Merge pull request #1769 from coder-xiaomo/patch-1
...
修复 [ h265web.vue] 文件名开头包含空格导致前端启动报错问题
2025-02-19 09:31:43 +08:00
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
程序员小墨
310fbe0a01
修复 [ h265web.vue] 文件名开头包含空格导致前端启动报错问题
2025-02-15 02:12:27 +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
648540858
c9ded07e31
Merge pull request #1760 from QianNangong/patch-3
...
修复一个可能触发 NPE 的问题
2025-01-27 07:39:35 +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
e139676151
修复因数据库路径定义长度短导致记录无法添加的BUG
2025-01-11 22:32:57 +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