Commit Graph

789 Commits (47abdde3392f2c5fd88d382ae63c4756b97ed4b0)

Author SHA1 Message Date
648540858 47abdde339 解决设备上线停止线程导致的报错,优化录像的获取以及通道的更新 2022-06-03 16:24:11 +08:00
648540858 9ae0691c80 优化快照的存储与显示 2022-06-02 10:55:41 +08:00
648540858 936adf31fe
Merge pull request #504 from TristingChen/fixed--reset-channel
修复--重设通道多个设备注册下发生的sql错误修复
2022-06-02 09:31:06 +08:00
chenjialing ed2680bf03 修复--重设通道多个设备注册下发生的sql错误修复 2022-06-01 14:11:06 +08:00
648540858 9a0ea9e322 修复级联点播时海康使用自定义ssrc的情况 2022-06-01 11:35:53 +08:00
648540858 8555d64f95 修复点播超时的事件设置 2022-05-31 16:20:46 +08:00
648540858 0e2908c1be #488 2022-05-27 23:14:17 +08:00
648540858 f09f1c9a2a 换种写法 2022-05-27 18:23:43 +08:00
chenjialing 0cd9a20242 修复--获取全部ssrc的缓存问题修复 2022-05-27 18:15:06 +08:00
648540858 2a5404c68f 兼容海康信令问题 #493 2022-05-26 13:45:57 +08:00
648540858 dc6769664e 兼容不规范的时间格式iso8601格式;升级fastjson版本 2022-05-26 12:10:46 +08:00
mk1990 f513f5ef67 解决海康设备在实时监控模块中无法获取到通道信息 2022-05-25 14:09:43 +08:00
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
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
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
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
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 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