Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,343 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

2343 Commits (f357bece629710f8d9916b070c0f4ce185f7ac75)

Author SHA1 Message Date
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 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 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
648540858 e4622d17a6 优化字段名称 2023-07-03 10:36:02 +08:00
648540858 4604aaea99 优化语音对讲支持根据设备设置释放收到ACK后开始发流 2023-07-02 13:53:45 +08:00
648540858 3571ca272b Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	web_src/config/index.js
 2023-07-02 12:42:05 +08:00
648540858 27b125cf98 增加备用字段 2023-07-02 12:40:41 +08:00
648540858 64cd48a92b 增加备用字段 2023-07-02 00:03:21 +08:00
648540858 01bc6c857e
Merge pull request #908 from cnless/wvp-28181-2.0 
fix:修复ResponseBody未关闭以及点播超时报错AsyncRequestTimeoutException
 2023-07-01 23:04:39 +08:00
648540858 8237cd25af 修复添加拉流代理提交错误 2023-07-01 22:50:24 +08:00
648540858 228c57399a 修复打开分享页需要登陆的BUG 2023-07-01 22:14:53 +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
648540858 74ad4235f1 修复tcp主动的推流 2023-07-01 13:01:56 +08:00
648540858 fb90dfdac5 临时提交 2023-07-01 10:14:19 +08:00
648540858 1458014fe3 修复合并主线后语音对讲失败的问题 2023-06-30 15:24:07 +08:00
648540858 c916433042 优化更新通道中父结点的判断 2023-06-30 10:34:02 +08:00
648540858 18ad50222f 优化更新通道中父结点的判断 2023-06-30 10:01:21 +08:00
648540858 2d4bbbea8e 优化更新通道的civicode判断 2023-06-29 17:10:14 +08:00
648540858 c014a90cc6 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/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-06-29 16:08:05 +08:00
648540858 0592fd676f 修复使用推流状态作为推流通道状态为false仍然发送通知 2023-06-29 11:22:32 +08:00
648540858 7f0be280c3 修复未验证通过的表单被应该提交 2023-06-29 11:09:41 +08:00
648540858 e8b766172e 合并268优化内容 2023-06-29 10:37:20 +08:00
648540858 f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Gb28181Sdp.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	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/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
 2023-06-29 09:52:05 +08:00
648540858 1294081a9c 优化树形列表通道查询 2023-06-29 09:36:13 +08:00
648540858 bfae9780f7 增加流关闭时的处理 2023-06-28 20:32:48 +08:00
648540858 9bd588957a 修复获取pushKey 2023-06-28 20:27:25 +08:00
648540858 def56793ba 增加上级推流和停止推流的通知 2023-06-28 16:52:27 +08:00
648540858 639e0bab11 修复树形列表通道查询 2023-06-28 15:02:59 +08:00
648540858 a77628e875 优化端口预占用，防止占用无法释放 2023-06-28 14:50:46 +08:00
648540858 ed035b74d9 添加关闭收流发流的接口 2023-06-28 10:47:33 +08:00
648540858 6fcff0567e doc去除cdn依赖 2023-06-28 09:15:07 +08:00
648540858 f961515317 合并主线 2023-06-27 17:18:46 +08:00
648540858 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	src/main/resources/all-application.yml
#	web_src/config/index.js
#	web_src/src/components/dialog/devicePlayer.vue
 2023-06-27 16:46:26 +08:00
648540858 c7d1515023 增加redis通道 2023-06-27 15:34:38 +08:00