che_shuai
|
8fdd10d1c2
|
修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
|
2023-07-24 14:10:46 +08:00 |
|
648540858
|
17ea37506e
|
修复端口分配的并发问题
|
2023-07-24 09:06:49 +08:00 |
|
648540858
|
d48f89eee4
|
修复端口分配的并发问题
|
2023-07-24 09:04:47 +08:00 |
|
648540858
|
0cb68938b8
|
优化sip协议栈调用
|
2023-07-21 20:01:01 +08:00 |
|
648540858
|
97fef952ee
|
优化sip协议栈调用
|
2023-07-21 19:57:49 +08:00 |
|
648540858
|
7d7528cc27
|
更新readme
|
2023-07-21 15:55:49 +08:00 |
|
648540858
|
a3d871022c
|
修复空指针异常
|
2023-07-21 15:13:20 +08:00 |
|
648540858
|
bac9aca311
|
合并分支新内容
|
2023-07-20 17:56:04 +08:00 |
|
648540858
|
13811b0c78
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# sql/初始化.sql
# src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
# src/main/resources/all-application.yml
|
2023-07-20 17:51:16 +08:00 |
|
648540858
|
48a1a24769
|
添加配置
|
2023-07-20 17:29:36 +08:00 |
|
648540858
|
a39ac45bcc
|
扩展兼容接口，支持HTTPS接口
|
2023-07-20 17:18:11 +08:00 |
|
648540858
|
14efc4b855
|
Merge pull request #957 from orcfnjmlns908/wvp-28181-2.0
优化拉流代理保存
|
2023-07-20 13:00:02 +08:00 |
|
648540858
|
77d9da25c4
|
修复civilCode判断错误导致civilCode丢失
|
2023-07-19 20:48:15 +08:00 |
|
648540858
|
9cd63f0105
|
修复国标级联时添加目录不同平台无法使用同一个目录的问题
|
2023-07-19 15:33:21 +08:00 |
|
tonyjianhua
|
41d9c347bf
|
优化拉流代理保存
|
2023-07-19 13:33:53 +08:00 |
|
648540858
|
cb24ce13da
|
添加缺少的sql字段
|
2023-07-17 17:33:19 +08:00 |
|
648540858
|
19533c8f4d
|
合并分支功能
|
2023-07-17 17:28:49 +08:00 |
|
648540858
|
32c73ff595
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2023-07-17 16:56:58 +08:00 |
|
648540858
|
5c49627012
|
优化发流端口分配
|
2023-07-17 16:55:41 +08:00 |
|
648540858
|
7a120c6da4
|
优化日志
|
2023-07-17 16:54:00 +08:00 |
|
648540858
|
3483980ada
|
Merge pull request #956 from xiaoQQya/develop
perf(config): 补全 all-application.yml 配置文件
|
2023-07-17 16:42:16 +08:00 |
|
xiaoQQya
|
153523a32f
|
perf(config): 补全 all-application.yml 配置文件
|
2023-07-17 15:51:09 +08:00 |
|
648540858
|
86a20edb0b
|
Merge pull request #939 from xiaoQQya/wvp-28181-2.0
修复设备通道列表按通道类型筛选不准确等问题
|
2023-07-17 15:44:10 +08:00 |
|
648540858
|
531fcb2a7e
|
Merge pull request #955 from nikmu/wvp-28181-2.0
修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
|
2023-07-17 14:30:55 +08:00 |
|
朱俊杰
|
4f2cd41134
|
修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
|
2023-07-17 10:54:34 +08:00 |
|
648540858
|
a9f88be8c5
|
优化拉流代理的添加
|
2023-07-14 19:46:41 +08:00 |
|
648540858
|
287d42c196
|
推流默认开启音频
|
2023-07-14 11:27:58 +08:00 |
|
648540858
|
4162706ec4
|
修复因为心跳重发导致的心跳间隔异常
|
2023-07-14 09:10:59 +08:00 |
|
648540858
|
c42d391290
|
修复数据存储
|
2023-07-14 08:34:15 +08:00 |
|
648540858
|
ef5018de2d
|
修复合并错误
|
2023-07-13 14:57:30 +08:00 |
|
648540858
|
668dc8f0dd
|
Merge branch '2.6.8' into wvp-28181-2.0
# 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/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-13 14:47:24 +08:00 |
|
648540858
|
9fc3db1f5e
|
增加发流音视频分开发送
|
2023-07-13 14:30:41 +08:00 |
|
648540858
|
14eee911eb
|
Merge pull request #948 from DavidSche/wvp-28181-2.0
修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-G…
|
2023-07-13 14:07:58 +08:00 |
|
che_shuai
|
c27e345edc
|
修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914
|
2023-07-13 10:22:42 +08:00 |
|
648540858
|
f525b55729
|
修复发流复盖的为问题
|
2023-07-12 15:13:53 +08:00 |
|
648540858
|
04e7f48fde
|
合并主线的发流端口管理逻辑
|
2023-07-10 14:30:59 +08:00 |
|
xiaoQQya
|
468e2b2ffb
|
fix(play): 修复作为上级平台点播截取快照问题
|
2023-07-09 20:22:40 +08:00 |
|
648540858
|
885842249f
|
优化第三方对接接口
|
2023-07-07 18:17:24 +08:00 |
|
648540858
|
ff1e9f79c2
|
优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920
|
2023-07-07 14:51:41 +08:00 |
|
648540858
|
9fc9a29811
|
优化海康发送长度与实际长度不一致的情况，导致无法识别消息内容的问题
|
2023-07-06 18:01:16 +08:00 |
|
648540858
|
fd434b3cf2
|
修复BUG #928
|
2023-07-06 15:55:58 +08:00 |
|
648540858
|
e4754af417
|
修复数据错误导致无法转成JSON返回 #919
|
2023-07-06 15:35:59 +08:00 |
|
648540858
|
e163cf4d20
|
兼容海康平台在address字段使用错误的<或>破坏xml结构的情况， #903
|
2023-07-06 15:18:10 +08:00 |
|
648540858
|
61e5226122
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-06 15:07:43 +08:00 |
|
648540858
|
0a3d25fb5b
|
修复非必传参数
|
2023-07-06 15:07:16 +08:00 |
|
648540858
|
deeff5533b
|
添加兼容目录同步兼容性
|
2023-07-05 17:20:20 +08:00 |
|
648540858
|
457c5e3821
|
修复拉流代理无人观看自动停用失败
|
2023-07-04 11:10:17 +08:00 |
|
648540858
|
733a11f265
|
修复单端口点播
|
2023-07-03 17:55:34 +08:00 |
|
648540858
|
43ef195543
|
Merge branch '2.6.8' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-03 16:54:09 +08:00 |
|
648540858
|
ba8fffd907
|
增加与第三方对接的接口
|
2023-07-03 16:53:03 +08:00 |
|