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
chenzhangyue 7620527340 fix hasSubChannel 2023-09-28 16:00:05 +08:00
648540858 483d5e04a7 优化拉流代理 2023-09-25 18:51:02 +08:00
648540858 e8411bc797 修复截图截图未关闭流 #1087 2023-09-25 16:22:36 +08:00
648540858 b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
che_shuai da63ef5b19 推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示) 2023-09-22 11:34:10 +08:00
648540858 a34db2ee8b 增加根据国标编号添加国标级联通道的接口 2023-09-21 21:34:02 +08:00
Cloud User bc431e4290 fix-use-source-ip-as-stream-ip 2023-09-15 22:39:08 +08:00
648540858 e073b60cb1
Merge pull request #1071 from lunasaw/dev-wvp-0911 
generate @param
 2023-09-15 14:29:01 +08:00
648540858 2d11f1b3de 修复ssrc缓存初始化判断错误，导致初始化失败 2023-09-15 14:25:08 +08:00
648540858 2d423d9668 Merge branch 'xinchuang' into wvp-28181-2.0 2023-09-15 09:35:14 +08:00
chenzhangyue 54038486f4 generate @param 2023-09-12 20:23:14 +08:00
648540858 d05bce8f7f 修复对接金仓数据库中的问题 2023-09-12 15:32:17 +08:00
648540858 a6fb1cdb74 修复Web页面播放国标录像无声音的问题 2023-09-11 16:17:29 +08:00
648540858 f57ed350b3 添加设置mobilePosition中ChannelId #1054 2023-09-11 11:01:20 +08:00
648540858 4f90b28b93 修复自动点播超时后无法继续点播的问题 2023-09-11 10:36:40 +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
648540858 fd0ff18a71
Merge pull request #1055 from lunasaw/dev-wvp-0905 
fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set
 2023-09-06 09:32:15 +08:00
chenzhangyue 7155680793 fix VideoManagerConstants.SIP_SUBSCRIBE_PREFIX key set 2023-09-05 17:35:46 +08:00
chenzhangyue 73f6f044a1 local dev 2023-09-01 17:53:48 +08:00
chenzhangyue bf8fbf4927 bugfix:这里应该不存在key才初始化一次 2023-09-01 17:22:53 +08:00
648540858 cde7f6460a
Merge pull request #999 from a24211317/wvp-28181-2.0 
解决两个国标平台相互级联时，上级不能获取目录的问题
 2023-09-01 09:21:05 +08:00
648540858 a426b9bc53
Merge pull request #1036 from daniel10917/fix-channel-catalog 
修复通道目录同步异常问题
 2023-09-01 09:19:55 +08:00
648540858 44aef5d358
Merge pull request #1043 from xu-bin-bin/wvp-28181-2.0 
将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。
 2023-09-01 09:19:25 +08:00
chenzhangyue d38ccc257c 页面表单更新修复，这里update应该为查出来的DO，不是前端的DO，采用更安全的redis策略，更新DB删除缓存，查询设备的时候补充缓存 2023-08-31 17:36:57 +08:00
ChengHong d0ef68af3f
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-08-31 17:08:13 +08:00
xubinbin e8b2ca4686 将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。 2023-08-31 16:39:18 +08:00
yangjunyi 1b81080f6f 修复通道目录同步异常问题 2023-08-29 14:23:28 +08:00
648540858 dc37f66792
Merge pull request #1028 from nikmu/wvp-28181-2.0 
捕获启动过程中发送sip异常导致的启动失败
 2023-08-28 09:03:58 +08:00
648540858 760b14eaaa 恢复级联点播 2023-08-25 09:14:38 +08:00
648540858 4ae8c5ac3e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-08-25 09:14:07 +08:00
648540858 3951a95284 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2023-08-25 08:56:47 +08:00
648540858 23ce55260f 修复级联点播 2023-08-25 08:51:06 +08:00
朱俊杰 49a8a08c94 捕获启动过程中发送sip异常导致的启动失败 2023-08-24 17:12:39 +08:00
AlphaWu b5ccb1636f 修正Database拼写错误。 2023-08-20 15:50:24 +08:00
648540858 b63a89a0a8 修复发流参数错误 2023-08-18 14:06:39 +08:00
648540858 985082d339 添加缺少的内容 2023-08-16 09:11:22 +08:00
648540858 676a722241 修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化 2023-08-16 01:56:34 +08:00
648540858 91e49745e4 修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化 2023-08-16 01:55:50 +08:00
chenghong bac19f583c 解决两个国标平台相互级联时，上级不能获取目录的问题 2023-08-14 11:44:41 +08:00
648540858 eefd6a0e21
Merge pull request #993 from a24211317/wvp-28181-2.0 
平台保活消息增加回复200OK
 2023-08-11 09:12:19 +08:00
chenzhangyue dd2ae65786 修复代理访问跨域问题，和ScheduledFuture取消任务时指令重排异常，不结束正在运行的任务。防止 Command interrupted 2023-08-10 20:00:43 +08:00
chenghong 4ca97d3174 平台保活消息增加回复200OK 2023-08-09 16:18:19 +08:00
648540858 6106bda151 Merge branch '2.6.8' into wvp-28181-2.0 2023-08-08 16:06:39 +08:00
648540858 d67f0a1ea4 解决使用redis集群时获取发送端口失败的问题 2023-08-08 16:06:02 +08:00
648540858 5e34039def 支持对接第三方PS流 2023-08-08 10:01:51 +08:00
648540858 3e2486d0ab Merge branch '2.6.8' into wvp-28181-2.0 2023-08-08 09:50:31 +08:00
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