648540858
|
88350873ee
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.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/service/impl/MediaServerServiceImpl.java
|
2023-09-11 11:21:50 +08:00 |
|
648540858
|
d02078397e
|
修复修改流传输模式
|
2023-09-06 16:37:41 +08:00 |
|
648540858
|
212218c7c4
|
Merge pull request #1057 from lunasaw/dev-wvp-0906
fix set password
|
2023-09-06 10:32:24 +08:00 |
|
davidche
|
18aff4b546
|
修复 #1058
|
2023-09-06 10:30:20 +08:00 |
|
648540858
|
33d4107d0c
|
修复启动时如果上机平台不可连接的导致的持续报错
|
2023-09-06 10:21:42 +08:00 |
|
chenzhangyue
|
1d0c9c6a31
|
fix set password
|
2023-09-06 09:49:50 +08:00 |
|
chenzhangyue
|
bf8fbf4927
|
bugfix:这里应该不存在key才初始化一次
|
2023-09-01 17:22:53 +08:00 |
|
chenzhangyue
|
d38ccc257c
|
页面表单更新修复，这里update应该为查出来的DO，不是前端的DO，采用更安全的redis策略，更新DB删除缓存，查询设备的时候补充缓存
|
2023-08-31 17:36:57 +08:00 |
|
648540858
|
983c7c351f
|
优化对讲释放流程
|
2023-08-17 14:20:04 +08:00 |
|
648540858
|
4f26bd7176
|
优化级联语音对讲释放逻辑
|
2023-08-16 16:39:44 +08:00 |
|
648540858
|
91e49745e4
|
修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化
|
2023-08-16 01:55:50 +08:00 |
|
6485840858
|
bd41451d60
|
优化国标级联语音对讲流程
|
2023-08-15 10:41:12 +08:00 |
|
chenzhangyue
|
dd2ae65786
|
修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted
|
2023-08-10 20:00:43 +08:00 |
|
648540858
|
fc9ed976cf
|
合并主线
|
2023-08-07 18:09:45 +08:00 |
|
648540858
|
e898c344aa
|
Merge branch 'wvp-28181-2.0' into main-dev
# 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/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-08-07 17:28:02 +08:00 |
|
648540858
|
470625e077
|
支持全局固定流地址
|
2023-08-07 17:00:01 +08:00 |
|
648540858
|
fa13b22819
|
invite消息缓存字符间隔改为使用:代替_,避免scan查询失败
|
2023-08-04 17:53:12 +08:00 |
|
648540858
|
4a34097b68
|
录像下载不使用固定地址
|
2023-08-04 16:41:29 +08:00 |
|
648540858
|
988dc36fa5
|
重构点播，回放，下载时ssrc不一致以及TCP主动播放的逻辑
|
2023-08-04 15:47:56 +08:00 |
|
648540858
|
ba884fa9ef
|
默认关闭ssrc check
|
2023-08-03 16:08:22 +08:00 |
|
648540858
|
a01086fe1c
|
修复tcp主动录像回放时ssrc不一致时点播失败的问题
|
2023-08-03 15:50:15 +08:00 |
|
648540858
|
6797f77259
|
优化点播超时的处理，修复tcp主动点播时ssrc不一致时点播失败的问题
|
2023-08-03 15:36:59 +08:00 |
|
648540858
|
4fbc364ab3
|
合并主线
|
2023-07-31 15:33:34 +08:00 |
|
648540858
|
3cada22743
|
Merge branch 'wvp-28181-2.0' into main-dev
# 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/ZLMRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2023-07-31 15:28:47 +08:00 |
|
648540858
|
095a3e1384
|
移除无用代码
|
2023-07-31 12:26:42 +08:00 |
|
648540858
|
59d8f2f915
|
支持录像回放使用固定流地址以及自动点播录像回放
|
2023-07-25 11:14:43 +08:00 |
|
che_shuai
|
8fdd10d1c2
|
修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
|
2023-07-24 14:10:46 +08:00 |
|
648540858
|
7d3cbb8253
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-07-24 09:42:32 +08:00 |
|
648540858
|
d48f89eee4
|
修复端口分配的并发问题
|
2023-07-24 09:04:47 +08:00 |
|
648540858
|
14efc4b855
|
Merge pull request #957 from orcfnjmlns908/wvp-28181-2.0
优化拉流代理保存
|
2023-07-20 13:00:02 +08:00 |
|
648540858
|
19c996774e
|
合并主线
|
2023-07-19 15:37:59 +08:00 |
|
648540858
|
11c7deb876
|
Merge branch 'wvp-28181-2.0' into main-dev
|
2023-07-19 15:35:22 +08:00 |
|
648540858
|
9cd63f0105
|
修复国标级联时添加目录不同平台无法使用同一个目录的问题
|
2023-07-19 15:33:21 +08:00 |
|
tonyjianhua
|
41d9c347bf
|
优化拉流代理保存
|
2023-07-19 13:33:53 +08:00 |
|
648540858
|
db6dd3f755
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# 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/ZLMServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
|
2023-07-19 11:33:58 +08:00 |
|
648540858
|
86a20edb0b
|
Merge pull request #939 from xiaoQQya/wvp-28181-2.0
修复设备通道列表按通道类型筛选不准确等问题
|
2023-07-17 15:44:10 +08:00 |
|
朱俊杰
|
4f2cd41134
|
修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
|
2023-07-17 10:54:34 +08:00 |
|
648540858
|
a9f88be8c5
|
优化拉流代理的添加
|
2023-07-14 19:46:41 +08:00 |
|
xiaoQQya
|
468e2b2ffb
|
fix(play): 修复作为上级平台点播截取快照问题
|
2023-07-09 20:22:40 +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
|
457c5e3821
|
修复拉流代理无人观看自动停用失败
|
2023-07-04 11:10:17 +08:00 |
|
648540858
|
9889f908c8
|
合并主线
|
2023-07-04 11:08:14 +08:00 |
|
648540858
|
becea82736
|
Merge branch 'wvp-28181-2.0' into main-dev
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# 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/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
|
2023-07-04 10:10:48 +08:00 |
|
648540858
|
733a11f265
|
修复单端口点播
|
2023-07-03 17:55:34 +08:00 |
|
648540858
|
e4622d17a6
|
优化字段名称
|
2023-07-03 10:36:02 +08:00 |
|
648540858
|
4604aaea99
|
优化语音对讲支持根据设备设置释放收到ACK后开始发流
|
2023-07-02 13:53:45 +08:00 |
|
648540858
|
c551164c89
|
合并主线
|
2023-07-01 18:33:42 +08:00 |
|
648540858
|
975ace051b
|
Merge branch 'wvp-28181-2.0' into main-dev
# 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/ZLMRTPServerFactory.java
|
2023-07-01 18:28:28 +08:00 |
|
648540858
|
b64f320805
|
优化发流逻辑
|
2023-07-01 18:10:33 +08:00 |
|