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,004 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

1399 Commits (6120e6bd7b74669683ae4f184a71a94fa0036ce7)

Author SHA1 Message Date
648540858 874a57387a 支持与第三方对接PS流 2023-08-08 09:49:27 +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 2e399faf41 修复gps位置更新时时间格式错误的问题 #971 2023-08-01 10:37:00 +08:00
648540858 bf1be52e7f Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-08-01 10:29:20 +08:00
648540858 e5cba6022f Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
 2023-08-01 10:28:41 +08:00
tnt group 735df5a935 docs: 修正日志管理控制器mapping的错误描述 2023-08-01 08:27:47 +08:00
648540858 3de49d1c2a 优化发流逻辑 2023-07-31 16:42:12 +08:00
648540858 095a3e1384 移除无用代码 2023-07-31 12:26:42 +08:00
tnt group e9a48e5303 fix: 修复请求截图api生成文件名称的异常 2023-07-30 13:25:38 +08:00
648540858 59d8f2f915 支持录像回放使用固定流地址以及自动点播录像回放 2023-07-25 11:14:43 +08:00
648540858 51634b1b96
Merge pull request #965 from wanghui0961/wvp-28181-2.0 
feat:支持级联tcp主动
 2023-07-25 10:14:06 +08:00
wanghui 7fd34cfda5 feat:支持级联tcp主动 2023-07-24 15:57:11 +08:00
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 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 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
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
朱俊杰 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
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
648540858 e4622d17a6 优化字段名称 2023-07-03 10:36:02 +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 b64f320805 优化发流逻辑 2023-07-01 18:10:33 +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 0592fd676f 修复使用推流状态作为推流通道状态为false仍然发送通知 2023-06-29 11:22:32 +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 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 c7d1515023 增加redis通道 2023-06-27 15:34:38 +08:00
648540858 724963324a 修复上级点播时如果推流信息中mediaServerID错误的情况 2023-06-26 19:06:14 +08:00
648540858 fec69c714c 优化国标信令 2023-06-25 22:40:26 +08:00
dsk 7749ea3421 新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException 2023-06-25 16:16:40 +08:00
dsk cec266d3cd 修复请求报错404等情况下导致ResponseBody未关闭的问题 2023-06-25 16:00:37 +08:00
648540858 f306937616 优化自动获取stream ip 2023-06-25 13:49:07 +08:00
648540858 155838ce2e 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 2023-06-22 22:35:35 +08:00
648540858 f4e5e03962 修复表名错误 #904 2023-06-21 15:53:26 +08:00
648540858 7b24d51db9 优化国标级联的端口保持 2023-06-21 14:03:31 +08:00
648540858 a7bf29a4cb 恢复默认值 2023-06-20 14:17:44 +08:00
648540858 9e28923b8c
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2023-06-20 14:15:27 +08:00
648540858 b4dadf6c51 修复删除的设备无法重新注册的问题 2023-06-20 13:02:18 +08:00
648540858 21a96ad20f 修复通道刷新 2023-06-20 12:51:06 +08:00
648540858 d310204d00 去除多余字段 2023-06-20 09:57:28 +08:00
648540858 0532363192 优化国标级联注册机制 2023-06-20 09:29:12 +08:00
648540858 6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json
 2023-06-19 20:19:31 +08:00
648540858 8cf5b65e38 优化国标级联注册机制 2023-06-19 20:09:16 +08:00
648540858 8942ab0112 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 2023-06-19 18:42:36 +08:00
‘sxh’ ccc0a99d68 同步主线的代码，保持一致性 2023-06-15 11:20:43 +08:00
‘sxh’ 652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2023-06-15 11:10:20 +08:00
‘sxh’ 15df08964b 新增设备主子码流选择，默认为不开启 2023-06-15 11:00:29 +08:00
648540858 319cdd2151 优化移动位置的时间 2023-06-14 20:39:10 +08:00
648540858 138216c395
Merge pull request #876 from criver31/wvp-28181-2.0 
移动设备实时位置兼容ISO8601格式
 2023-06-14 20:14:31 +08:00
648540858 5b8ffd5b61 修复前端空指针异常 #831 2023-06-14 18:14:40 +08:00
648540858 f4960b2618 修复移动位置获取接口超时 #857 2023-06-14 17:04:41 +08:00
648540858 f3388dd53a 修复级联录像查询sql错误 2023-06-14 16:26:29 +08:00
648540858 e68eb850a9 去除多余日志 2023-06-13 23:11:56 +08:00
648540858 c4d7dd9651 Merge branch '2.6.8' into wvp-28181-2.0 2023-06-13 23:11:00 +08:00
648540858 8f5bbfa5c2 修复zlm上线时过期任务设置错误 2023-06-13 23:06:35 +08:00
648540858 fa80ba6f2b 修复sdp解析错误 2023-06-12 22:54:40 +08:00
648540858 446f729e55 优化sdp解析，兼容带有f=的设备 2023-06-10 00:32:42 +08:00
648540858 03f3598681 修复stream-on-demand配置失效的BUG 2023-06-08 22:46:07 +08:00
648540858 20a47729fc Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-08 10:41:36 +08:00
648540858 095b12ebbd 优化ffmpeg拉流代理 2023-06-08 10:40:16 +08:00
648540858 ca715e0234 优化via的branch生成规则 2023-06-07 21:45:15 +08:00
648540858 0c14970ab8 增加收到notify增加或移除通道时发送redis消息 2023-06-07 21:11:39 +08:00
648540858 534be3f580 支持redis消息强制关闭流 2023-06-07 20:58:35 +08:00
648540858 e272fa26e1 合并分支 2023-06-07 20:27:57 +08:00
648540858 b7f2a6b25b Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
 2023-06-07 20:21:10 +08:00
