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

167 Commits

Author SHA1 Message Date
648540858
b38c7eef70 补充字段 2023-12-25 23:45:00 +08:00
648540858
67507e64b2 优化预置位设置 2023-12-22 18:09:17 +08:00
648540858
35fd5eee63 优化预置位查询 2023-12-21 13:16:03 +08:00
648540858
8a605ad722 临时提交 2023-12-20 18:02:47 +08:00
648540858
9ae08fd6c3 修复推流的添加 2023-12-19 18:49:49 +08:00
648540858
31ab6eb174 临时提交 2023-12-19 14:39:16 +08:00
648540858
dc841a9dcf 临时提交 2023-12-12 17:57:19 +08:00
648540858
31dcde7cc1 临时提交 2023-12-11 22:49:48 +08:00
648540858
92669f192f 临时提交 2023-12-11 21:18:53 +08:00
648540858
dc4385da74 临时提交 2023-12-07 18:04:53 +08:00
648540858
0d3845af59 添加移除共享到上级平台的通道 2023-12-05 23:23:48 +08:00
648540858
a9e5883492 优化通用通道同步，待完成 2023-11-24 18:04:57 +08:00
648540858
6255e6f89f 支持自动同步国标通道到通用通道，分组信息以及行政区划自动同步 2023-10-04 00:59:16 +08:00
648540858
ea271bf4b9 添加字段控制是否自动同步国标通道 2023-09-25 16:13:38 +08:00
648540858
94ec880fe8 Merge branch 'wvp-28181-2.0' into database-structure-optimization 
# Conflicts:
#	sql/2.6.9更新.sql
 2023-09-22 17:46:58 +08:00
648540858
b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
648540858
be527a4bd1 增加国标通道同步到资源管理 2023-09-19 17:55:13 +08:00
648540858
1d8dd248a5 接口优化 2023-09-15 09:34:29 +08:00
648540858
c56a842194 Merge branch 'wvp-28181-2.0' into database-structure-optimization 2023-09-06 16:18:33 +08:00
chenzhangyue
7155680793 fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set 2023-09-05 17:35:46 +08:00
648540858
dbe5b8f5a8 添加公用国标通道与sql 2023-08-21 17:54:15 +08:00
648540858
91e49745e4 修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
648540858
ba884fa9ef 默认关闭ssrc check 2023-08-03 16:08:22 +08:00
648540858
ff1e9f79c2 优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920 2023-07-07 14:51:41 +08:00
648540858
e4754af417 修复数据错误导致无法转成JSON返回 #919 2023-07-06 15:35:59 +08:00
648540858
9e28923b8c
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +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
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
446f729e55 优化sdp解析，兼容带有f=的设备 2023-06-10 00:32:42 +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
e2f9ee8f7b 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:40:57 +08:00
648540858
22deb206ba 补充上一个修复的内容 2023-04-21 14:42:23 +08:00
648540858
0f3898910c 收流时设置re_use_port参数解决端口关闭快速打开造成的端口未释放问题， 支持点播的tcp主动 2023-04-19 16:21:28 +08:00
648540858
91bfbc36f1 优化设备注册，支持到期续订，优化国标级联到期续订。 2023-03-28 14:09:41 +08:00
648540858
943f95ba8c 增加消息通道配置，可以通道redis在wvp上下级之间发送消息 2023-03-14 14:02:33 +08:00
gaofw189
5462b1f6c6 去除lombok依赖-后续考虑引入 2023-02-09 09:20:46 +08:00
gaofw189
c2e26291ce 修复WVP作为下级平台接受recordinfo指令上报上级平台的问题 2023-02-07 09:28:55 +08:00
gaofw189
55ee6f5f0d 修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑 2023-02-07 09:26:08 +08:00
gaofw189
40ece192fe 修复WVP作为下级平台接收设备告警消息后上报上级平台的问题 2023-02-03 14:35:44 +08:00
648540858
a82b831b8b 优化设备状态保持，自动记录心跳间隔，三次心跳失败则设备离线，不在使用设备有效期字段作为唯一判断标准，提高容错能力和稳定性。 2023-01-04 10:39:40 +08:00
648540858
131ea77669 接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址 2022-12-06 10:33:43 +08:00
648540858
fa2ccb4ec8 修复协议端口配置不全导致前端播放页面无法弹出的问题 2022-11-25 10:50:16 +08:00
648540858
96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# 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/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
 2022-11-08 20:43:25 +08:00
WuPeng
ab909feedf 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +08:00