Sign in

guzijian / wvp-GB28181-pro · Commits

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • Commits 2,347
  • Compare
  • Branches 7
  • Tags 1
  • wvp-GB28181-pro
01 Aug, 2023
1 commit
  • docs: 修正日志管理控制器mapping的错误描述
    735df5a9
    tnt group authored
    2023-08-01 08:27:47 +0800  
    Browse Code »

31 Jul, 2023
1 commit
  • Merge pull request #976 from dodu2014/wvp-28181-2.0 ...
    a44adcab
    fix: 修复请求截图api生成文件名称的异常 #975
    648540858 authored
    2023-07-31 17:01:10 +0800  
    Browse Code »

30 Jul, 2023
1 commit
  • fix: 修复请求截图api生成文件名称的异常
    e9a48e53
    tnt group authored
    2023-07-30 13:25:38 +0800  
    Browse Code »

25 Jul, 2023
3 commits
  • 支持录像回放使用固定流地址以及自动点播录像回放
    59d8f2f9
    648540858 authored
    2023-07-25 11:14:43 +0800  
    Browse Code »
  • Merge pull request #965 from wanghui0961/wvp-28181-2.0 ...
    51634b1b
    feat:支持级联tcp主动
    648540858 authored
    2023-07-25 10:14:06 +0800  
    Browse Code »
  • Merge pull request #964 from DavidSche/wvp-28181-2.0 ...
    a4f6102a
    修复在国标级联选择通道时,如果添加通道到跟平台根目录(即平台本身),无法触发目录变更事件问题.详见 https://github.com/…
    648540858 authored
    2023-07-25 10:13:24 +0800  
    Browse Code »

24 Jul, 2023
3 commits
  • feat:支持级联tcp主动
    7fd34cfd
    wanghui authored
    2023-07-24 15:57:11 +0800  
    Browse Code »
  • 修复在国标级联选择通道时,如果添加通道到跟平台根目录(即平台本身),无法触发目录变更事件问题.详见 https://github.com/648540858/w… ...
    8fdd10d1
    …vp-GB28181-pro/issues/958
    che_shuai authored
    2023-07-24 14:10:46 +0800  
    Browse Code »
  • 修复端口分配的并发问题
    d48f89ee
    648540858 authored
    2023-07-24 09:04:47 +0800  
    Browse Code »

21 Jul, 2023
3 commits
  • 优化sip协议栈调用
    0cb68938
    648540858 authored
    2023-07-21 20:01:01 +0800  
    Browse Code »
  • 优化sip协议栈调用
    97fef952
    648540858 authored
    2023-07-21 19:57:49 +0800  
    Browse Code »
  • 更新readme
    7d7528cc
    648540858 authored
    2023-07-21 15:55:49 +0800  
    Browse Code »

20 Jul, 2023
5 commits
  • 合并分支新内容
    bac9aca3
    648540858 authored
    2023-07-20 17:56:04 +0800  
    Browse Code »
  • Merge branch '2.6.8' into wvp-28181-2.0 ...
    13811b0c
    # Conflicts:
    #	sql/初始化.sql
    #	src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
    #	src/main/resources/all-application.yml
    648540858 authored
    2023-07-20 17:51:16 +0800  
    Browse Code »
  • 添加配置
    48a1a247
    648540858 authored
    2023-07-20 17:29:36 +0800  
    Browse Code »
  • 扩展兼容接口,支持HTTPS接口
    a39ac45b
    648540858 authored
    2023-07-20 17:18:11 +0800  
    Browse Code »
  • Merge pull request #957 from orcfnjmlns908/wvp-28181-2.0 ...
    14efc4b8
    优化拉流代理保存
    648540858 authored
    2023-07-20 13:00:02 +0800  
    Browse Code »

19 Jul, 2023
3 commits
  • 修复civilCode判断错误导致civilCode丢失
    77d9da25
    648540858 authored
    2023-07-19 20:48:15 +0800  
    Browse Code »
  • 修复国标级联时添加目录不同平台无法使用同一个目录的问题
    9cd63f01
    648540858 authored
    2023-07-19 15:33:21 +0800  
    Browse Code »
  • 优化拉流代理保存
    41d9c347
    tonyjianhua authored
    2023-07-19 13:33:53 +0800  
    Browse Code »

