mk1990
|
4e13489366
|
解决设备第一次注册获取不到设备信息和通道信息的问题
|
2022-05-25 13:39:34 +08:00 |
|
mk1990
|
3c48ef8f43
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-23 13:03:51 +08:00 |
|
mk1990
|
46c77302a1
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 13:02:50 +08:00 |
|
648540858
|
a4a0394f6b
|
Merge pull request #487 from hotcoffie/wvp-28181-2.0
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:39:05 +08:00 |
|
xiaoxie
|
6cee5a0751
|
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:37:38 +08:00 |
|
648540858
|
cb845726f6
|
优化代码
|
2022-05-23 10:16:46 +08:00 |
|
xiaoxie
|
d739bfa597
|
处理冲突
|
2022-05-23 09:44:21 +08:00 |
|
xiaoxie
|
07fa589e06
|
处理冲突
|
2022-05-23 09:42:32 +08:00 |
|
hotcoffie
|
3aa2665fb2
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 09:15:59 +08:00 |
|
648540858
|
590358c313
|
修复国标级联录像查询 #485
|
2022-05-21 21:13:12 +08:00 |
|
648540858
|
78fac69cd5
|
支持sdp ip 配置为域名
|
2022-05-19 17:00:47 +08:00 |
|
648540858
|
9c555b56b7
|
优化语音广播的TCP主动模式
|
2022-05-18 18:14:46 +08:00 |
|
648540858
|
6fa9dae824
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-18 18:13:59 +08:00 |
|
mk1990
|
fe576c5838
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-18 16:58:26 +08:00 |
|
mk1990
|
7bb38c5c7b
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-18 16:57:06 +08:00 |
|
648540858
|
d202291aa8
|
优化单端口下的ssrc修复
|
2022-05-18 16:46:09 +08:00 |
|
648540858
|
973e75f808
|
优化收到心跳的信息更新判断
|
2022-05-18 16:08:52 +08:00 |
|
648540858
|
1e75b2567f
|
兼容海康ssrc问题
|
2022-05-18 15:47:20 +08:00 |
|
mk1990
|
491286095c
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-18 14:40:32 +08:00 |
|
mk1990
|
6fbac144d6
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-18 14:36:47 +08:00 |
|
648540858
|
549bdfdd6a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-18 11:20:13 +08:00 |
|
hotcoffie
|
1d753b48c0
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-17 11:53:42 +08:00 |
|
钢翼
|
debfb2222f
|
无认证密码时，不校验是否存在授权头
|
2022-05-17 08:18:38 +08:00 |
|
648540858
|
39efda779f
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-05-16 11:47:17 +08:00 |
|
mk1990
|
e6790d88fc
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-16 10:14:24 +08:00 |
|
mk1990
|
e541341504
|
修改application-dev.yml
|
2022-05-16 10:10:50 +08:00 |
|
mk1990
|
850f20143f
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-16 09:38:06 +08:00 |
|
WuPeng
|
bbf8ab9310
|
添加on_record_ts事件支持
|
2022-05-13 22:22:10 +08:00 |
|
648540858
|
9a80e10f6e
|
使用 java.time.Instant代替 java.util.Date
|
2022-05-13 22:15:31 +08:00 |
|
648540858
|
95642d0bb8
|
优化录像结束发送BYE判断
|
2022-05-13 21:10:02 +08:00 |
|
648540858
|
98e6cf5bae
|
优化海康录像下载
|
2022-05-13 21:05:33 +08:00 |
|
648540858
|
d571e44040
|
去除过时注释
|
2022-05-13 15:45:02 +08:00 |
|
648540858
|
4d3f0a8d79
|
优化海康国标录像播放的控制
|
2022-05-13 15:41:50 +08:00 |
|
648540858
|
1757203202
|
支持海康摄像头国标录像查看播放
|
2022-05-13 15:32:30 +08:00 |
|
mk1990
|
95b1cbba65
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-13 10:58:33 +08:00 |
|
648540858
|
4199650c20
|
#471
|
2022-05-12 18:15:35 +08:00 |
|
648540858
|
0781d9bc28
|
修复缺失的设备时间
|
2022-05-12 17:48:52 +08:00 |
|
mk1990
|
2d7a202096
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-12 16:16:55 +08:00 |
|
648540858
|
9fa739ac02
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-12 10:54:46 +08:00 |
|
648540858
|
a030d00c88
|
修复代码
|
2022-05-12 10:48:50 +08:00 |
|
648540858
|
3cd1378d39
|
修复新设备注册
|
2022-05-12 10:24:08 +08:00 |
|
648540858
|
715ecb1d64
|
修复设备缺失的数据
|
2022-05-11 20:22:15 +08:00 |
|
648540858
|
f6893cf95b
|
优化设备在线状态
|
2022-05-11 18:37:24 +08:00 |
|
mk1990
|
6bab3b6740
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-10 18:02:09 +08:00 |
|
648540858
|
a9bdb0a706
|
优化语音广播流程
|
2022-05-10 17:45:07 +08:00 |
|
648540858
|
f8f65d473b
|
优化语音广播流程
|
2022-05-10 13:08:32 +08:00 |
|
648540858
|
c395cf42d1
|
修复发流接口的调用
|
2022-05-10 11:01:33 +08:00 |
|
648540858
|
16cb8cd195
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
|
2022-05-10 11:00:51 +08:00 |
|
648540858
|
a1321c29c5
|
优化级联点播流程
|
2022-05-10 10:58:26 +08:00 |
|
648540858
|
4a0f5cf76d
|
去除调试内容
|
2022-05-10 10:11:46 +08:00 |
|