aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-20 20:37:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,776 Commits 27 Branches 1 Tag 209 MiB
9e28923b8c
Commit Graph

351 Commits

Author SHA1 Message Date
648540858
9e28923b8c
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +08:00
648540858
b4dadf6c51 修复删除的设备无法重新注册的问题 2023-06-20 13:02:18 +08:00
648540858
d310204d00 去除多余字段 2023-06-20 09:57:28 +08:00
648540858
6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json
 2023-06-19 20:19:31 +08:00
648540858
8cf5b65e38 优化国标级联注册机制 2023-06-19 20:09:16 +08:00
648540858
8942ab0112 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 2023-06-19 18:42:36 +08:00
‘sxh’
ccc0a99d68 同步主线的代码，保持一致性 2023-06-15 11:20:43 +08:00
‘sxh’
652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2023-06-15 11:10:20 +08:00
‘sxh’
15df08964b 新增设备主子码流选择，默认为不开启 2023-06-15 11:00:29 +08:00
648540858
f3388dd53a 修复级联录像查询sql错误 2023-06-14 16:26:29 +08:00
648540858
c4d7dd9651 Merge branch '2.6.8' into wvp-28181-2.0 2023-06-13 23:11:00 +08:00
648540858
8f5bbfa5c2 修复zlm上线时过期任务设置错误 2023-06-13 23:06:35 +08:00
648540858
446f729e55 优化sdp解析，兼容带有f=的设备 2023-06-10 00:32:42 +08:00
648540858
20a47729fc Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-08 10:41:36 +08:00
648540858
095b12ebbd 优化ffmpeg拉流代理 2023-06-08 10:40:16 +08:00
648540858
534be3f580 支持redis消息强制关闭流 2023-06-07 20:58:35 +08:00
648540858
b7f2a6b25b Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-07 20:21:10 +08:00
648540858
97b04c4dba 修复录像下载，优化拉流代理接口 2023-06-07 20:15:08 +08:00
648540858
db3240d918 优化截图获取接口 2023-06-05 11:10:15 +08:00
648540858
8d6de72429 优化日志 2023-06-02 16:40:19 +08:00
648540858
74431b1e98 优化点播流程中ssrc的释放 2023-06-02 15:46:07 +08:00
yanggs
51c19c397d 修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms" 2023-06-01 13:30:48 +08:00
648540858
314423bd01 修复级联点播的空指针异常 #864 2023-05-30 11:00:11 +08:00
648540858
9ff1613d3b 修复web端管理节点负载不显示国标收流 #871 2023-05-30 10:54:09 +08:00
648540858
5a152791c0 添加获取截图接口 2023-05-29 23:28:06 +08:00
648540858
807d0524a6 修复推流鉴权 2023-05-23 10:34:00 +08:00
648540858
be9bf60e81 兼容人大金仓对online作为保留字段的要求 2023-05-16 15:13:38 +08:00
648540858
5d40080468 优化部分sql实现 2023-05-15 15:29:39 +08:00
648540858
d849352441 重构以适配postgresql 2023-05-12 10:37:03 +08:00
648540858
a2da81f79a 支持级联国标录像下载 2023-05-09 17:31:58 +08:00
648540858
c429a34e53 修复国标视频点播三种级联并发点播和录像下载的问题 2023-05-08 17:18:08 +08:00
648540858
490c55381f 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:59:12 +08:00
648540858
e2f9ee8f7b 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:40:57 +08:00
648540858
381c3bdc20 修复国标点播下级平台，ssrc更新的时单端口错误更新rtpserver的问题 2023-05-04 16:04:44 +08:00
648540858
2bc2842224 优化国标点播下级平台，ssrc更新的时因为旧的端口释放慢导致点播失败的问题，使用新的接口直接更新ssrc 2023-05-04 15:36:04 +08:00
648540858
3fe47021b9 优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性 2023-05-04 14:21:58 +08:00
648540858
22deb206ba 补充上一个修复的内容 2023-04-21 14:42:23 +08:00
648540858
5c3c3e6a4c 修复消息发送失败导致后续次通道无法点播的bug 2023-04-21 14:18:52 +08:00
648540858
0f50904992 支持设备/通道状态变化时发送redis通知 2023-04-20 10:26:42 +08:00
648540858
0f3898910c 收流时设置re_use_port参数解决端口关闭快速打开造成的端口未释放问题， 支持点播的tcp主动 2023-04-19 16:21:28 +08:00
648540858
f68f6d20e0 修复流注销想上级发送bye后未清理缓存的问题 2023-04-19 14:53:06 +08:00
648540858
db2ccfedfa 优化notify性能，增加notify超出处理能力时直接回复错误码，不做处理。 2023-04-19 11:09:26 +08:00
648540858
d46fc9de82 优化下级平台自定义ssrc的情况，优化国标录像下载流程 2023-04-14 14:59:22 +08:00
648540858
403f1e16a3 合并优化ssrc存储结构 2023-04-08 15:36:59 +08:00
648540858
8c4922cbe1 Merge branch '2.6.7' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-04-08 15:29:15 +08:00
648540858
0858f7995b 优化ssrc存储结构，避免因为大量ssrc存在MediaServer中导致redis读取超时 2023-04-08 15:22:18 +08:00
648540858
59ab2adb2e 去除flyway配置 2023-04-04 11:14:08 +08:00
648540858
f89ef3abf4 优化移动位置notify消息处理 2023-04-03 15:06:08 +08:00
648540858
4f2d47385d 去除redis工具类直接使用RedisTemplate存取数据 2023-04-03 10:26:55 +08:00
648540858
91bfbc36f1 优化设备注册，支持到期续订，优化国标级联到期续订。 2023-03-28 14:09:41 +08:00