2683 Commits

Author	SHA1	Message	Date
lin	f4bbca78e5	优化通道变化消息发送以及增加设备状态丢失检测	2025-06-03 16:52:42 +08:00
lin	cc0c73a64d	Merge branch 'master' into dev/设备和平台使用不同的优化策略	2025-06-03 11:31:38 +08:00
lin	111274c08a	修复通道共享状态过滤， 优化发流端口获取， 避免递归过多异常	2025-06-03 10:36:29 +08:00
648540858	dccd27e9c2	修复空指针异常	2025-05-29 21:36:02 +08:00
648540858	08fe740481	Merge pull request #1866 from xiaoQQya/fix/sql ... fix: 修复 sql 语法错误	2025-05-29 17:29:55 +08:00
lin	1420fcfcd0	Merge branch 'master' into 重构/1078 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/service/bean/InviteErrorCode.java # src/main/resources/application.yml	2025-05-29 17:10:32 +08:00
lin	ec9a0bcc76	修复talk模式Bye消息发送失败的BUG	2025-05-29 17:02:37 +08:00
lin	46d30a8fe2	Merge branch 'master' into dev/设备和平台使用不同的优化策略 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java # 数据库/2.7.4/初始化-mysql-2.7.4.sql # 数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql	2025-05-29 15:31:52 +08:00
lin	578b54ed09	完善设备有效期到期机制	2025-05-29 15:29:00 +08:00
xiaoQQya	3845c03250	fix: 修复 sql 语法错误	2025-05-29 14:37:22 +08:00
648540858	58e82ec185	临时提交	2025-05-28 22:32:14 +08:00
648540858	a40446e42b	临时提交	2025-05-27 23:19:10 +08:00
lin	3ad5d43368	临时提交	2025-05-27 18:24:07 +08:00
lin	dd9c64d7a8	增加设备状态保持任务	2025-05-26 18:04:02 +08:00
lin	0c29c90d3b	Merge branch 'master' into 重构/1078	2025-05-26 15:07:58 +08:00
lin	4b7467e8e0	Merge branch '2.7.3'	2025-05-26 10:17:46 +08:00
lin	b1ff1ef54c	增加订阅日志	2025-05-26 10:16:52 +08:00
lin	9da6e874fb	修复时间戳发送错误导致seek失败	2025-05-26 09:54:33 +08:00
lin	ca37162dd5	Merge branch 'master' into dev/设备和平台使用不同的优化策略 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java	2025-05-26 09:09:36 +08:00
lin	75b1e8deb2	Merge branch '2.7.3' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/catalog/CatalogEventLister.java	2025-05-23 18:18:32 +08:00
lin	601d2b5d2b	修复集群推流BUG	2025-05-23 18:06:54 +08:00
lin	55f36f660b	修复集群播放BUG	2025-05-23 17:26:17 +08:00
lin	d825b986dd	推流列表和拉流代理支持根据来源ip返回流地址	2025-05-23 09:20:22 +08:00
648540858	a1a5c53fad	合并国标级联状态重构	2025-05-22 21:14:50 +08:00
648540858	7c7ef34045	Merge branch '2.7.3' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPSender.java	2025-05-22 21:09:22 +08:00
lin	243f7f62b7	国标级联调整心跳逻辑	2025-05-22 17:40:10 +08:00
lin	b0b5a0f5e0	国标级联调整注册逻辑	2025-05-22 15:17:13 +08:00
yosixiaohu	83f603238a	修复开始时间和结束时间写反问题	2025-05-22 13:50:06 +08:00
648540858	7bb0cc19f4	重构平台保活逻辑-启动对未离线的平台注销	2025-05-22 07:09:20 +08:00
648540858	1d172cb387	重构平台保活逻辑-启动对未离线的平台注销	2025-05-22 07:02:10 +08:00
648540858	bcf08d27fa	重构平台保活逻辑	2025-05-21 23:17:52 +08:00
lin	29ac4850f4	去除移除订阅时设置订阅周期	2025-05-21 18:06:07 +08:00
lin	dd17462b68	重构设备订阅保活和更新机制	2025-05-21 14:57:10 +08:00
lin	a1ba811962	调整推流获取逻辑	2025-05-20 17:59:16 +08:00
lin	bfc063e4f7	修复通过redis唤醒推流	2025-05-19 16:52:12 +08:00
lin	d524905edb	增加设备和平台在线状态不同的同步策略	2025-05-19 15:52:56 +08:00
lin	f7f3ed4c5b	Merge branch 'master' into dev/设备和平台使用不同的优化策略	2025-05-19 14:42:44 +08:00
lin	2dcd070fbe	调整PR修复方式	2025-05-19 14:42:26 +08:00
lin	38059f4c38	Merge branch '2.7.3'	2025-05-19 14:41:29 +08:00
lin	ef22377fe5	Merge remote-tracking branch 'origin/master'	2025-05-19 14:39:07 +08:00
lin	43916f27d7	Merge branch '2.7.3'	2025-05-19 14:39:01 +08:00
vannewang	23e3173ed0	修复CatalogEventLister未判空ServerGBId引发的空指针异常	2025-05-19 11:32:55 +08:00
lin	c19fae68a3	升级fastjson版本以解决json序列化BUG	2025-05-19 11:26:58 +08:00
lin	5224f2b5c0	增加数据库脚本	2025-05-19 10:39:49 +08:00
Iwan Lebron	17a7b23239	fix sql err	2025-05-19 10:39:24 +08:00
lin	420b3889c5	[1078] 合并新UI	2025-05-16 15:17:35 +08:00
lin	592c1c2b71	[1078] 合并新UI	2025-05-15 18:32:03 +08:00
lin	5b89145337	增加接入信息展示	2025-05-15 10:28:02 +08:00
lin	98e6cfcc4c	Merge branch 'master' into dev/1078-newUI	2025-05-15 10:00:40 +08:00
lin	91d571d8d4	增加设置，支持屏蔽频繁注册不段开关tcp连接的设备	2025-05-15 09:55:37 +08:00
lin	081a146f2a	[1078] 合并新UI	2025-05-14 18:01:12 +08:00
648540858	1a7f517c5a	Merge branch 'refs/heads/master' into dev/1078-newUI	2025-05-13 21:22:01 +08:00
lin	a83a48e40e	修复因发送失败消息捕捉导致的消息处理异常	2025-05-13 15:25:17 +08:00
lin	f1fb046774	修复播放弹窗下的地址复制	2025-05-12 16:10:24 +08:00
lin	198db8f684	修复分屏监控地址不一致	2025-05-12 09:00:36 +08:00
648540858	9903f25cc1	强化消息发送失败的处理	2025-05-11 22:00:33 +08:00
648540858	10c75036f5	Merge branch 'master' into dev/1078-newUI	2025-05-11 07:00:10 +08:00
648540858	d7ba1cab30	强化通道同步异常处理	2025-05-10 23:22:59 +08:00
648540858	3b7ba3eb46	Merge branch 'master' into dev/1078-newUI ... # Conflicts: # src/main/resources/application.yml	2025-05-10 08:59:45 +08:00
648540858	e22d96cfb7	调整文档指向地址	2025-05-10 08:01:08 +08:00
648540858	b9a4cac707	修复文档描述跳转错误	2025-05-10 07:57:14 +08:00
lin	40b6580611	修复同步通道为空时, 更新通道异常	2025-05-07 15:10:38 +08:00
lin	b159775b0e	去除重复执行代码	2025-04-29 17:27:44 +08:00
lin	113743a065	增加新版本web页面	2025-04-28 15:04:06 +08:00
lin	3c1c68d327	调整地址	2025-04-28 13:07:04 +08:00
lin	403bee3108	切换地址	2025-04-27 17:09:57 +08:00
lin	fe02fdcc02	修复单通道设备编号一致时的判断	2025-04-27 10:17:16 +08:00
648540858	f86af27b60	优化统计信息获取	2025-04-27 06:15:05 +08:00
lin	e2678f39e3	临时提交	2025-04-25 18:04:51 +08:00
lin	1dc65330fc	修复属性注释错误	2025-04-24 17:53:05 +08:00
lin	4dd5864cf1	Merge branch 'master' into dev/前端页面修改	2025-04-24 08:43:41 +08:00
648540858	900447ae5c	增加文档使用说明	2025-04-23 22:18:19 +08:00
lin	4ad9f83ee9	登录后用户信息增加服务ID	2025-04-23 20:36:28 +08:00
lin	a433003f74	增加异常处理	2025-04-22 11:24:20 +08:00
lin	dd32f4b07a	增加sip信令超时时间	2025-04-22 09:52:31 +08:00
lin	ba58eff4be	解决启动时的警告	2025-04-21 15:08:38 +08:00
lin	5bbc15d023	去除录像倍速限制	2025-04-18 23:14:57 +08:00
lin	3b4a6018cb	修复云端录像seek问题	2025-04-16 18:07:04 +08:00
lin	1a9307003a	Merge remote-tracking branch 'origin/dev/前端页面修改' into dev/前端页面修改	2025-04-15 09:03:24 +08:00
648540858	45b3d9322c	增加云端录像手动删除	2025-04-14 22:54:30 +08:00
648540858	65cd397a9c	增加云端录像手动删除	2025-04-14 22:46:37 +08:00
lin	f2e3016a48	修复云端录像seek不准确的问题	2025-04-14 12:43:05 +08:00
lin	59c6243338	Merge branch 'master' into dev/前端页面修改	2025-04-14 12:12:05 +08:00
lin	2c494bcc7d	修复缓存清理失败的BUG	2025-04-14 11:22:11 +08:00
648540858	add88ec6b8	增加关闭服务接口以及在linux上安装为服务的脚本	2025-04-13 21:38:51 +08:00
648540858	c8822e2b86	优化云端录像播放逻辑	2025-04-13 20:14:48 +08:00
lin	eea367d6d7	增加录像seek和倍速播放接口	2025-04-12 21:24:02 +08:00
lin	9d0c8f91b9	临时提交	2025-04-10 18:00:12 +08:00
lin	aa1e497d76	临时提交	2025-04-10 17:11:31 +08:00
xiaoQQya	63100f3b90	fix: 修复使用 postgres 数据库时通道列表查询乱序的问题	2025-04-10 14:12:53 +08:00
xiaoQQya	40a95c70e8	fix: 修复使用 postgres 数据库时设备列表查询可能乱序的问题	2025-04-10 14:11:04 +08:00
lin	cf15174ea2	Merge remote-tracking branch 'origin/dev/前端页面修改' into dev/前端页面修改 ... # Conflicts: # 数据库/2.7.3/更新-mysql-2.7.3.sql # 数据库/2.7.3/更新-postgresql-kingbase-2.7.3.sql	2025-04-09 16:51:16 +08:00
lin	72a0c1a27e	Merge branch 'master' into dev/前端页面修改	2025-04-09 16:50:42 +08:00
lin	481609ef72	修复录制计划开启录像失败的BUG	2025-04-09 16:48:50 +08:00
lin	e284c3857c	Merge branch 'master' into 重构/1078	2025-04-09 12:17:22 +08:00
648540858	69f1056836	录制计划时间精确到分钟	2025-04-04 23:30:18 +08:00
lin	b348b2d3a9	通道表增加索引	2025-04-03 09:06:16 +08:00
lin	e76d25816a	修复前端的符号错误	2025-03-31 18:01:34 +08:00
huangxiao	629a4dbea3	refactor: 优化zlm hook 推流鉴权事件找不到mediaServer的错误处理	2025-03-28 13:51:48 +08:00
lin	91c9bc4fe3	去除接口多余的分隔符	2025-03-27 17:13:31 +08:00