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

374 Commits

Author SHA1 Message Date
648540858
9cd63f0105 修复国标级联时添加目录不同平台无法使用同一个目录的问题 2023-07-19 15:33:21 +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
b64f320805 优化发流逻辑 2023-07-01 18:10:33 +08:00
648540858
0592fd676f 修复使用推流状态作为推流通道状态为false仍然发送通知 2023-06-29 11:22:32 +08:00
648540858
f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.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/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
 2023-06-29 09:52:05 +08:00
648540858
1294081a9c 优化树形列表通道查询 2023-06-29 09:36:13 +08:00
648540858
def56793ba 增加上级推流和停止推流的通知 2023-06-28 16:52:27 +08:00
648540858
f4e5e03962 修复表名错误 #904 2023-06-21 15:53:26 +08:00
648540858
9e28923b8c
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +08:00
648540858
21a96ad20f 修复通道刷新 2023-06-20 12:51:06 +08:00
648540858
d310204d00 去除多余字段 2023-06-20 09:57:28 +08:00
648540858
0532363192 优化国标级联注册机制 2023-06-20 09:29:12 +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
8942ab0112 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 2023-06-19 18:42:36 +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
5b8ffd5b61 修复前端空指针异常 #831 2023-06-14 18:14:40 +08:00
648540858
f3388dd53a 修复级联录像查询sql错误 2023-06-14 16:26:29 +08:00
648540858
0c14970ab8 增加收到notify增加或移除通道时发送redis消息 2023-06-07 21:11:39 +08:00
648540858
2ef4111297 修复拉流代理的ffmpeg代理方式 2023-06-05 10:28:11 +08:00
648540858
b7d85a270e 修复添加目录SQL错误 #881 2023-06-05 09:39:59 +08:00
648540858
9ff1613d3b 修复web端管理节点负载不显示国标收流 #871 2023-05-30 10:54:09 +08:00
648540858
babc0f79cb 去除多余注释 2023-05-23 14:35:40 +08:00
648540858
807d0524a6 修复推流鉴权 2023-05-23 10:34:00 +08:00
648540858
061749548c 修复字段名错误 2023-05-22 11:23:48 +08:00
648540858
9e790eb0ff 本地集成人大金仓连接jar 2023-05-16 17:17:24 +08:00
648540858
be9bf60e81 兼容人大金仓对online作为保留字段的要求 2023-05-16 15:13:38 +08:00
648540858
23b8667b7f 优化部分sql实现 2023-05-15 16:08:31 +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
c429a34e53 修复国标视频点播三种级联并发点播和录像下载的问题 2023-05-08 17:18:08 +08:00
648540858
e2f9ee8f7b 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:40:57 +08:00
648540858
3fe47021b9 优化国标规范，参考国标文档中-点播外域设备媒体流SSRC处理方式，上级点播时自定义ssrc，不适用上级携带的ssrc，也避免上级兼容性差，不携带ssrc的问题，可通过配置关闭此特性 2023-05-04 14:21:58 +08:00
648540858
8a68bae0bb 修复redis数据写入时超时时间设置错误的问题 2023-04-27 09:23:00 +08:00
648540858
b944f8867c 支持推流和拉流代理通道状态变化发送通知 2023-04-23 15:54:34 +08:00
648540858
269ad8cedb 修身目录刷新，优化公网下远程IP端口的获取 2023-04-23 14:36:13 +08:00
648540858
0f50904992 支持设备/通道状态变化时发送redis通知 2023-04-20 10:26:42 +08:00
648540858
db2ccfedfa 优化notify性能，增加notify超出处理能力时直接回复错误码，不做处理。 2023-04-19 11:09:26 +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
c953943083 处理警告 2023-03-31 09:00:04 +08:00
648540858
1421b4743c 修复SQL错误 #802 2023-03-31 08:59:03 +08:00
648540858
c85c994972 修复设备点播时指定流媒体 2023-03-22 15:21:22 +08:00
StreamLuna
eb173b1b24 fix: 根据国标设备编号查询设备没有返回通道数 2023-03-20 10:58:44 +08:00
648540858
782300452c 优化对海康平台的兼容性 2023-03-17 17:08:37 +08:00
648540858
d3027b0668 优化消息通道 2023-03-17 15:14:00 +08:00
648540858
c3ce2bc5d0 优化异常处理以及级联设备状态查询 2023-03-17 13:22:05 +08:00
648540858
be6666db03 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-03-15 22:57:20 +08:00
648540858
943f95ba8c 增加消息通道配置，可以通道redis在wvp上下级之间发送消息 2023-03-14 14:02:33 +08:00