Commit Graph

40 Commits

Author SHA1 Message Date
648540858
059635c2cc 修复国标点播缓存启动未清理的BUG 2024-10-25 17:41:50 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858
f458c9b793 优化代码调用 2024-04-10 22:38:12 +08:00
648540858
54b878d2e1 优化代码,升级版本号为2.7.1 2024-04-09 22:43:45 +08:00
648540858
33b75be71a 支持abl hook 2024-04-01 18:21:38 +08:00
648540858
4548695a0b hook优化 2024-03-31 00:28:45 +08:00
648540858
7a3b9c6f69 调整hook订阅通知的位置 2024-03-28 19:10:53 +08:00
648540858
cc793d16f5 调整hook订阅通知的位置 2024-03-28 18:35:28 +08:00
648540858
b90dc789b4 优化媒体节点服务的代码结构 2024-03-21 23:39:32 +08:00
648540858
1e0b73b939 调整节点管理代码结构 2024-03-19 17:52:11 +08:00
648540858
1768565ce0 优化媒体节点服务的代码结构 2024-03-18 23:42:18 +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
f8d2b933b1 为每个接口添加调试接口需要的描述 2023-12-26 15:30:24 +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
648540858
3951a95284 Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
2023-08-25 08:56:47 +08:00
648540858
b63a89a0a8 修复发流参数错误 2023-08-18 14:06:39 +08:00
648540858
91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858
7d3cbb8253 Merge branch 'wvp-28181-2.0' into main-dev 2023-07-24 09:42:32 +08:00
648540858
17ea37506e 修复端口分配的并发问题 2023-07-24 09:06:49 +08:00
648540858
d48f89eee4 修复端口分配的并发问题 2023-07-24 09:04:47 +08:00
648540858
19c996774e 合并主线 2023-07-19 15:37:59 +08:00
648540858
32c73ff595 Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2023-07-17 16:56:58 +08:00
648540858
c42d391290 修复数据存储 2023-07-14 08:34:15 +08:00
648540858
ef5018de2d 修复合并错误 2023-07-13 14:57:30 +08:00
648540858
668dc8f0dd Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	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/InviteRequestProcessor.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/media/zlm/dto/hook/HookResultForOnPublish.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
2023-07-13 14:47:24 +08:00
648540858
9fc3db1f5e 增加发流音视频分开发送 2023-07-13 14:30:41 +08:00
648540858
f525b55729 修复发流复盖的为问题 2023-07-12 15:13:53 +08:00
648540858
04e7f48fde 合并主线的发流端口管理逻辑 2023-07-10 14:30:59 +08:00
648540858
885842249f 优化第三方对接接口 2023-07-07 18:17:24 +08:00
648540858
61e5226122 Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
2023-07-06 15:07:43 +08:00
648540858
0a3d25fb5b 修复非必传参数 2023-07-06 15:07:16 +08:00
648540858
733a11f265 修复单端口点播 2023-07-03 17:55:34 +08:00
648540858
43ef195543 Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
2023-07-03 16:54:09 +08:00
648540858
ba8fffd907 增加与第三方对接的接口 2023-07-03 16:53:03 +08:00
648540858
e4622d17a6 优化字段名称 2023-07-03 10:36:02 +08:00
648540858
ed035b74d9 添加关闭收流发流的接口 2023-06-28 10:47:33 +08:00
648540858
6fcff0567e doc去除cdn依赖 2023-06-28 09:15:07 +08:00
648540858
c7d1515023 增加redis通道 2023-06-27 15:34:38 +08:00