43 Commits

Author	SHA1	Message	Date
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	a9ab5c28e9	优化订阅机制，需要重新订阅时，取消命令发送后再发送订阅命令 #1273	2024-02-20 11:12:42 +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	67e4060053	添加推流信息专属redis数据	2023-11-30 18:09:43 +08:00
648540858	6c13317faf	Merge branch 'wvp-28181-2.0' into main-dev	2023-10-31 16:24:57 +08:00
lishuyuan	da7889bf67	bugfix：编辑国标设备时，若目录订阅周期本来不为0时不生效	2023-10-27 11:15:30 +08:00
648540858	88350873ee	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # 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/info/InfoRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.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/impl/MediaServerServiceImpl.java	2023-09-11 11:21:50 +08:00
朱俊杰	49a8a08c94	捕获启动过程中发送sip异常导致的启动失败	2023-08-24 17:12:39 +08:00
648540858	91e49745e4	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
648540858	30ae9e929f	合并主线	2023-05-25 17:28:57 +08:00
648540858	3fe47021b9	优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性	2023-05-04 14:21:58 +08:00
648540858	b4048fbe80	合并开源主线	2023-04-04 09:09:07 +08:00
648540858	91bfbc36f1	优化设备注册，支持到期续订，优化国标级联到期续订。	2023-03-28 14:09:41 +08:00
648540858	039fbf7e24	Merge branch 'talk' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.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/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java	2023-03-20 14:32:53 +08:00
648540858	ec90519c90	添加设备离线原因	2023-03-08 16:57:07 +08:00
648540858	2d2832dbe9	优化各个配置启动顺序	2023-02-22 18:01:30 +08:00
648540858	663130df45	完善支持语音对讲talk	2023-02-19 12:46:53 +08:00
648540858	bdc0f83e29	启动时清理无效的设备缓存数据，避免设备无法注册	2023-02-14 15:12:53 +08:00
WuPeng	ab909feedf	升级Fastjson到Fastjson2	2022-11-05 20:49:56 +08:00
648540858	ca891f367c	首页改造完成,待添加系统信息	2022-10-24 15:20:35 +08:00
648540858	cd117ed228	dialog去除以及异常情况处理优化	2022-09-23 23:15:39 +08:00
648540858	710600db6f	优化sip消息，去除自动dialog创建	2022-09-21 18:18:37 +08:00
648540858	2de4c322f6	去除对redis key过期事件的使用；重构国标级联的注册保活	2022-08-31 11:29:13 +08:00
648540858	b957ab61c7	bug修复	2022-07-26 11:43:56 +08:00
648540858	28b5cc39d0	修复更新推流状态sql错误	2022-07-19 14:27:30 +08:00
648540858	4451994959	优化国标级联目录订阅通知以及目录查询回复	2022-07-17 23:17:36 +08:00
648540858	e0344ccf97	国标级联推送推流 支持多wvp间自动选择与推送	2022-06-14 14:37:34 +08:00
648540858	f6893cf95b	优化设备在线状态	2022-05-11 18:37:24 +08:00
648540858	c286ecb455	使用阿里代码规范。规范代码写法	2022-05-05 17:07:16 +08:00
648540858	91515f1b05	添加行政区划功能，修复目录发送数量统计的BUG	2022-04-18 17:38:49 +08:00
648540858	93d69d5476	添加国标级联目录分组分组加快通道传输速度	2022-04-18 16:16:49 +08:00
648540858	25102229f6	接收所有notify请求，即使没有订阅	2022-04-15 18:04:19 +08:00
648540858	e6ee7fe747	优化级联移动位置订阅位置更新	2022-04-14 16:52:48 +08:00
648540858	efc4a7bc8e	优化级联移动位置订阅位置更新	2022-04-13 17:59:21 +08:00
648540858	fcf8c40150	默认推流通道始终在线	2022-04-11 14:59:31 +08:00
648540858	f10b458fc9	优化订阅信息的发送与取消订阅	2022-04-08 14:44:49 +08:00
648540858	7e755f405d	支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug	2022-04-01 16:45:29 +08:00
648540858	c1d7f867c2	优化目录订阅以及国标级联目录订阅回复	2022-03-10 20:53:56 +08:00
648540858	b2c953fc76	优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项	2022-03-07 01:17:45 +08:00
648540858	e94b99d11c	实现国标录像级联播放，优化点播流程，加快点播速度	2022-02-27 20:01:31 +08:00
648540858	ac1a4a027a	支持国标级联的目录订阅功能	2022-01-14 17:04:26 +08:00
lin	abb60593cb	优化级联平台GPS订阅	2022-01-08 17:35:00 +08:00
lin	ddb36e54bd	级联平台添加GPS订阅支持	2022-01-08 16:47:20 +08:00