648540858
|
a4c5184706
|
修复单个添加的推流级联国标的问题
|
2022-08-05 09:48:13 +08:00 |
|
648540858
|
cbab9c9be1
|
修复二级目录添加失败的问题
|
2022-08-02 11:34:56 +08:00 |
|
648540858
|
f731d83728
|
修复ssrc变化时端口变化的问题
|
2022-07-29 11:57:04 +08:00 |
|
648540858
|
9e949b2f80
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:24:51 +08:00 |
|
648540858
|
bb6240f5a4
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-28 16:21:09 +08:00 |
|
648540858
|
a4671aebd3
|
优化hook订阅机制
|
2022-07-28 16:18:41 +08:00 |
|
648540858
|
6e208d6d98
|
优化gps信息存入数据库
|
2022-07-28 11:22:51 +08:00 |
|
庄梦蝶殇
|
fd22fe2f13
|
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-27 18:31:33 +08:00 |
|
648540858
|
e6eac5c792
|
优化部分hook订阅
|
2022-07-27 16:16:12 +08:00 |
|
648540858
|
881fb113e1
|
修复流地址返回错误
|
2022-07-27 14:48:21 +08:00 |
|
648540858
|
4f2282f125
|
bug修复
|
2022-07-27 11:11:18 +08:00 |
|
648540858
|
14270c619e
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
|
648540858
|
3d058b506e
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
d7135965da
|
修复级联无通道时更新停止在等待更新的问题
|
2022-07-25 09:44:43 +08:00 |
|
648540858
|
72f80bb672
|
增加推流添加功能，修复级联目录推送
|
2022-07-22 16:02:14 +08:00 |
|
chenjialing
|
9d2872e275
|
优化----设备下线,通道状态也切换至离线状态
|
2022-07-20 17:02:55 +08:00 |
|
jiang
|
9851e11d91
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 18:13:42 +08:00 |
|
jiang
|
716f0b95cc
|
1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
|
2022-07-19 18:13:19 +08:00 |
|
648540858
|
64f6d596f4
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
f69f1bcb5f
|
修复更新推流状态sql错误
|
2022-07-19 14:27:30 +08:00 |
|
648540858
|
86deeedf85
|
修复用户查询sql错误
|
2022-07-19 11:13:46 +08:00 |
|
648540858
|
75e6b123ee
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 11:10:50 +08:00 |
|
648540858
|
7e1b19e75f
|
MediaItem增加callId
|
2022-07-18 20:33:47 +08:00 |
|
jiang
|
90cc11e871
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-18 17:15:33 +08:00 |
|
jiang
|
9dcc315dbd
|
增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey
|
2022-07-18 17:09:35 +08:00 |
|
648540858
|
11c47b139f
|
去除无用引用
|
2022-07-17 23:19:59 +08:00 |
|
648540858
|
0309140f48
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-17 23:17:55 +08:00 |
|
648540858
|
1a285ba00f
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
jiang
|
9fec9dc93a
|
测试提交权限
|
2022-07-13 11:29:46 +08:00 |
|
648540858
|
24fba85c38
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:32 +08:00 |
|
648540858
|
86340fa1a2
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:17 +08:00 |
|
648540858
|
6d8569f340
|
动态人物管理增加自检机制。防止内存溢出
|
2022-07-12 10:32:45 +08:00 |
|
648540858
|
0f945910f3
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
56265c2f40
|
去除失效的配置，增加人物结束时移除人物缓存
|
2022-07-11 16:41:32 +08:00 |
|
648540858
|
a1d6e96c11
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
99ab787468
|
用户表增加推流鉴权KEY
|
2022-07-08 11:20:29 +08:00 |
|
648540858
|
b1b4a45224
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
7be8f3668f
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
|
648540858
|
c4d6f74091
|
修复通道数据写入数据库
|
2022-07-03 08:47:47 +08:00 |
|
648540858
|
0fea8cf29a
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
|
mk1990
|
038ca32c56
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
8a924d10b1
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
c09c1013c4
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
b9aca76599
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
7643c7f18d
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
|
2022-06-22 14:42:46 +08:00 |
|
mk1990
|
04f6cf77bd
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
|
mk1990
|
4dae6820ee
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 13:38:25 +08:00 |
|
mk1990
|
51aad5dda4
|
添加国标级联录像控制功能
|
2022-06-22 13:33:55 +08:00 |
|
mk1990
|
e1a4790ed1
|
fix设备状态查询接口
|
2022-06-22 13:09:09 +08:00 |
|
bradyxu
|
e5aca57579
|
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId
|
2022-06-18 10:40:24 +08:00 |
|
chenjialing
|
c8b7a182e9
|
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:01:18 +08:00 |
|
648540858
|
642407505b
|
优化播放中zlm离线判断
|
2022-06-15 15:06:22 +08:00 |
|
648540858
|
3bf7ee18e0
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
|
648540858
|
9aad3b93af
|
Merge pull request #517 from TristingChen/optimize-play-controller
Optimize play controller
|
2022-06-15 14:19:33 +08:00 |
|
chenjialing
|
85c3786eb2
|
优化--端口获取失败之时（如zlm连接失败），不进行invite点播消息的发送
|
2022-06-15 14:14:29 +08:00 |
|
chenjialing
|
5f26e92e77
|
优化----okhttp连接访问超时设置，访问异常code设置为-2
|
2022-06-15 14:13:43 +08:00 |
|
648540858
|
ca5f430ca4
|
优化列表展示效果
|
2022-06-15 10:40:45 +08:00 |
|
648540858
|
8b0b208952
|
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
|
648540858
|
2a7090acd7
|
国标级联推送推流 支持多wvp间自动选择与推送
|
2022-06-14 14:37:34 +08:00 |
|
648540858
|
1159cef1ef
|
Merge pull request #473 from AlphaWu/Zafu-Dev
添加on_record_ts事件支持
|
2022-06-07 11:12:22 +08:00 |
|
648540858
|
89648af1c3
|
#508
|
2022-06-05 12:44:30 +08:00 |
|
648540858
|
8e1f032b28
|
修复订阅超时
|
2022-06-04 10:18:04 +08:00 |
|
648540858
|
075c6ad7f8
|
级联回放增加MediaStatus消息 #377
|
2022-06-04 00:02:39 +08:00 |
|
648540858
|
d6a44a03df
|
固定时区为Asia/Shanghai
|
2022-06-03 18:52:40 +08:00 |
|
648540858
|
1941e7bebc
|
解决设备上线停止线程导致的报错，优化录像的获取以及通道的更新
|
2022-06-03 16:24:11 +08:00 |
|
648540858
|
8f9b38e1e7
|
优化快照的存储与显示
|
2022-06-02 10:55:41 +08:00 |
|
648540858
|
1a0a05431a
|
Merge pull request #504 from TristingChen/fixed--reset-channel
修复--重设通道多个设备注册下发生的sql错误修复
|
2022-06-02 09:31:06 +08:00 |
|
chenjialing
|
dcef4809bd
|
修复--重设通道多个设备注册下发生的sql错误修复
|
2022-06-01 14:11:06 +08:00 |
|
648540858
|
a287261c5d
|
修复级联点播时海康使用自定义ssrc的情况
|
2022-06-01 11:35:53 +08:00 |
|
648540858
|
7620fb951c
|
修复点播超时的事件设置
|
2022-05-31 16:20:46 +08:00 |
|
648540858
|
94793cc19d
|
#488
|
2022-05-27 23:14:17 +08:00 |
|
648540858
|
30d959b1ee
|
换种写法
|
2022-05-27 18:23:43 +08:00 |
|
chenjialing
|
574e852a53
|
修复--获取全部ssrc的缓存问题修复
|
2022-05-27 18:15:06 +08:00 |
|
648540858
|
128158dbb5
|
兼容海康信令问题 #493
|
2022-05-26 13:45:57 +08:00 |
|
648540858
|
54a69c2f74
|
兼容不规范的时间格式iso8601格式；升级fastjson版本
|
2022-05-26 12:10:46 +08:00 |
|
mk1990
|
f1dd3800ea
|
解决海康设备在实时监控模块中无法获取到通道信息
|
2022-05-25 14:09:43 +08:00 |
|
mk1990
|
6319f8f3f4
|
解决设备第一次注册获取不到设备信息和通道信息的问题
|
2022-05-25 13:39:34 +08:00 |
|
mk1990
|
59986d11ff
|
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
|
210bfa0b17
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 13:02:50 +08:00 |
|
648540858
|
0dfd27f323
|
Merge pull request #487 from hotcoffie/wvp-28181-2.0
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:39:05 +08:00 |
|
xiaoxie
|
bba1e01e1e
|
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:37:38 +08:00 |
|
648540858
|
a74ef4f1e6
|
优化代码
|
2022-05-23 10:16:46 +08:00 |
|
xiaoxie
|
9caa43c6dc
|
处理冲突
|
2022-05-23 09:44:21 +08:00 |
|
xiaoxie
|
524eac68ea
|
处理冲突
|
2022-05-23 09:42:32 +08:00 |
|
hotcoffie
|
7edeb6fbe0
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 09:15:59 +08:00 |
|
648540858
|
e886a09596
|
修复国标级联录像查询 #485
|
2022-05-21 21:13:12 +08:00 |
|
648540858
|
998b8323f3
|
支持sdp ip 配置为域名
|
2022-05-19 17:00:47 +08:00 |
|
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 |
|
hotcoffie
|
3b48a96da4
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-17 11:53:42 +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 |
|
WuPeng
|
b12729866e
|
添加on_record_ts事件支持
|
2022-05-13 22:22:10 +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 |
|
hotcoffie
|
26bc0f1afe
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 17:42:31 +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 |
|
hotcoffie
|
8bcf3458f3
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 10:59:33 +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 |
|
xiaoxie
|
cffafbca54
|
替换一个过时的API，解决maven打包警告
|
2022-05-01 21:32:43 +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 |
|
648540858
|
19b4694d1d
|
行政区划作为级联数据的处理,修复设备树的显示
|
2022-04-26 17:24:41 +08:00 |
|
mk1990
|
39bddf773c
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-26 15:32:23 +08:00 |
|
648540858
|
8248c32b4b
|
多级虚拟组织处理修复
|
2022-04-25 17:13:22 +08:00 |
|
648540858
|
de58ebeec3
|
多级虚拟组织处理修复
|
2022-04-25 17:12:29 +08:00 |
|
648540858
|
6e65006354
|
对于虚拟目录中出现多级虚拟组织的情况进行处理
|
2022-04-25 16:55:38 +08:00 |
|
648540858
|
bec3091767
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-24 16:34:21 +08:00 |
|
648540858
|
de21837334
|
增加redis通知方式向设备/平台发送报警消息功能
|
2022-04-24 16:33:59 +08:00 |
|
xiaoxie
|
5fbece4cd8
|
修复一处日志打印错误
|
2022-04-24 09:51:54 +08:00 |
|
648540858
|
cd3c365976
|
支持关闭地图功能，添加授权声明
|
2022-04-22 16:55:46 +08:00 |
|
648540858
|
b93cc7a254
|
添加优化后的地图页面，完全一处百度地图相关的api
|
2022-04-22 16:21:05 +08:00 |
|
mk1990
|
c417adbc24
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-21 13:34:50 +08:00 |
|
648540858
|
9cc875a0f8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-21 10:30:46 +08:00 |
|
648540858
|
4a7a51cedf
|
添加公共组件设备树
|
2022-04-20 18:21:18 +08:00 |
|
xiaoxie
|
0ee1eb4274
|
修复录像列表：实测部分厂家（TP-Link IPC43AW）录像列表接口，返回的xml报文数据中有多余的空格，导致解析String为Integer失败，增加trim修复这个问题
|
2022-04-20 13:56:30 +08:00 |
|
648540858
|
57fc99f7de
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-20 09:38:09 +08:00 |
|
648540858
|
fbd693faa5
|
优化国标级联目录推送，支持zlm新特性ssrc校验
|
2022-04-19 11:52:03 +08:00 |
|
648540858
|
d43050bee9
|
Merge pull request #437 from hotcoffie/wvp-28181-2.0
优化摄像头注册流程
|
2022-04-19 10:36:21 +08:00 |
|
648540858
|
1f25cabc83
|
添加行政区划功能，修复目录发送数量统计的BUG
|
2022-04-18 17:38:49 +08:00 |
|
648540858
|
4f2c6c9fc1
|
添加国标级联目录分组分组加快通道传输速度
|
2022-04-18 16:16:49 +08:00 |
|
xiaoxie
|
f83123f868
|
优化摄像头注册流程
|
2022-04-18 15:04:22 +08:00 |
|
648540858
|
2d7a571832
|
修复更新通道状态回复不准的问题
|
2022-04-18 12:55:54 +08:00 |
|
648540858
|
15b36e7be6
|
修复更新通道日志显示
|
2022-04-18 12:45:19 +08:00 |
|
648540858
|
4e49266020
|
修复更新通道结束后释放慢的问题
|
2022-04-18 12:42:58 +08:00 |
|
648540858
|
b63310c3cf
|
添加自动拉起未推流设备的控制开关
|
2022-04-18 10:52:38 +08:00 |
|
mk1990
|
bdba2b8f5a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-18 09:32:20 +08:00 |
|
648540858
|
c0149f7bb4
|
优化通道同步添加对SN的判断，精简代码
|
2022-04-17 19:48:05 +08:00 |
|
648540858
|
35b0f46bb4
|
接收所有notify请求，即使没有订阅
|
2022-04-15 18:04:19 +08:00 |
|
mk1990
|
7ee33172a5
|
同步使用临时方案解决更新通道调用百度API问题之前的内容
|
2022-04-15 17:05:26 +08:00 |
|
648540858
|
7e35b85d91
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/SubscribeListenerForPlatform.java
|
2022-04-15 09:37:33 +08:00 |
|
648540858
|
8115b025c6
|
优化级联移动位置订阅位置更新
|
2022-04-14 16:52:48 +08:00 |
|
648540858
|
a0769da07c
|
优化级联移动位置订阅位置更新
|
2022-04-13 17:59:21 +08:00 |
|
648540858
|
7026d76310
|
异步通道刷新，优化ui效果
|
2022-04-12 21:06:21 +08:00 |
|
648540858
|
624975bc85
|
优化通道刷新
|
2022-04-12 11:04:08 +08:00 |
|
648540858
|
fd8c4146e1
|
使用临时方案解决更新通道调用百度API问题
|
2022-04-11 15:30:49 +08:00 |
|
648540858
|
dc1b11895e
|
默认推流通道始终在线
|
2022-04-11 14:59:31 +08:00 |
|
648540858
|
2bed57fe02
|
优化地图-添加地图页面以及设备树
|
2022-04-08 18:09:23 +08:00 |
|
648540858
|
504e99869a
|
修复停止推流的参数组织方式
|
2022-04-08 16:30:39 +08:00 |
|
648540858
|
4acd622933
|
优化订阅信息的发送与取消订阅
|
2022-04-08 14:44:49 +08:00 |
|
648540858
|
24b1c28efd
|
添加日志
|
2022-04-07 15:41:46 +08:00 |
|
648540858
|
8913b2022b
|
补充xml缺失的编码信息
|
2022-04-07 14:22:41 +08:00 |
|
648540858
|
7227e33099
|
补充xml缺失的编码信息
|
2022-04-07 14:21:21 +08:00 |
|
648540858
|
605aa9c7f9
|
修复重启服务后拉流代理回复失败的问题
|
2022-04-06 11:07:42 +08:00 |
|
648540858
|
18447bc941
|
Merge pull request #419 from nikmu/wvp-28181-2.0
目录订阅推送问题，在线事件发送问题
|
2022-04-02 18:23:50 +08:00 |
|
648540858
|
1f8015e8a2
|
修复启动报错
|
2022-04-02 17:09:33 +08:00 |
|
648540858
|
db0044ec4c
|
Merge pull request #426 from J1031/bugfix/map_modification_exception
修复ConcurrentModificationException
|
2022-04-02 14:34:41 +08:00 |
|
648540858
|
68dd698d99
|
支持级联云台控制
|
2022-04-02 14:13:32 +08:00 |
|
quangz
|
f23c5eee17
|
修复ConcurrentModificationException
|
2022-04-02 08:06:30 +08:00 |
|
648540858
|
f2759841f9
|
去除无用引用
|
2022-04-01 17:44:43 +08:00 |
|
648540858
|
53837bf97c
|
使用getHostAddress代替getHostName避免经过DNS时间过久
|
2022-04-01 17:13:11 +08:00 |
|
648540858
|
28638c7898
|
支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
|
2022-04-01 16:45:29 +08:00 |
|
朱俊杰
|
fff11e4355
|
订阅查询错误和空指针
|
2022-03-31 09:19:45 +08:00 |
|
朱俊杰
|
21e66ab399
|
2个小bug
1、add update事件调用错误函数
2、在线的还发在线事件，如果别人正在给你推送目录就会不停的update设备表，设备表又没加锁，页面就无法更改设备信息了。。。
|
2022-03-29 17:31:41 +08:00 |
|
648540858
|
35776e4678
|
补充缺失的文件
|
2022-03-29 12:17:54 +08:00 |
|
648540858
|
70acfc7ca7
|
修复级联的国标通道无经纬度问题
|
2022-03-29 10:04:28 +08:00 |
|
648540858
|
1855913d43
|
修复国标目录发送缺失的问题
|
2022-03-28 11:03:17 +08:00 |
|
648540858
|
d8b7e06c5c
|
兼容海康 媒体通知 消息from字段不是设备ID的问题
|
2022-03-25 18:05:05 +08:00 |
|
648540858
|
8b1283be1b
|
优化国标级联上级要求tcp推流时的回复
|
2022-03-25 17:22:17 +08:00 |
|
648540858
|
c909fcf379
|
优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。
|
2022-03-25 16:05:14 +08:00 |
|