Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,009 Commits 2 Branches 0 Tags 42 MiB
1e2d207aea
Commit Graph

1009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fang
bea63f67e7
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-03-07 14:21:29 +08:00
李防
335916f1f1 InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。 2022-03-07 14:20:27 +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
chenjialing
fe0b5c33f9 告警信息上报过程中，AlarmType存储失败的解决 2022-03-02 09:18:17 +08:00
ydpd
86f87c4665 修改内存泄露 2022-03-02 00:24:14 +08:00
ydpd
e66b839659 修改内存泄露 2022-03-02 00:02:03 +08:00
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
 2022-03-01 22:07:01 +08:00
648540858
298d104fec 优化配置文件与日志 2022-03-01 21:59:31 +08:00
648540858
1ea95d2b87 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
4c53b10737 解决对接中遇到的问题 2022-03-01 17:42:22 +08:00
648540858
97698ee716
Merge pull request #346 from TristingChen/log-optimization 
Log optimization
 2022-03-01 17:37:19 +08:00