aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-24 22:17:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
895 Commits 27 Branches 1 Tag 209 MiB
335916f1f1
Commit Graph

281 Commits

Author SHA1 Message Date
李防
335916f1f1 InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。 2022-03-07 14:20:27 +08:00
648540858
3dc1e0368e 修复合并分支造成的bug 2022-03-04 15:59:29 +08:00
648540858
d21322a932 优化国标级联录像预览 2022-03-03 18:23:52 +08:00
648540858
01a619f9e3 Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-03-03 16:55:20 +08:00
648540858
28d7fd3b58 参数名错误 2022-03-03 16:54:47 +08:00
648540858
14174ff400 Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# 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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-03-03 16:28:32 +08:00
648540858
2eb1ca2d94 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
panll
94af90fa14
!7 rPort 变更了HostAddres也要变 
Merge pull request !7 from ckb_test/N/A
 2022-03-02 06:23:31 +00:00
648540858
1dcdbc3742 Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
 2022-03-02 12:52:37 +08:00
648540858
f5640fddb7 优化国标级联的目录订阅 2022-03-02 11:48:20 +08:00
chenjialing
fe0b5c33f9 告警信息上报过程中，AlarmType存储失败的解决 2022-03-02 09:18:17 +08:00
648540858
29191373aa Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	web_src/src/components/control.vue
 2022-03-01 22:07:01 +08:00
648540858
4c53b10737 解决对接中遇到的问题 2022-03-01 17:42:22 +08:00
ckb_test
6d454423a2
rPort 变更了HostAddres也要变 2022-02-28 09:07:02 +00:00
648540858
e94b99d11c 实现国标录像级联播放，优化点播流程，加快点播速度 2022-02-27 20:01:31 +08:00
648540858
10f776678e Merge branch 'wvp-28181-2.0' into wvp-pro-record 2022-02-25 20:33:38 +08:00
648540858
7400ace65d 规范数据库，解决bug 2022-02-25 20:33:02 +08:00
648540858
c9bfdf2525 实现国标的级联录像查询 2022-02-24 21:10:34 +08:00
648540858
0191e93768 同步主线 2022-02-23 21:55:46 +08:00
648540858
f4c03c1808 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record 2022-02-22 11:55:23 +08:00
648540858
e861c9dfab Merge remote-tracking branch 'origin/master' into wvp-pro-record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
 2022-02-22 11:55:23 +08:00
648540858
2157bb0270 规范数据库，给各个标设置主键ID 2022-02-22 11:44:56 +08:00
648540858
5bcd8495e0 兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。 2022-02-20 16:22:43 +08:00
648540858
b7635ec05d 优化级联通道发送速度 2022-02-20 16:18:14 +08:00
648540858
59c79c08e1 修复级联通道回复错误 2022-02-16 15:13:16 +08:00
648540858
8cfff8db97 添加对可能空指针的判断 2022-01-28 16:30:10 +08:00
648540858
9b21fba871 解析xml异常时，回复400 2022-01-27 10:39:08 +08:00
648540858
3f5e885e82 目录默认节点被删除时，重置默认节点为根节点 2022-01-21 14:10:49 +08:00
648540858
7d88827415 处理服务重启或设备重新上线时的订阅，优化通道导入重复的处理 2022-01-20 16:48:30 +08:00
648540858
6ba8ab22b5 修复推流生成通道未通知上级平台的问题，添加注册时清楚脏数据。 2022-01-19 15:08:13 +08:00
648540858
e8090bc84c 修复bug与目录订阅添加最小值60 2022-01-19 10:23:52 +08:00
szy833
c6202b3b27 feat(): 增加拉框放大，缩小。接收下级设备控制信令增加200返回。 2022-01-15 22:29:59 +08:00
648540858
ac1a4a027a 支持国标级联的目录订阅功能 2022-01-14 17:04:26 +08:00
648540858
bfcb4d2335 合并主分支 2022-01-13 16:39:32 +08:00
648540858
f99c9cac6a 优化通道更新 2022-01-13 16:24:37 +08:00
lin
ddb36e54bd 级联平台添加GPS订阅支持 2022-01-08 16:47:20 +08:00
648540858
6e0f7fae6e 为级联平台增加虚拟目录功能 2022-01-05 15:23:14 +08:00
shizy@yisa.com
206f47f42a 修复获取设备信息信令Catalog不标准问题 PTZType，级联的Longitude、Latitude、PTZType等 2021-12-29 17:53:05 +08:00
648540858
726963ba77 优化通道更新逻辑 2021-12-28 18:54:50 +08:00
648540858
22efd0f56c 添加心跳到期时验证zlm是否真的离线。 2021-12-20 09:51:51 +08:00
648540858
4418c62e5c #239 2021-12-17 16:44:11 +08:00
648540858
cf8e40c152 优化sip回复逻辑 2021-12-17 15:47:14 +08:00
648540858
bc82662e90 升级invite+subscribe的cseq为递增 2021-12-15 09:27:12 +08:00
648540858
0c10e8d9d3 优化info消息的cseq计数 2021-12-14 18:41:50 +08:00
648540858
bc0319b3f3 将device信息写入redis以提高sip处理速度 2021-12-13 17:20:23 +08:00
648540858
a2f0854138 优化通道录入性能，优化启动后读取配置写入数据库的过程 2021-12-07 17:43:55 +08:00
648540858
5b0b17d741 添加第三方服务参与的推流直接转发到国标功能 2021-12-04 17:27:23 +08:00
648540858
241804f5f8 优化redis存储，alarm默认关闭处理 2021-12-03 16:13:46 +08:00
648540858
2a1f979651 简化zlm节点接入逻辑 2021-12-02 17:37:29 +08:00
648540858
019827fd35 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-11-29 18:09:49 +08:00