Commit Graph

761 Commits

Author SHA1 Message Date
mk1990
3aacaaed58 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
2a461af8d6 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 16:57:06 +08:00
648540858
d1c15ad520 优化单端口下的ssrc修复 2022-05-18 16:46:09 +08:00
648540858
05485f57cd 优化收到心跳的信息更新判断 2022-05-18 16:08:52 +08:00
648540858
1986a059f8 兼容海康ssrc问题 2022-05-18 15:47:20 +08:00
mk1990
bc8f03ac1d 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
ffb9174623 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 14:36:47 +08:00
钢翼
587de1b9e7 无认证密码时,不校验是否存在授权头 2022-05-17 08:18:38 +08:00
mk1990
57febb3b76 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
3cb59aa4d1 修改application-dev.yml 2022-05-16 10:10:50 +08:00
mk1990
1b72bdb1af Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-16 09:38:06 +08:00
648540858
7e9e27f562 使用 java.time.Instant代替 java.util.Date 2022-05-13 22:15:31 +08:00
648540858
a14ce86632 优化录像结束发送BYE判断 2022-05-13 21:10:02 +08:00
648540858
fe029b566d 优化海康录像下载 2022-05-13 21:05:33 +08:00
648540858
84a4bc354f 去除过时注释 2022-05-13 15:45:02 +08:00
648540858
91170a292e 优化海康国标录像播放的控制 2022-05-13 15:41:50 +08:00
648540858
37c61c4fb0 支持海康摄像头国标录像查看播放 2022-05-13 15:32:30 +08:00
mk1990
8707f4110d Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-13 10:58:33 +08:00
648540858
9600c25b9a #471 2022-05-12 18:15:35 +08:00
648540858
9c1bb14286 修复缺失的设备时间 2022-05-12 17:48:52 +08:00
mk1990
df3b3965f7 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-12 16:16:55 +08:00
648540858
277c6ea039 修复代码 2022-05-12 10:48:50 +08:00
648540858
cf933d7d5e 修复新设备注册 2022-05-12 10:24:08 +08:00
648540858
d91b58de0a 修复设备缺失的数据 2022-05-11 20:22:15 +08:00
648540858
738a0ce036 优化设备在线状态 2022-05-11 18:37:24 +08:00
mk1990
0eb8962db8 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-10 18:02:09 +08:00
648540858
b3fe55709b 修复发流接口的调用 2022-05-10 11:01:33 +08:00
648540858
a5f6a0953e 优化级联点播流程 2022-05-10 10:58:26 +08:00
648540858
5548e4287f 优化推流调用 2022-05-10 09:45:09 +08:00
648540858
f4f2126452 优化目录获取并法能力 2022-05-10 09:38:05 +08:00
648540858
d10aabaa5f 修复打包优化pom 2022-05-07 15:13:56 +08:00
mk1990
b18abb3ee1 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-07 11:25:13 +08:00
648540858
cba8c4ae1d Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
2022-05-07 09:00:22 +08:00
mk1990
80d7a0cae5 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-06 17:46:01 +08:00
chenjialing
2a948e0bee 开发----增加预置位查询接口开发 2022-05-06 17:44:56 +08:00
648540858
87d8c8ad97 去除多与引用 2022-05-06 17:29:24 +08:00
648540858
d117122e27 统一userAgent 2022-05-06 15:55:32 +08:00
648540858
0dd2267bb1 使用阿里代码规范。规范代码写法 2022-05-06 10:12:34 +08:00
648540858
5b4e6acfd1 使用阿里代码规范。规范代码写法 2022-05-05 17:07:16 +08:00
648540858
b13bb09a81 规范代码写法 2022-05-05 14:36:27 +08:00
648540858
69508b1744 优化收到心跳设置设备上线的逻辑 2022-05-05 14:26:42 +08:00
mk1990
7b6e801890 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-05 08:43:10 +08:00
648540858
bf2f5e93e7 添加对点播时设备自定义ssrc的支持 2022-04-28 17:28:51 +08:00
mk1990
1f12dd9f8e Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-04-28 16:32:09 +08:00
648540858
78f7f7645c Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
2022-04-28 14:02:18 +08:00
648540858
b8e63574a5 优化对Parental字段的判断 2022-04-28 10:05:56 +08:00
648540858
dcaa8e3713 优化对Parental字段的判断 2022-04-28 09:47:46 +08:00
quangz
908e97f62b 修复ServerTransaction空指针异常 2022-04-27 18:51:47 +08:00
648540858
65d081f8c4 判空 2022-04-26 18:46:18 +08:00
648540858
5cabd8ff30 优化级联目录发送 2022-04-26 18:29:47 +08:00