648540858
|
a0876c4172
|
Merge pull request #356 from SaltFish001/wvp-28181-2.0
注释无用的引入, 修复打jar包失败问题
|
2022-03-01 17:36:23 +08:00 |
|
SaltFish
|
aabd3ea659
|
Update StreamPushMapper.java
|
2022-03-01 14:33:04 +08:00 |
|
随波
|
0a6649afe1
|
update sql/mysql.sql.
修改拉流代理缺少“名称”字段问题
|
2022-02-28 15:34:20 +00:00 |
|
随波
|
bffca58385
|
update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
修改新建拉流代理时不保存“名称”字段问题
|
2022-02-28 15:31:50 +00:00 |
|
648540858
|
ac56757291
|
支持删除在线设备
|
2022-02-28 17:56:27 +08:00 |
|
ckb_test
|
3787640dd1
|
rPort 变更了HostAddres也要变
|
2022-02-28 09:07:02 +00:00 |
|
648540858
|
05ca880eb1
|
修复设备删除
|
2022-02-28 10:39:51 +08:00 |
|
648540858
|
1bbf270fec
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
2022-02-27 20:01:31 +08:00 |
|
mrjackwang
|
fa9073d0f3
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-27 18:09:24 +08:00 |
|
648540858
|
354bca84b0
|
Merge pull request #352 from walkTtalk/wvp-28181-2.0
Fix issue #347: 修改前端启动报错
|
2022-02-26 15:38:59 +08:00 |
|
wangyimeng
|
aa6ec4b431
|
增加拉流代理表name字段
|
2022-02-26 11:16:01 +08:00 |
|
wangyimeng
|
45ca3a6808
|
增加拉流代理修改功能
|
2022-02-26 11:14:56 +08:00 |
|
wangyimeng
|
36593f8c3b
|
增加拉流代理修改功能
|
2022-02-26 11:07:55 +08:00 |
|
walkTtalk
|
9dcb270efd
|
Fix issue #347: 修改前端启动报错
|
2022-02-26 00:01:35 +08:00 |
|
648540858
|
1fa0046395
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-25 20:33:38 +08:00 |
|
648540858
|
bd4f730d79
|
规范数据库，解决bug
|
2022-02-25 20:33:02 +08:00 |
|
luoshuyue
|
660d16c695
|
增加无人观看时关闭zlm拉流
|
2022-02-25 15:06:51 +08:00 |
|
luoshuyue
|
22d15ee549
|
增加获取code为null时的条件
|
2022-02-25 15:05:36 +08:00 |
|
luoshuyue
|
e5a0a9a870
|
修复了拉流添加国标编码上级级联调取不到视频的bug
|
2022-02-25 15:04:47 +08:00 |
|
chenjialing
|
9a65c66dfd
|
日志优化--修改本地配置文件local的mysql连接方式
|
2022-02-25 09:54:18 +08:00 |
|
chenjialing
|
e2d7a6ce95
|
添加git的忽略logs
|
2022-02-25 09:36:05 +08:00 |
|
chenjialing
|
571f50b63c
|
research--local文件
|
2022-02-25 09:36:05 +08:00 |
|
chenjialing
|
813b2ae203
|
日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式
|
2022-02-25 09:23:46 +08:00 |
|
648540858
|
8dfb2fc4a2
|
实现国标的级联录像查询
|
2022-02-24 21:10:34 +08:00 |
|
648540858
|
fa51af1e84
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-24 17:18:36 +08:00 |
|
648540858
|
e9d8aa2f13
|
规范数据库，添加必要约束，优化通道批量导入功能
|
2022-02-24 16:55:06 +08:00 |
|
648540858
|
48fac476dc
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|
648540858
|
19ef156bda
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
18b92a0d4f
|
Merge remote-tracking branch 'origin/master' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
b1ff3773a4
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
6fb544f9f9
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:33:17 +08:00 |
|
648540858
|
a7157add49
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:29:03 +08:00 |
|
648540858
|
479a07f879
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
a86d4180c2
|
优化级联通道发送速度
|
2022-02-20 16:18:14 +08:00 |
|
648540858
|
016989d46a
|
优化级联平台删除
|
2022-02-17 15:33:25 +08:00 |
|
648540858
|
ceca493999
|
修复级联通道回复错误
|
2022-02-16 15:13:16 +08:00 |
|
648540858
|
58f40d5963
|
添加通道导入实例文件
|
2022-02-15 17:52:37 +08:00 |
|
648540858
|
84bebc2bd1
|
优化级联添加通道流程
|
2022-02-15 17:41:09 +08:00 |
|
648540858
|
ba7a73a13f
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-15 09:13:16 +08:00 |
|
648540858
|
6bd31ad373
|
Merge pull request #325 from nikmu/wvp-28181-2.0
新增实时监控功能
|
2022-02-15 09:13:03 +08:00 |
|
朱俊杰
|
2f599af6d7
|
mapper改用注释方式
|
2022-02-14 10:18:00 +08:00 |
|
648540858
|
9aa6932715
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-11 18:01:58 +08:00 |
|
648540858
|
d8e8ff0da2
|
优化列表展示
|
2022-02-11 16:46:58 +08:00 |
|
648540858
|
4a6eed9459
|
推流导入支持添加平台信息与目录信息
|
2022-02-11 16:45:06 +08:00 |
|
648540858
|
4416297298
|
Merge pull request #324 from SaltFish001/wvp-28181-2.0
更新生成的HTTP(s)/WS(s)-flv的链接地址
|
2022-02-11 09:47:26 +08:00 |
|
朱俊杰
|
3789e8616f
|
新增实时监控功能
左边是设备通道树，右边是分屏预览
|
2022-02-10 14:45:33 +08:00 |
|
SaltFish
|
cf5b23213e
|
Update MediaServiceImpl.java
最新版本zlm更新了flv的链接地址， 同步更新
|
2022-02-10 10:29:36 +08:00 |
|
648540858
|
8cbbf1470b
|
为推流列表增加批量移除功能
|
2022-02-07 18:30:43 +08:00 |
|
648540858
|
d3d42ef9bd
|
为推流列表增加搜索功能
|
2022-02-07 14:12:34 +08:00 |
|
648540858
|
15bd9182e6
|
添加服务器信息获取能力。
|
2022-02-04 21:46:48 +08:00 |
|