Commit Graph

35 Commits

Author SHA1 Message Date
648540858
91e49745e4 修复心跳异常,支持通道列表,推流列表,拉流代理列表直接查看对应的云端录像,兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858
3e2486d0ab Merge branch '2.6.8' into wvp-28181-2.0 2023-08-08 09:50:31 +08:00
648540858
874a57387a 支持与第三方对接PS流 2023-08-08 09:49:27 +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
04e7f48fde 合并主线的发流端口管理逻辑 2023-07-10 14:30:59 +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
db3240d918 优化截图获取接口 2023-06-05 11:10:15 +08:00
648540858
5d40080468 优化部分sql实现 2023-05-15 15:29:39 +08:00
648540858
4f2d47385d 去除redis工具类直接使用RedisTemplate存取数据 2023-04-03 10:26:55 +08:00
648540858
5fab97cf7e 支持不同域的前后端分离部署 2023-03-15 19:05:56 +08:00
648540858
4446218f9e 修复通道导入bug 2023-02-20 15:21:41 +08:00
648540858
fd3a4ef472 修复国标录像回放以及录像下载 2023-01-06 11:43:27 +08:00
648540858
131ea77669 接口使用旧的stream信息,支持使用远程ip端口做为回复的地址而不是使用sip中的地址 2022-12-06 10:33:43 +08:00
648540858
23710f1c64 优化多网卡下的localIp获取 2022-11-17 17:01:54 +08:00
648540858
8870f5f5a1 优化使用来源ip作为流ip 2022-11-10 09:40:01 +08:00
648540858
aed45e0f0d 优化多网卡 2022-10-28 16:40:12 +08:00
648540858
958474c646 首页改造完成,添加系统信息 2022-10-24 18:14:31 +08:00
648540858
ca891f367c 首页改造完成,待添加系统信息 2022-10-24 15:20:35 +08:00
jiang
3884e9a56a 1.根据redis消息更新推流列表时同时更新在线状态
2.推流列表的模板增加在线状态
2022-09-07 15:56:48 +08:00
648540858
5461b8ebf2 支持全局异常和统一返回结果,未完待续 2022-08-22 16:17:28 +08:00
648540858
1a9e49d9ff 依赖包版本升级 2022-08-19 17:11:51 +08:00
648540858
e29d94c83f 增加推流添加功能,修复级联目录推送 2022-07-22 16:02:14 +08:00
648540858
f5fcc79a2c 优化国标树型展示 2022-07-03 07:40:54 +08:00
648540858
1e2d207aea 添加优化后的地图页面,完全一处百度地图相关的api 2022-04-22 16:21:05 +08:00
648540858
b10a65483d 去除lombok,readme更新 2022-03-04 10:30:55 +08:00
648540858
7400ace65d 规范数据库,解决bug 2022-02-25 20:33:02 +08:00
648540858
d4fe0fb325 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 2022-02-15 09:13:16 +08:00
朱俊杰
54df5df031 mapper改用注释方式 2022-02-14 10:18:00 +08:00
648540858
bf66f8f694 推流导入支持添加平台信息与目录信息 2022-02-11 16:45:06 +08:00
朱俊杰
37a84e6691 新增实时监控功能
左边是设备通道树,右边是分屏预览
2022-02-10 14:45:33 +08:00
648540858
d07a5680f3 为推流列表增加批量移除功能 2022-02-07 18:30:43 +08:00
648540858
06e22d980e 支持推流通道预导入 2022-01-16 10:40:57 +08:00
panlinlin
118e42884e 优化拉流代理 2021-04-22 10:56:13 +08:00