Commit Graph

Select branches

Hide Pull Requests

feature

master

Mono Color

• 7fd34cfda5 feat:支持级联tcp主动 wanghui 2023-07-21 16:20:39 +08:00
• 8fdd10d1c2 修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958 che_shuai 2023-07-24 14:10:46 +08:00
• 7d3cbb8253 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-24 09:42:32 +08:00
• 17ea37506e 修复端口分配的并发问题 648540858 2023-07-24 09:06:49 +08:00
• d48f89eee4 修复端口分配的并发问题 648540858 2023-07-24 09:04:47 +08:00
• 0cb68938b8 优化sip协议栈调用 648540858 2023-07-21 20:01:01 +08:00
• 97fef952ee 优化sip协议栈调用 648540858 2023-07-21 19:57:49 +08:00
• 7d7528cc27 更新readme 648540858 2023-07-21 15:55:49 +08:00
• a3d871022c 修复空指针异常 648540858 2023-07-21 15:13:20 +08:00
• bac9aca311 合并分支新内容 648540858 2023-07-20 17:56:04 +08:00
• 13811b0c78 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-07-20 17:51:16 +08:00
• 48a1a24769 添加配置 648540858 2023-07-20 17:29:36 +08:00
• a39ac45bcc 扩展兼容接口，支持HTTPS接口 648540858 2023-07-20 17:18:11 +08:00
• 14efc4b855 Merge pull request #957 from orcfnjmlns908/wvp-28181-2.0 648540858 2023-07-20 13:00:02 +08:00
• 77d9da25c4 修复civilCode判断错误导致civilCode丢失 648540858 2023-07-19 20:48:15 +08:00
• 19c996774e 合并主线 648540858 2023-07-19 15:37:59 +08:00
• 69bce3b6fe 合并主线 648540858 2023-07-19 15:35:38 +08:00
• 11c7deb876 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-19 15:35:22 +08:00
• 9cd63f0105 修复国标级联时添加目录不同平台无法使用同一个目录的问题 648540858 2023-07-19 15:33:21 +08:00
• 41d9c347bf 优化拉流代理保存 tonyjianhua 2023-07-19 13:33:53 +08:00
• db6dd3f755 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-19 11:33:58 +08:00
• cb24ce13da 添加缺少的sql字段 648540858 2023-07-17 17:33:19 +08:00
• 19533c8f4d 合并分支功能 648540858 2023-07-17 17:28:49 +08:00
• 32c73ff595 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-07-17 16:56:58 +08:00
• 5c49627012 优化发流端口分配 648540858 2023-07-17 16:55:41 +08:00
• 7a120c6da4 优化日志 648540858 2023-07-17 16:54:00 +08:00
• 3483980ada Merge pull request #956 from xiaoQQya/develop 648540858 2023-07-17 16:42:16 +08:00
• 153523a32f perf(config): 补全 all-application.yml 配置文件 xiaoQQya 2023-07-17 15:51:09 +08:00
• 86a20edb0b Merge pull request #939 from xiaoQQya/wvp-28181-2.0 648540858 2023-07-17 15:44:10 +08:00
• 531fcb2a7e Merge pull request #955 from nikmu/wvp-28181-2.0 648540858 2023-07-17 14:30:55 +08:00
• 4f2cd41134 修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突 朱俊杰 2023-07-17 10:54:34 +08:00
• a9f88be8c5 优化拉流代理的添加 648540858 2023-07-14 19:46:41 +08:00
• 287d42c196 推流默认开启音频 648540858 2023-07-14 11:27:58 +08:00
• 4162706ec4 修复因为心跳重发导致的心跳间隔异常 648540858 2023-07-14 09:10:59 +08:00
• c42d391290 修复数据存储 648540858 2023-07-14 08:34:15 +08:00
• ef5018de2d 修复合并错误 648540858 2023-07-13 14:57:30 +08:00
• 668dc8f0dd Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-07-13 14:47:24 +08:00
• 9fc3db1f5e 增加发流音视频分开发送 648540858 2023-07-13 14:30:41 +08:00
• 14eee911eb Merge pull request #948 from DavidSche/wvp-28181-2.0 648540858 2023-07-13 14:07:58 +08:00
• c27e345edc 修复多级级联平台平台时，上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914 che_shuai 2023-07-13 10:22:42 +08:00
• f525b55729 修复发流复盖的为问题 648540858 2023-07-12 15:13:53 +08:00
• 04e7f48fde 合并主线的发流端口管理逻辑 648540858 2023-07-10 14:30:59 +08:00
• 468e2b2ffb fix(play): 修复作为上级平台点播截取快照问题 xiaoQQya 2023-07-09 20:22:40 +08:00
• 885842249f 优化第三方对接接口 648540858 2023-07-07 18:17:24 +08:00
• ff1e9f79c2 优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920 648540858 2023-07-07 14:51:41 +08:00
• 9fc9a29811 优化海康发送长度与实际长度不一致的情况，导致无法识别消息内容的问题 648540858 2023-07-06 18:01:16 +08:00
• fd434b3cf2 修复BUG #928 648540858 2023-07-06 15:55:58 +08:00
• e4754af417 修复数据错误导致无法转成JSON返回 #919 648540858 2023-07-06 15:35:59 +08:00
• e163cf4d20 兼容海康平台在address字段使用错误的<或>破坏xml结构的情况， #903 648540858 2023-07-06 15:18:10 +08:00
• 61e5226122 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-07-06 15:07:43 +08:00
• 0a3d25fb5b 修复非必传参数 648540858 2023-07-06 15:07:16 +08:00
• deeff5533b 添加兼容目录同步兼容性 648540858 2023-07-05 17:20:20 +08:00
• 457c5e3821 修复拉流代理无人观看自动停用失败 648540858 2023-07-04 11:10:17 +08:00
• 9889f908c8 合并主线 648540858 2023-07-04 11:08:14 +08:00
• becea82736 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-04 10:10:48 +08:00
• 733a11f265 修复单端口点播 648540858 2023-07-03 17:55:34 +08:00
• 43ef195543 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-07-03 16:54:09 +08:00
• ba8fffd907 增加与第三方对接的接口 648540858 2023-07-03 16:53:03 +08:00
• e4622d17a6 优化字段名称 648540858 2023-07-03 10:36:02 +08:00
• 4604aaea99 优化语音对讲支持根据设备设置释放收到ACK后开始发流 648540858 2023-07-02 13:53:45 +08:00
• 3571ca272b Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-02 12:42:05 +08:00
• 27b125cf98 增加备用字段 648540858 2023-07-02 12:40:41 +08:00
• 64cd48a92b 增加备用字段 648540858 2023-07-02 00:03:21 +08:00
• 01bc6c857e Merge pull request #908 from cnless/wvp-28181-2.0 648540858 2023-07-01 23:04:39 +08:00
• 8237cd25af 修复添加拉流代理提交错误 648540858 2023-07-01 22:50:24 +08:00
• 228c57399a 修复打开分享页需要登陆的BUG 648540858 2023-07-01 22:14:53 +08:00
• c551164c89 合并主线 648540858 2023-07-01 18:33:42 +08:00
• 975ace051b Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-07-01 18:28:28 +08:00
• b64f320805 优化发流逻辑 648540858 2023-07-01 18:10:33 +08:00
• 74ad4235f1 修复tcp主动的推流 648540858 2023-07-01 13:01:56 +08:00
• fb90dfdac5 临时提交 648540858 2023-07-01 10:14:19 +08:00
• 1458014fe3 修复合并主线后语音对讲失败的问题 648540858 2023-06-30 15:24:07 +08:00
• c916433042 优化更新通道中父结点的判断 648540858 2023-06-30 10:34:02 +08:00
• 18ad50222f 优化更新通道中父结点的判断 648540858 2023-06-30 10:01:21 +08:00
• 2d4bbbea8e 优化更新通道的civicode判断 648540858 2023-06-29 17:10:14 +08:00
• c014a90cc6 Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-06-29 16:08:05 +08:00
• 0592fd676f 修复使用推流状态作为推流通道状态为false仍然发送通知 648540858 2023-06-29 11:22:32 +08:00
• 7f0be280c3 修复未验证通过的表单被应该提交 648540858 2023-06-29 11:09:41 +08:00
• e8b766172e 合并268优化内容 648540858 2023-06-29 10:37:20 +08:00
• f62bf7b2c6 Merge branch '2.6.8' into wvp-28181-2.0 648540858 2023-06-29 09:52:05 +08:00
• 1294081a9c 优化树形列表通道查询 648540858 2023-06-29 09:36:13 +08:00
• bfae9780f7 增加流关闭时的处理 648540858 2023-06-28 20:32:48 +08:00
• 9bd588957a 修复获取pushKey 648540858 2023-06-28 20:27:25 +08:00
• def56793ba 增加上级推流和停止推流的通知 648540858 2023-06-28 16:52:27 +08:00
• 639e0bab11 修复树形列表通道查询 648540858 2023-06-28 15:02:59 +08:00
• a77628e875 优化端口预占用，防止占用无法释放 648540858 2023-06-28 14:50:46 +08:00
• ed035b74d9 添加关闭收流发流的接口 648540858 2023-06-28 10:47:33 +08:00
• 6fcff0567e doc去除cdn依赖 648540858 2023-06-28 09:15:07 +08:00
• f961515317 合并主线 648540858 2023-06-27 17:18:46 +08:00
• 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev 648540858 2023-06-27 16:46:26 +08:00
• c7d1515023 增加redis通道 648540858 2023-06-27 15:34:38 +08:00
• 724963324a 修复上级点播时如果推流信息中mediaServerID错误的情况 648540858 2023-06-26 19:06:14 +08:00
• fec69c714c 优化国标信令 648540858 2023-06-25 22:40:26 +08:00
• 7749ea3421 新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException dsk 2023-06-25 16:16:40 +08:00
• cec266d3cd 修复请求报错404等情况下导致ResponseBody未关闭的问题 dsk 2023-06-25 16:00:37 +08:00
• f306937616 优化自动获取stream ip 648540858 2023-06-25 13:49:07 +08:00
• 66eda32ab9 优化端口预占用 648540858 2023-06-25 10:18:29 +08:00
• 155838ce2e 优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895 648540858 2023-06-22 22:35:35 +08:00
• f4e5e03962 修复表名错误 #904 648540858 2023-06-21 15:53:26 +08:00
• 7b24d51db9 优化国标级联的端口保持 648540858 2023-06-21 14:03:31 +08:00