648540858 97b04c4dba 修复录像下载，优化拉流代理接口 2023-06-07 20:15:08 +08:00
648540858 db3240d918 优化截图获取接口 2023-06-05 11:10:15 +08:00
648540858 2ef4111297 修复拉流代理的ffmpeg代理方式 2023-06-05 10:28:11 +08:00
648540858 b7d85a270e 修复添加目录SQL错误 #881 2023-06-05 09:39:59 +08:00
648540858 8d6de72429 优化日志 2023-06-02 16:40:19 +08:00
648540858 74431b1e98 优化点播流程中ssrc的释放 2023-06-02 15:46:07 +08:00
648540858 dbdb9ca06d Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-06-01 15:58:33 +08:00
yanggs 51c19c397d 修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms" 2023-06-01 13:30:48 +08:00
fine c2ef001546 Update MobilePositionResponseMessageHandler.java 2023-05-31 09:35:08 +08:00
648540858 ffb21248cb 去除多余配置 2023-05-30 11:20:22 +08:00
648540858 314423bd01 修复级联点播的空指针异常 #864 2023-05-30 11:00:11 +08:00
648540858 9ff1613d3b 修复web端管理节点负载不显示国标收流 #871 2023-05-30 10:54:09 +08:00
648540858 50240b4e39 移除手动配置mybatis下划线转驼峰 2023-05-30 10:32:08 +08:00
648540858 5a152791c0 添加获取截图接口 2023-05-29 23:28:06 +08:00
648540858 57192a49d1 修复引入的错误Order 2023-05-29 20:18:42 +08:00
648540858 a91fe69f76 添加文档 2023-05-29 09:40:36 +08:00
648540858 5639719879 Merge branch 'postgresql' into wvp-28181-2.0 2023-05-29 09:25:45 +08:00
shanyuanzz 5ebd788cef
优化低倍速下zoom变倍速率 
1.优化zoom缩放在1-FH低倍速下的变倍速率。
避免变倍速率过大或者某些相机无法变倍的问题。
 2023-05-28 14:01:51 +08:00
shanyuanzz 6d52e1539f
优化zoom低倍速下的变倍速率 
优化zoom低倍速下的变倍速率
 2023-05-28 13:48:55 +08:00
shanyuanzz 31c2f52e48
Update SIPCommander.java 
Add by 白米粥
1.修正云台控制的zoom的speedbug。
解决当zoom时speed为1-FH时速度变化为1-FH，而10H~FFH以上时是以首位速度进行变化，变化速率过于不一致。
修改后1-FH的速度均以1的速率进行缩放变倍。
 2023-05-28 13:39:16 +08:00
648540858 babc0f79cb 去除多余注释 2023-05-23 14:35:40 +08:00
648540858 807d0524a6 修复推流鉴权 2023-05-23 10:34:00 +08:00
648540858 061749548c 修复字段名错误 2023-05-22 11:23:48 +08:00
648540858 9e790eb0ff 本地集成人大金仓连接jar 2023-05-16 17:17:24 +08:00
648540858 be9bf60e81 兼容人大金仓对online作为保留字段的要求 2023-05-16 15:13:38 +08:00
Kairlec ca103731c7
fix response `content-type` is not set if access without access token 2023-05-15 16:26:37 +08:00
648540858 23b8667b7f 优化部分sql实现 2023-05-15 16:08:31 +08:00
648540858 5d40080468 优化部分sql实现 2023-05-15 15:29:39 +08:00
648540858 d849352441 重构以适配postgresql 2023-05-12 10:37:03 +08:00
xubinbin b726dc9753 "@schedule"是Spring框架提供的一种定时任务执行机制，默认情况下它是单线程执行，项目中多次使用fixedRate按指定频率执行任务(不管前面任务是否已经完成)，在同时执行多个定时任务时可能会出现阻塞和性能问题，为了解决这种单线程瓶颈问题，将定时任务的执行机制改为支持多线程 2023-05-10 15:38:22 +08:00
648540858 a2da81f79a 支持级联国标录像下载 2023-05-09 17:31:58 +08:00
648540858 affbd89fdb 修复hook订阅移除失败的问题 2023-05-08 17:55:07 +08:00