朱俊杰
|
ba3c38d7d3
|
去掉createinfo中的cseq参数
|
2022-03-16 11:21:39 +08:00 |
|
朱俊杰
|
b1c479b938
|
修复info请求头中的cseq序列
|
2022-03-16 11:18:09 +08:00 |
648540858
|
e752dbd1a7
|
修复推流关联平台的bug again
|
2022-03-16 10:12:31 +08:00 |
|
648540858
|
66aac4526b
|
修复推流关联平台的bug
|
2022-03-15 17:45:55 +08:00 |
|
648540858
|
d21a00418e
|
修复推流关联平台的bug
|
2022-03-15 16:58:50 +08:00 |
|
朱俊杰
|
70ada79c7a
|
修复device_channel的Id改变带来的tree查询bug
|
2022-03-15 16:31:06 +08:00 |
|
648540858
|
0dfce85d2f
|
必须提前在zlm上配置port_range属性，不然自动配置此属性可能不成功
|
2022-03-15 15:40:15 +08:00 |
|
648540858
|
ea08969bfc
|
使用zlm原生的rtp随机端口配置
|
2022-03-15 15:37:22 +08:00 |
|
648540858
|
0e69251281
|
修复多平台同时导入时的bug
|
2022-03-15 11:44:11 +08:00 |
|
648540858
|
11d40d3e22
|
#396
|
2022-03-15 10:47:07 +08:00 |
|
648540858
|
28e5c1ae05
|
修复平台编辑的bug
|
2022-03-15 10:13:19 +08:00 |
|
648540858
|
bde0e13682
|
#394
|
2022-03-14 18:34:25 +08:00 |
|
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
|
45e9fc880c
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-11 09:49:38 +08:00 |
|
648540858
|
c1d7f867c2
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
dengming
|
f88c70d38c
|
删除重复字段，channelId字段查询了两次
|
2022-03-10 17:27:07 +08:00 |
|
dengming
|
bef7fb2440
|
修复关闭按需拉流无效的问题
|
2022-03-10 15:08:41 +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
|
ca79100b6f
|
优化失败的录像点播的ssrc释放逻辑
|
2022-03-07 01:23:23 +08:00 |
|
648540858
|
b2c953fc76
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +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
|
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
|
0993bedb46
|
!11 修改内存泄露
Merge pull request !11 from ydpd/wvp-28181-2.0
|
2022-03-02 06:26:54 +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 |
|
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 |
SaltFish
|
bb1fada32c
|
Update StreamPushMapper.java
|
2022-03-01 14:33:04 +08:00 |
随波
|
e4e0cde16c
|
update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java.
修改新建拉流代理时不保存“名称”字段问题
|
2022-02-28 15:31:50 +00:00 |
|
648540858
|
9c5b1060af
|
支持删除在线设备
|
2022-02-28 17:56:27 +08:00 |
ckb_test
|
6d454423a2
|
rPort 变更了HostAddres也要变
|
2022-02-28 09:07:02 +00:00 |
|
648540858
|
0cd86a79c2
|
修复设备删除
|
2022-02-28 10:39:51 +08:00 |
|
648540858
|
e94b99d11c
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
2022-02-27 20:01:31 +08:00 |
|
648540858
|
10f776678e
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-25 20:33:38 +08:00 |
|
648540858
|
7400ace65d
|
规范数据库，解决bug
|
2022-02-25 20:33:02 +08:00 |
|
chenjialing
|
777f2e2121
|
日志优化--修改本地配置文件local的mysql连接方式
|
2022-02-25 09:54:18 +08:00 |
|
chenjialing
|
7852c4fde7
|
research--local文件
|
2022-02-25 09:36:05 +08:00 |
|
chenjialing
|
c8b9e590ef
|
日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式
|
2022-02-25 09:23:46 +08:00 |
|
648540858
|
c9bfdf2525
|
实现国标的级联录像查询
|
2022-02-24 21:10:34 +08:00 |
|
648540858
|
00afecac47
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-24 17:18:36 +08:00 |
|
648540858
|
a42dda2bd3
|
规范数据库，添加必要约束，优化通道批量导入功能
|
2022-02-24 16:55:06 +08:00 |
|
648540858
|
0191e93768
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|
648540858
|
f4c03c1808
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
|
2022-02-22 11:55:23 +08:00 |
|
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
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
2157bb0270
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
0a44eb8965
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:33:17 +08:00 |
|
648540858
|
0b6587b1ad
|
增加配置将国标录像与其他录像分开
|
2022-02-20 17:29:03 +08:00 |
|
648540858
|
5bcd8495e0
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
b7635ec05d
|
优化级联通道发送速度
|
2022-02-20 16:18:14 +08:00 |
|
648540858
|
0327d16021
|
优化级联平台删除
|
2022-02-17 15:33:25 +08:00 |
|
648540858
|
59c79c08e1
|
修复级联通道回复错误
|
2022-02-16 15:13:16 +08:00 |
|
648540858
|
9442c37ce7
|
优化级联添加通道流程
|
2022-02-15 17:41:09 +08:00 |
|
648540858
|
d4fe0fb325
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-15 09:13:16 +08:00 |
|
648540858
|
5528517471
|
Merge pull request #325 from nikmu/wvp-28181-2.0
新增实时监控功能
|
2022-02-15 09:13:03 +08:00 |
|
朱俊杰
|
54df5df031
|
mapper改用注释方式
|
2022-02-14 10:18:00 +08:00 |
|
648540858
|
b663a8ab41
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-02-11 18:01:58 +08:00 |
|
648540858
|
bf66f8f694
|
推流导入支持添加平台信息与目录信息
|
2022-02-11 16:45:06 +08:00 |
|
朱俊杰
|
37a84e6691
|
新增实时监控功能
左边是设备通道树，右边是分屏预览
|
2022-02-10 14:45:33 +08:00 |
|
SaltFish
|
0209dc89c9
|
Update MediaServiceImpl.java
最新版本zlm更新了flv的链接地址， 同步更新
|
2022-02-10 10:29:36 +08:00 |
|
648540858
|
d07a5680f3
|
为推流列表增加批量移除功能
|
2022-02-07 18:30:43 +08:00 |
|
648540858
|
e0028a87cb
|
为推流列表增加搜索功能
|
2022-02-07 14:12:34 +08:00 |
|
648540858
|
ea85a620d1
|
添加服务器信息获取能力。
|
2022-02-04 21:46:48 +08:00 |
|
648540858
|
646419e4ad
|
#247
|
2022-01-28 16:45:12 +08:00 |
|
648540858
|
8cfff8db97
|
添加对可能空指针的判断
|
2022-01-28 16:30:10 +08:00 |
|
648540858
|
f33c3a3630
|
添加重启后拉流代理自动恢复
|
2022-01-27 18:08:19 +08:00 |
|
648540858
|
66cadafd1c
|
优化直播推流的CivilCode
|
2022-01-27 17:40:59 +08:00 |
|
648540858
|
89db9991a2
|
2.0.2版本 去除默认的mediaIP 127.0.0.1,避免误导新用户
|
2022-01-27 14:25:26 +08:00 |
|
648540858
|
9b21fba871
|
解析xml异常时，回复400
|
2022-01-27 10:39:08 +08:00 |
|
648540858
|
f9b8ea6573
|
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
|
2022-01-26 11:00:48 +08:00 |