648540858
|
8f9a530296
|
Merge pull request #360 from TristingChen/alarm-test
告警信息上报过程中，AlarmType存储失败的解决
|
3 years ago |
|
chenjialing
|
fe0b5c33f9
|
告警信息上报过程中，AlarmType存储失败的解决
|
3 years ago |
|
ydpd
|
86f87c4665
|
修改内存泄露
|
3 years ago |
|
ydpd
|
e66b839659
|
修改内存泄露
|
3 years ago |
|
648540858
|
29191373aa
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# web_src/src/components/control.vue
|
3 years ago |
|
648540858
|
298d104fec
|
优化配置文件与日志
|
3 years ago |
|
648540858
|
1ea95d2b87
|
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
|
3 years ago |
|
648540858
|
4c53b10737
|
解决对接中遇到的问题
|
3 years ago |
|
648540858
|
97698ee716
|
Merge pull request #346 from TristingChen/log-optimization
Log optimization
|
3 years ago |
|
648540858
|
347eec086d
|
Merge pull request #356 from SaltFish001/wvp-28181-2.0
注释无用的引入, 修复打jar包失败问题
|
3 years ago |
|
SaltFish
|
bb1fada32c
|
Update StreamPushMapper.java
|
3 years ago |
|
随波
|
b1d4123d29
|
update sql/mysql.sql.
修改拉流代理缺少“名称”字段问题
|
3 years ago |
|
随波
|
e4e0cde16c
|
update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
修改新建拉流代理时不保存“名称”字段问题
|
3 years ago |
|
648540858
|
9c5b1060af
|
支持删除在线设备
|
3 years ago |
|
ckb_test
|
6d454423a2
|
rPort 变更了HostAddres也要变
|
3 years ago |
|
648540858
|
0cd86a79c2
|
修复设备删除
|
3 years ago |
|
648540858
|
e94b99d11c
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
3 years ago |
|
648540858
|
917e2b577d
|
Merge pull request #352 from walkTtalk/wvp-28181-2.0
Fix issue #347: 修改前端启动报错
|
3 years ago |
|
walkTtalk
|
f52be30399
|
Fix issue #347: 修改前端启动报错
|
3 years ago |
|
648540858
|
10f776678e
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
3 years ago |
|
648540858
|
7400ace65d
|
规范数据库，解决bug
|
3 years ago |
|
chenjialing
|
777f2e2121
|
日志优化--修改本地配置文件local的mysql连接方式
|
3 years ago |
|
chenjialing
|
e0f8acf09f
|
添加git的忽略logs
|
3 years ago |
|
chenjialing
|
7852c4fde7
|
research--local文件
|
3 years ago |
|
chenjialing
|
c8b9e590ef
|
日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式
|
3 years ago |
|
648540858
|
c9bfdf2525
|
实现国标的级联录像查询
|
3 years ago |
|
648540858
|
00afecac47
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
3 years ago |
|
648540858
|
a42dda2bd3
|
规范数据库，添加必要约束，优化通道批量导入功能
|
3 years ago |
|
648540858
|
0191e93768
|
同步主线
|
3 years ago |
|
648540858
|
f4c03c1808
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
|
3 years ago |
|
648540858
|
e861c9dfab
|
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
|
3 years ago |
|
648540858
|
2157bb0270
|
规范数据库，给各个标设置主键ID
|
3 years ago |
|
648540858
|
0a44eb8965
|
增加配置将国标录像与其他录像分开
|
3 years ago |
|
648540858
|
0b6587b1ad
|
增加配置将国标录像与其他录像分开
|
3 years ago |
|
648540858
|
5bcd8495e0
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
3 years ago |
|
648540858
|
b7635ec05d
|
优化级联通道发送速度
|
3 years ago |
|
648540858
|
0327d16021
|
优化级联平台删除
|
3 years ago |
|
648540858
|
59c79c08e1
|
修复级联通道回复错误
|
3 years ago |
|
648540858
|
b0d3bf3ed9
|
添加通道导入实例文件
|
3 years ago |
|
648540858
|
9442c37ce7
|
优化级联添加通道流程
|
3 years ago |
|
648540858
|
d4fe0fb325
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
3 years ago |
|
648540858
|
5528517471
|
Merge pull request #325 from nikmu/wvp-28181-2.0
新增实时监控功能
|
3 years ago |
|
朱俊杰
|
54df5df031
|
mapper改用注释方式
|
3 years ago |
|
648540858
|
b663a8ab41
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
3 years ago |
|
648540858
|
980052015a
|
优化列表展示
|
3 years ago |
|
648540858
|
bf66f8f694
|
推流导入支持添加平台信息与目录信息
|
3 years ago |
|
648540858
|
59f0210d04
|
Merge pull request #324 from SaltFish001/wvp-28181-2.0
更新生成的HTTP(s)/WS(s)-flv的链接地址
|
3 years ago |
|
朱俊杰
|
37a84e6691
|
新增实时监控功能
左边是设备通道树，右边是分屏预览
|
3 years ago |
|
SaltFish
|
0209dc89c9
|
Update MediaServiceImpl.java
最新版本zlm更新了flv的链接地址， 同步更新
|
3 years ago |
|
648540858
|
d07a5680f3
|
为推流列表增加批量移除功能
|
3 years ago |
