648540858
|
d1b0f3dcee
|
#390
|
2022-03-11 11:22:55 +08:00 |
|
648540858
|
ddc0779b4f
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
dd2deaaa3c
|
#376
|
2022-03-11 09:58:36 +08:00 |
|
648540858
|
3735943594
|
优化目录订阅时父节点的更新
|
2022-03-11 09:54:35 +08:00 |
|
648540858
|
edc98da01b
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-11 09:49:38 +08:00 |
|
648540858
|
63fec78d24
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
|
dengming
|
54b2b1c867
|
删除重复字段，channelId字段查询了两次
|
2022-03-10 17:27:07 +08:00 |
|
dengming
|
740fedc005
|
修复关闭按需拉流无效的问题
|
2022-03-10 15:08:41 +08:00 |
|
648540858
|
7044cf8c29
|
修复导入通道时无平台关联时的bug
|
2022-03-07 10:47:06 +08:00 |
|
648540858
|
09855e03e8
|
优化失败的录像点播的ssrc释放逻辑
|
2022-03-07 01:23:23 +08:00 |
|
648540858
|
13899f771b
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
李防
|
a1cb002609
|
修改3个小bug
|
2022-03-05 17:05:05 +08:00 |
|
648540858
|
a919611214
|
修复合并分支造成的bug
|
2022-03-04 15:59:29 +08:00 |
|
648540858
|
9450cb0c40
|
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
|
bdc704644a
|
Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa323f.
|
2022-03-04 15:36:16 +08:00 |
|
648540858
|
922d61c781
|
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
|
d6d226ef2c
|
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
|
346c90d9d0
|
修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题
|
2022-03-04 11:26:53 +08:00 |
|
648540858
|
b48e93e97a
|
去除lombok，readme更新
|
2022-03-04 10:30:55 +08:00 |
|
648540858
|
7af0cc437a
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
42cbec85e8
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +08:00 |
|
648540858
|
5c69ffce33
|
参数名错误
|
2022-03-03 16:54:47 +08:00 |
|
648540858
|
cc7f784198
|
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
|
0c909e0c85
|
Merge pull request #365 from TristingChen/zlm-node-manage
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 16:23:03 +08:00 |
|
648540858
|
1527b0e839
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
chenjialing
|
6e147c44e2
|
节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点
|
2022-03-03 15:40:12 +08:00 |
|
chenjialing
|
1f9b3271bb
|
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
|
2022-03-03 15:30:16 +08:00 |
|
648540858
|
ed9e8ef456
|
修复正则×号是引起的错误
|
2022-03-02 18:11:43 +08:00 |
|
648540858
|
2e49a48bb1
|
修复bug
|
2022-03-02 15:04:24 +08:00 |
|
panll
|
479411f406
|
!11 修改内存泄露
Merge pull request !11 from ydpd/wvp-28181-2.0
|
2022-03-02 06:26:54 +00:00 |
|
panll
|
17f2fdc344
|
!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
|
698ea11b16
|
!7 rPort 变更了HostAddres也要变
Merge pull request !7 from ckb_test/N/A
|
2022-03-02 06:23:31 +00:00 |
|
648540858
|
f61d0c35d7
|
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
|
78bad59518
|
优化国标级联的目录订阅
|
2022-03-02 11:48:20 +08:00 |
|
chenjialing
|
22fd9e6f8c
|
告警信息上报过程中，AlarmType存储失败的解决
|
2022-03-02 09:18:17 +08:00 |
|
ydpd
|
31b1728313
|
修改内存泄露
|
2022-03-02 00:24:14 +08:00 |
|
ydpd
|
3525fccd40
|
修改内存泄露
|
2022-03-02 00:02:03 +08:00 |
|
648540858
|
6d8ea04fe0
|
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
|
2022-03-01 22:07:01 +08:00 |
|
648540858
|
76397fecf8
|
优化配置文件与日志
|
2022-03-01 21:59:31 +08:00 |
|
648540858
|
cf5a8515df
|
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
|
2022-03-01 17:48:21 +08:00 |
|
648540858
|
4c53e56d90
|
解决对接中遇到的问题
|
2022-03-01 17:42:22 +08:00 |
|
648540858
|
52622fe991
|
Merge pull request #346 from TristingChen/log-optimization
Log optimization
|
2022-03-01 17:37:19 +08:00 |
|
SaltFish
|
aabd3ea659
|
Update StreamPushMapper.java
|
2022-03-01 14:33:04 +08: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 |
|
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 |
|