648540858
|
34f2832bef
|
优化gps信息存入数据库
|
2022-07-28 11:22:51 +08:00 |
庄梦蝶殇
|
fff3d64f85
|
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-27 18:31:33 +08:00 |
|
648540858
|
f84eebdb75
|
优化部分hook订阅
|
2022-07-27 16:16:12 +08:00 |
|
648540858
|
bc38f5ef29
|
修复流地址返回错误
|
2022-07-27 14:48:21 +08:00 |
|
648540858
|
76dedb11f8
|
bug修复
|
2022-07-27 11:11:18 +08:00 |
|
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
|
648540858
|
c77c1a956c
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
|
648540858
|
91dc4566a2
|
修复级联无通道时更新停止在等待更新的问题
|
2022-07-25 09:44:43 +08:00 |
|
648540858
|
e29d94c83f
|
增加推流添加功能，修复级联目录推送
|
2022-07-22 16:02:14 +08:00 |
chenjialing
|
f66bf823fa
|
优化----设备下线,通道状态也切换至离线状态
|
2022-07-20 17:02:55 +08:00 |
jiang
|
a51b411101
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 18:13:42 +08:00 |
|
jiang
|
fc0ad32f81
|
1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
|
2022-07-19 18:13:19 +08:00 |
|
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
|
648540858
|
28b5cc39d0
|
修复更新推流状态sql错误
|
2022-07-19 14:27:30 +08:00 |
|
648540858
|
03864ae46f
|
修复用户查询sql错误
|
2022-07-19 11:13:46 +08:00 |
|
648540858
|
4765f9b9f2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 11:10:50 +08:00 |
|
648540858
|
c48def08cf
|
MediaItem增加callId
|
2022-07-18 20:33:47 +08:00 |
|
jiang
|
1002150b2a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-18 17:15:33 +08:00 |
|
jiang
|
c6fbd03276
|
增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey
|
2022-07-18 17:09:35 +08:00 |
|
648540858
|
4d1c6401c2
|
去除无用引用
|
2022-07-17 23:19:59 +08:00 |
|
648540858
|
a509587980
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-17 23:17:55 +08:00 |
|
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
|
jiang
|
fc89b7b517
|
测试提交权限
|
2022-07-13 11:29:46 +08:00 |
|
648540858
|
be5dbc9a21
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:32 +08:00 |
|
648540858
|
81f69eb6f4
|
支持从redis消息更新推流设备状态
|
2022-07-12 17:33:17 +08:00 |
|
648540858
|
0b1cae75fe
|
动态人物管理增加自检机制。防止内存溢出
|
2022-07-12 10:32:45 +08:00 |
|
648540858
|
74d97734ba
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
1a1a68784b
|
去除失效的配置，增加人物结束时移除人物缓存
|
2022-07-11 16:41:32 +08:00 |
|
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
fcd79b9864
|
用户表增加推流鉴权KEY
|
2022-07-08 11:20:29 +08:00 |
|
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
10cb58391a
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
|
648540858
|
5d673fb033
|
修复通道数据写入数据库
|
2022-07-03 08:47:47 +08:00 |
|
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
mk1990
|
23bd11869b
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
c239ee277c
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
5e5437b630
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
4b4afa4ef7
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
6c919937bd
|
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
|
519a08e530
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
mk1990
|
1e105fb6e1
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 13:38:25 +08:00 |
|
mk1990
|
0e18a163ac
|
添加国标级联录像控制功能
|
2022-06-22 13:33:55 +08:00 |
|
mk1990
|
4d2c36edcd
|
fix设备状态查询接口
|
2022-06-22 13:09:09 +08:00 |
bradyxu
|
072e84db19
|
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId
|
2022-06-18 10:40:24 +08:00 |
|
chenjialing
|
39a5c8e2cf
|
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:01:18 +08:00 |
|
648540858
|
dbe6ece653
|
优化播放中zlm离线判断
|
2022-06-15 15:06:22 +08:00 |
|
648540858
|
f7006e4881
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
|
648540858
|
f760134b39
|
Merge pull request #517 from TristingChen/optimize-play-controller
Optimize play controller
|
2022-06-15 14:19:33 +08:00 |
|
chenjialing
|
0e826e3448
|
优化--端口获取失败之时（如zlm连接失败），不进行invite点播消息的发送
|
2022-06-15 14:14:29 +08:00 |
|
chenjialing
|
8f7db635a3
|
优化----okhttp连接访问超时设置，访问异常code设置为-2
|
2022-06-15 14:13:43 +08:00 |
|
648540858
|
5fae9a7b34
|
优化列表展示效果
|
2022-06-15 10:40:45 +08:00 |
|
648540858
|
c022213972
|
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
|
648540858
|
e0344ccf97
|
国标级联推送推流 支持多wvp间自动选择与推送
|
2022-06-14 14:37:34 +08:00 |
|
648540858
|
6d4312e383
|
Merge pull request #473 from AlphaWu/Zafu-Dev
添加on_record_ts事件支持
|
2022-06-07 11:12:22 +08:00 |
|
648540858
|
8a362506c6
|
#508
|
2022-06-05 12:44:30 +08:00 |
|
648540858
|
d3e815bf16
|
修复订阅超时
|
2022-06-04 10:18:04 +08:00 |
|
648540858
|
5df95ba850
|
级联回放增加MediaStatus消息 #377
|
2022-06-04 00:02:39 +08:00 |
|
648540858
|
19a52a20f3
|
固定时区为Asia/Shanghai
|
2022-06-03 18:52:40 +08:00 |
|
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 |
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
|
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
|
c395cf42d1
|
修复发流接口的调用
|
2022-05-10 11:01:33 +08:00 |
|
648540858
|
a1321c29c5
|
优化级联点播流程
|
2022-05-10 10:58:26 +08:00 |
|
648540858
|
93e6347f18
|
优化推流调用
|
2022-05-10 09:45:09 +08:00 |
|
648540858
|
bd21d0e391
|
优化目录获取并法能力
|
2022-05-10 09:38:05 +08:00 |
|
hotcoffie
|
ec8ab540f8
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 17:42:31 +08:00 |
|
648540858
|
36170df3f4
|
修复打包优化pom
|
2022-05-07 15:13:56 +08:00 |
|
mk1990
|
88db57697a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 11:25:13 +08:00 |
|
648540858
|
523139143f
|
Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
|
2022-05-07 09:00:22 +08:00 |
|
mk1990
|
a2182b5a7b
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 17:46:01 +08:00 |
|
chenjialing
|
cc63a52884
|
开发----增加预置位查询接口开发
|
2022-05-06 17:44:56 +08:00 |
|
648540858
|
e218553685
|
去除多与引用
|
2022-05-06 17:29:24 +08:00 |
|
648540858
|
ee62f17170
|
统一userAgent
|
2022-05-06 15:55:32 +08:00 |
|
hotcoffie
|
bfaa519e49
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 10:59:33 +08:00 |
|
648540858
|
5d901b5e3f
|
使用阿里代码规范。规范代码写法
|
2022-05-06 10:12:34 +08:00 |
|
648540858
|
c286ecb455
|
使用阿里代码规范。规范代码写法
|
2022-05-05 17:07:16 +08:00 |
|
648540858
|
7f0ca85850
|
规范代码写法
|
2022-05-05 14:36:27 +08:00 |
|
648540858
|
ff3c30f32e
|
优化收到心跳设置设备上线的逻辑
|
2022-05-05 14:26:42 +08:00 |
|
mk1990
|
05a324a07a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-05 08:43:10 +08:00 |
|
xiaoxie
|
260bfd5935
|
替换一个过时的API，解决maven打包警告
|
2022-05-01 21:32:43 +08:00 |
648540858
|
d679a9fcf8
|
添加对点播时设备自定义ssrc的支持
|
2022-04-28 17:28:51 +08:00 |
|
mk1990
|
a0537d74df
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-28 16:32:09 +08:00 |
|
648540858
|
a53fe7761f
|
Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
|
2022-04-28 14:02:18 +08:00 |
|
648540858
|
420a87cfd7
|
优化对Parental字段的判断
|
2022-04-28 10:05:56 +08:00 |
|
648540858
|
4e0a463f88
|
优化对Parental字段的判断
|
2022-04-28 09:47:46 +08:00 |
quangz
|
effe71640d
|
修复ServerTransaction空指针异常
|
2022-04-27 18:51:47 +08:00 |
|
648540858
|
102aad1f5d
|
判空
|
2022-04-26 18:46:18 +08:00 |
|
648540858
|
363606d845
|
优化级联目录发送
|
2022-04-26 18:29:47 +08:00 |
|
648540858
|
9ce22eba3c
|
行政区划作为级联数据的处理,修复设备树的显示
|
2022-04-26 17:24:41 +08:00 |
|
mk1990
|
c88b0a8bd6
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-26 15:32:23 +08:00 |
|
648540858
|
0b6b72ae44
|
多级虚拟组织处理修复
|
2022-04-25 17:13:22 +08:00 |
|
648540858
|
a012007f36
|
多级虚拟组织处理修复
|
2022-04-25 17:12:29 +08:00 |
|
648540858
|
26c3ca6a21
|
对于虚拟目录中出现多级虚拟组织的情况进行处理
|
2022-04-25 16:55:38 +08:00 |
|
648540858
|
d4b05c11c0
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-24 16:34:21 +08:00 |
|
648540858
|
5dc08a45f8
|
增加redis通知方式向设备/平台发送报警消息功能
|
2022-04-24 16:33:59 +08:00 |
|
xiaoxie
|
bea61f909d
|
修复一处日志打印错误
|
2022-04-24 09:51:54 +08:00 |
|
648540858
|
92421b46cc
|
支持关闭地图功能，添加授权声明
|
2022-04-22 16:55:46 +08:00 |
|
648540858
|
1e2d207aea
|
添加优化后的地图页面，完全一处百度地图相关的api
|
2022-04-22 16:21:05 +08:00 |
|
mk1990
|
7d1116c892
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-21 13:34:50 +08:00 |
|
648540858
|
d7bfd9bfa7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-21 10:30:46 +08:00 |
|
648540858
|
f7236c4a90
|
添加公共组件设备树
|
2022-04-20 18:21:18 +08:00 |
|
xiaoxie
|
f635f9c300
|
修复录像列表：实测部分厂家（TP-Link IPC43AW）录像列表接口，返回的xml报文数据中有多余的空格，导致解析String为Integer失败，增加trim修复这个问题
|
2022-04-20 13:56:30 +08:00 |