mrjackwang
|
bb50a24314
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
648540858
|
3dc1e0368e
|
修复合并分支造成的bug
|
4 years ago |
|
648540858
|
ee746e53cd
|
Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
4 years ago |
|
648540858
|
50c2a5a728
|
Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa323f.
|
4 years ago |
|
648540858
|
cadd0ee038
|
Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
# web_src/src/components/control.vue
|
4 years ago |
|
648540858
|
83671d8f10
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
4 years ago |
|
648540858
|
16e8aa323f
|
修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题
|
4 years ago |
|
648540858
|
1f39c6c62f
|
readme更新
|
4 years ago |
|
648540858
|
b10a65483d
|
去除lombok，readme更新
|
4 years ago |
|
mrjackwang
|
e5370bbd6e
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
648540858
|
d21322a932
|
优化国标级联录像预览
|
4 years ago |
|
648540858
|
01a619f9e3
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
4 years ago |
|
648540858
|
28d7fd3b58
|
参数名错误
|
4 years ago |
|
648540858
|
14174ff400
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
4 years ago |
|
648540858
|
b019106c44
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
4 years ago |
|
648540858
|
2eb1ca2d94
|
国标录像支持多端同时播放
|
4 years ago |
|
chenjialing
|
af885ca4d9
|
节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点
|
4 years ago |
|
chenjialing
|
b225b53510
|
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
4 years ago |
|
648540858
|
6a4cdc36b1
|
修复正则×号是引起的错误
|
4 years ago |
|
648540858
|
d73630c49f
|
修复bug
|
4 years ago |
|
panll
|
128ccc7ff7
|
!6 update web_src/src/components/dialog/changePassword.vue.
Merge pull request !6 from lanss/N/A
|
4 years ago |
|
panll
|
0993bedb46
|
!11 修改内存泄露
Merge pull request !11 from ydpd/wvp-28181-2.0
|
4 years ago |
|
panll
|
bbb808d83f
|
!9 update sql/mysql.sql.
Merge pull request !9 from 随波/N/A
|
4 years ago |
|
panll
|
ae83bd6d06
|
!8 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
Merge pull request !8 from 随波/N/A
|
4 years ago |
|
panll
|
94af90fa14
|
!7 rPort 变更了HostAddres也要变
Merge pull request !7 from ckb_test/N/A
|
4 years ago |
|
648540858
|
1dcdbc3742
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
|
4 years ago |
|
648540858
|
f5640fddb7
|
优化国标级联的目录订阅
|
4 years ago |
|
648540858
|
8f9a530296
|
Merge pull request #360 from TristingChen/alarm-test
告警信息上报过程中，AlarmType存储失败的解决
|
4 years ago |
|
chenjialing
|
fe0b5c33f9
|
告警信息上报过程中，AlarmType存储失败的解决
|
4 years ago |
|
ydpd
|
86f87c4665
|
修改内存泄露
|
4 years ago |
|
ydpd
|
e66b839659
|
修改内存泄露
|
4 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
|
4 years ago |
|
648540858
|
298d104fec
|
优化配置文件与日志
|
4 years ago |
|
648540858
|
1ea95d2b87
|
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
|
4 years ago |
|
648540858
|
4c53b10737
|
解决对接中遇到的问题
|
4 years ago |
|
648540858
|
97698ee716
|
Merge pull request #346 from TristingChen/log-optimization
Log optimization
|
4 years ago |
|
648540858
|
347eec086d
|
Merge pull request #356 from SaltFish001/wvp-28181-2.0
注释无用的引入, 修复打jar包失败问题
|
4 years ago |
|
SaltFish
|
bb1fada32c
|
Update StreamPushMapper.java
|
4 years ago |
|
随波
|
b1d4123d29
|
update sql/mysql.sql.
修改拉流代理缺少“名称”字段问题
|
4 years ago |
|
随波
|
e4e0cde16c
|
update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
修改新建拉流代理时不保存“名称”字段问题
|
4 years ago |
|
648540858
|
9c5b1060af
|
支持删除在线设备
|
4 years ago |
|
ckb_test
|
6d454423a2
|
rPort 变更了HostAddres也要变
|
4 years ago |
|
648540858
|
0cd86a79c2
|
修复设备删除
|
4 years ago |
|
648540858
|
e94b99d11c
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
4 years ago |
|
mrjackwang
|
f65d2730e0
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
4 years ago |
|
648540858
|
917e2b577d
|
Merge pull request #352 from walkTtalk/wvp-28181-2.0
Fix issue #347: 修改前端启动报错
|
4 years ago |
|
wangyimeng
|
c3c44dbd53
|
增加拉流代理表name字段
|
4 years ago |
|
wangyimeng
|
560165b667
|
增加拉流代理修改功能
|
4 years ago |
|
wangyimeng
|
f97ce3e936
|
增加拉流代理修改功能
|
4 years ago |
|
walkTtalk
|
f52be30399
|
Fix issue #347: 修改前端启动报错
|
4 years ago |