17 Jul, 2023
10 commits
  • 添加缺少的sql字段
    cb24ce13
    648540858 authored
    2023-07-17 17:33:19 +0800  
    Browse Code »
  • 合并分支功能
    19533c8f
    648540858 authored
    2023-07-17 17:28:49 +0800  
    Browse Code »
  • Merge branch '2.6.8' into wvp-28181-2.0 ...
    32c73ff5
    # Conflicts:
    #	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
    648540858 authored
    2023-07-17 16:56:58 +0800  
    Browse Code »
  • 优化发流端口分配
    5c496270
    648540858 authored
    2023-07-17 16:55:41 +0800  
    Browse Code »
  • 优化日志
    7a120c6d
    648540858 authored
    2023-07-17 16:54:00 +0800  
    Browse Code »
  • Merge pull request #956 from xiaoQQya/develop ...
    3483980a
    perf(config): 补全 all-application.yml 配置文件
    648540858 authored
    2023-07-17 16:42:16 +0800  
    Browse Code »
  • perf(config): 补全 all-application.yml 配置文件
    153523a3
    xiaoQQya authored
    2023-07-17 15:51:09 +0800  
    Browse Code »
  • Merge pull request #939 from xiaoQQya/wvp-28181-2.0 ...
    86a20edb
    修复设备通道列表按通道类型筛选不准确等问题
    648540858 authored
    2023-07-17 15:44:10 +0800  
    Browse Code »
  • Merge pull request #955 from nikmu/wvp-28181-2.0 ...
    531fcb2a
    修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
    648540858 authored
    2023-07-17 14:30:55 +0800  
    Browse Code »
  • 修复上级平台点播过程中本平台生成的ssrc并没有在openRtp中使用导致会新生成ssrc和之前的冲突
    4f2cd411
    朱俊杰 authored
    2023-07-17 10:54:34 +0800  
    Browse Code »

14 Jul, 2023
4 commits
  • 优化拉流代理的添加
    a9f88be8
    648540858 authored
    2023-07-14 19:46:41 +0800  
    Browse Code »
  • 推流默认开启音频
    287d42c1
    648540858 authored
    2023-07-14 11:27:58 +0800  
    Browse Code »
  • 修复因为心跳重发导致的心跳间隔异常
    4162706e
    648540858 authored
    2023-07-14 09:10:59 +0800  
    Browse Code »
  • 修复数据存储
    c42d3912
    648540858 authored
    2023-07-14 08:34:15 +0800  
    Browse Code »

13 Jul, 2023
5 commits
  • 修复合并错误
    ef5018de
    648540858 authored
    2023-07-13 14:57:30 +0800  
    Browse Code »
  • Merge branch '2.6.8' into wvp-28181-2.0 ...
    668dc8f0
    # 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
    648540858 authored
    2023-07-13 14:47:24 +0800  
    Browse Code »
  • 增加发流音视频分开发送
    9fc3db1f
    648540858 authored
    2023-07-13 14:30:41 +0800  
    Browse Code »
  • Merge pull request #948 from DavidSche/wvp-28181-2.0 ...
    14eee911
    修复多级级联平台平台时,上级平台无法获取设备录像列表问题。问题详见  https://github.com/648540858/wvp-G…
    648540858 authored
    2023-07-13 14:07:58 +0800  
    Browse Code »
  • 修复多级级联平台平台时,上级平台无法获取设备录像列表问题。问题详见 https://github.com/648540858/wvp-GB28181-pro/issues/914
    c27e345e
    che_shuai authored
    2023-07-13 10:22:42 +0800  
    Browse Code »

12 Jul, 2023
1 commit
  • 修复发流复盖的为问题
    f525b557
    648540858 authored
    2023-07-12 15:13:53 +0800  
    Browse Code »