648540858
|
354a39961a
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
1171cf1ea9
|
使用zlm新特性支持对与国标流关闭音频以加快拉流速度
|
2022-03-14 11:36:01 +08:00 |
|
648540858
|
61e91afd91
|
#390
|
2022-03-11 11:22:55 +08:00 |
|
648540858
|
1c95f1b4aa
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
5cfaad2d6d
|
#376
|
2022-03-11 09:58:36 +08:00 |
|
648540858
|
4a22611320
|
优化目录订阅时父节点的更新
|
2022-03-11 09:54:35 +08:00 |
|
648540858
|
98d12ecd6b
|
Merge pull request #388 from AbnerSC/wvp-28181-2.0
修复关闭按需拉流无效的问题，和几个小问题
|
2022-03-11 09:49:48 +08:00 |
|
648540858
|
45e9fc880c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-11 09:49:38 +08:00 |
|
648540858
|
4e3247e44e
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-10 20:54:14 +08:00 |
|
648540858
|
c1d7f867c2
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
|
dengming
|
5e272330c2
|
Merge branch 'wvp-28181-2.0' of github.com:AbnerSC/wvp-GB28181-pro into wvp-28181-2.0
|
2022-03-10 17:52:59 +08:00 |
|
sc.dm
|
4abbf4df07
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-10 17:42:02 +08:00 |
|
dengming
|
a948b38dd6
|
优化pom配置，解决编译Failed to perform fetch问题
|
2022-03-10 17:40:45 +08:00 |
|
dengming
|
f88c70d38c
|
删除重复字段，channelId字段查询了两次
|
2022-03-10 17:27:07 +08:00 |
|
dengming
|
d474bf929e
|
删除多余依赖包com.google.guava:30.0-jre，项目引用了版本31
|
2022-03-10 15:24:50 +08:00 |
|
dengming
|
bef7fb2440
|
修复关闭按需拉流无效的问题
|
2022-03-10 15:08:41 +08:00 |
|
648540858
|
3b5ce2e4d1
|
Merge pull request #387 from AbnerSC/wvp-28181-2.0
修复云端录像播放和下载路径错误的问题
|
2022-03-10 14:59:12 +08:00 |
|
dengming
|
ec97c6a7d0
|
修复云端录像播放和下载路径错误的问题
|
2022-03-10 11:33:51 +08:00 |
|
648540858
|
41616f726d
|
修复导入通道时无平台关联时的bug
|
2022-03-07 10:47:06 +08:00 |
|
648540858
|
a45bb7d9df
|
导出sql
|
2022-03-07 08:27:38 +08:00 |
|
648540858
|
ca79100b6f
|
优化失败的录像点播的ssrc释放逻辑
|
2022-03-07 01:23:23 +08:00 |
|
648540858
|
b2c953fc76
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
648540858
|
9d37b411ec
|
Merge pull request #375 from MeBetterMan/wvp-28181-2.0
修改3个小bug
|
2022-03-06 00:09:34 +08:00 |
|
李防
|
cbea5f64c9
|
修改3个小bug
|
2022-03-05 17:05:05 +08:00 |
|
648540858
|
3dc1e0368e
|
修复合并分支造成的bug
|
2022-03-04 15:59:29 +08:00 |
|
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
|
2022-03-04 15:39:30 +08:00 |
|
648540858
|
50c2a5a728
|
Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa323f.
|
2022-03-04 15:36:16 +08:00 |
|
648540858
|
cadd0ee038
|
Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
# web_src/src/components/control.vue
|
2022-03-04 15:29:56 +08:00 |
|
648540858
|
83671d8f10
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-04 15:27:28 +08:00 |
|
648540858
|
16e8aa323f
|
修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题
|
2022-03-04 11:26:53 +08:00 |
|
648540858
|
1f39c6c62f
|
readme更新
|
2022-03-04 10:32:28 +08:00 |
|
648540858
|
b10a65483d
|
去除lombok，readme更新
|
2022-03-04 10:30:55 +08:00 |
|
648540858
|
d21322a932
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
01a619f9e3
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +08:00 |
|
648540858
|
28d7fd3b58
|
参数名错误
|
2022-03-03 16:54:47 +08:00 |
|
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
|
2022-03-03 16:28:32 +08:00 |
|
648540858
|
b019106c44
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 16:23:03 +08:00 |
|
648540858
|
2eb1ca2d94
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
chenjialing
|
af885ca4d9
|
节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点
|
2022-03-03 15:40:12 +08:00 |
|
chenjialing
|
b225b53510
|
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 15:30:16 +08:00 |
|
648540858
|
6a4cdc36b1
|
修复正则×号是引起的错误
|
2022-03-02 18:11:43 +08:00 |
|
648540858
|
d73630c49f
|
修复bug
|
2022-03-02 15:04:24 +08:00 |
|
panll
|
128ccc7ff7
|
!6 update web_src/src/components/dialog/changePassword.vue.
Merge pull request !6 from lanss/N/A
|
2022-03-02 06:27:57 +00:00 |
|
panll
|
0993bedb46
|
!11 修改内存泄露
Merge pull request !11 from ydpd/wvp-28181-2.0
|
2022-03-02 06:26:54 +00:00 |
|
panll
|
bbb808d83f
|
!9 update sql/mysql.sql.
Merge pull request !9 from 随波/N/A
|
2022-03-02 06:25:19 +00:00 |
|
panll
|
ae83bd6d06
|
!8 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
Merge pull request !8 from 随波/N/A
|
2022-03-02 06:24:26 +00:00 |
|
panll
|
94af90fa14
|
!7 rPort 变更了HostAddres也要变
Merge pull request !7 from ckb_test/N/A
|
2022-03-02 06:23:31 +00:00 |
|
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
|
2022-03-02 12:52:37 +08:00 |
|
648540858
|
f5640fddb7
|
优化国标级联的目录订阅
|
2022-03-02 11:48:20 +08:00 |
|
648540858
|
8f9a530296
|
Merge pull request #360 from TristingChen/alarm-test
告警信息上报过程中，AlarmType存储失败的解决
|
2022-03-02 09:22:20 +08:00 |
|