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
14 Jun, 2023
1 commit
  • 修复级联录像查询sql错误
    f3388dd5
    648540858 authored
    2023-06-14 16:26:29 +0800  
    Browse Code »

13 Jun, 2023
3 commits
  • 去除多余日志
    e68eb850
    648540858 authored
    2023-06-13 23:11:56 +0800  
    Browse Code »
  • Merge branch '2.6.8' into wvp-28181-2.0
    c4d7dd96
    648540858 authored
    2023-06-13 23:11:00 +0800  
    Browse Code »
  • 修复zlm上线时过期任务设置错误
    8f5bbfa5
    648540858 authored
    2023-06-13 23:06:35 +0800  
    Browse Code »

12 Jun, 2023
1 commit
  • 修复sdp解析错误
    fa80ba6f
    648540858 authored
    2023-06-12 22:54:40 +0800  
    Browse Code »

10 Jun, 2023
2 commits
  • Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
    52f9c295
    648540858 authored
    2023-06-10 00:33:00 +0800  
    Browse Code »
  • 优化sdp解析,兼容带有f=的设备
    446f729e
    648540858 authored
    2023-06-10 00:32:42 +0800  
    Browse Code »

09 Jun, 2023
3 commits
  • Merge pull request #887 from bigbeef/wvp-28181-2.0 ...
    d93947c6
    fix:修复拉流代理配置展示问题:音频、录制、无人观看
    648540858 authored
    2023-06-09 23:18:15 +0800  
    Browse Code »
  • feat:删除拉流代理时,提示是否确认删除,防止误删
    1bdc0621
    winfed authored
    2023-06-09 15:50:33 +0800  
    Browse Code »
  • fix:修复拉流代理配置展示问题:音频、录制、无人观看
    a2d93fce
    winfed authored
    2023-06-09 15:19:18 +0800  
    Browse Code »

08 Jun, 2023
3 commits
  • 修复stream-on-demand配置失效的BUG
    03f35986
    648540858 authored
    2023-06-08 22:46:07 +0800  
    Browse Code »
  • Merge branch '2.6.8' into wvp-28181-2.0 ...
    20a47729
    # Conflicts:
    #	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
    648540858 authored
    2023-06-08 10:41:36 +0800  
    Browse Code »
  • 优化ffmpeg拉流代理
    095b12eb
    648540858 authored
    2023-06-08 10:40:16 +0800  
    Browse Code »

07 Jun, 2023
6 commits
  • 优化via的branch生成规则
    ca715e02
    648540858 authored
    2023-06-07 21:45:15 +0800  
    Browse Code »
  • 增加收到notify增加或移除通道时发送redis消息
    0c14970a
    648540858 authored
    2023-06-07 21:11:39 +0800  
    Browse Code »
  • 支持redis消息强制关闭流
    534be3f5
    648540858 authored
    2023-06-07 20:58:35 +0800  
    Browse Code »
  • 合并分支
    e272fa26
    648540858 authored
    2023-06-07 20:27:57 +0800  
    Browse Code »
  • Merge branch '2.6.8' into wvp-28181-2.0 ...
    b7f2a6b2
    # 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
    648540858 authored
    2023-06-07 20:21:10 +0800  
    Browse Code »
  • 修复录像下载,优化拉流代理接口
    97b04c4d
    648540858 authored
    2023-06-07 20:15:08 +0800  
    Browse Code »

05 Jun, 2023
3 commits
  • 优化截图获取接口
    db3240d9
    648540858 authored
    2023-06-05 11:10:15 +0800  
    Browse Code »
  • 修复拉流代理的ffmpeg代理方式
    2ef41112
    648540858 authored
    2023-06-05 10:28:11 +0800  
    Browse Code »
  • 修复添加目录SQL错误 #881
    b7d85a27
    648540858 authored
    2023-06-05 09:39:59 +0800  
    Browse Code »

02 Jun, 2023
2 commits
  • 优化日志
    8d6de724
    648540858 authored
    2023-06-02 16:40:19 +0800  
    Browse Code »
  • 优化点播流程中ssrc的释放
    74431b1e
    648540858 authored
    2023-06-02 15:46:07 +0800  
    Browse Code »

01 Jun, 2023
4 commits
  • Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
    dbdb9ca0
    648540858 authored
    2023-06-01 15:58:33 +0800  
    Browse Code »
  • Merge pull request #872 from xu-bin-bin/wvp-28181-2.0 ...
    614eaa8f
    删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql,保证升级脚本能正常执行。
    648540858 authored
    2023-06-01 15:58:19 +0800  
    Browse Code »
  • Merge pull request #878 from callinglove/wvp-28181-2.0 ...
    0c5b30e7
    修复 启用代理失败: ->缺少必要参数:"src_url","dst_url","timeout_ms"
    648540858 authored
    2023-06-01 14:55:14 +0800  
    Browse Code »
  • 修复 启用代理失败: ->缺少必要参数:"src_url","dst_url","timeout_ms"
    51c19c39
    yanggs authored
    2023-06-01 13:30:48 +0800  
    Browse Code »

30 May, 2023
5 commits
  • 删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql,保证升级脚本能正常执行。
    7d5a5b6c
    xubinbin authored
    2023-05-30 13:24:46 +0800  
    Browse Code »
  • 去除多余配置
    ffb21248
    648540858 authored
    2023-05-30 11:20:22 +0800  
    Browse Code »
  • 修复级联点播的空指针异常 #864
    314423bd
    648540858 authored
    2023-05-30 11:00:11 +0800  
    Browse Code »
  • 修复web端管理节点负载不显示国标收流 #871
    9ff1613d
    648540858 authored
    2023-05-30 10:54:09 +0800  
    Browse Code »
  • 移除手动配置mybatis下划线转驼峰
    50240b4e
    648540858 authored
    2023-05-30 10:32:08 +0800  
    Browse Code »

29 May, 2023
7 commits
  • 添加获取截图接口
    5a152791
    648540858 authored
    2023-05-29 23:28:06 +0800  
    Browse Code »
  • 修复引入的错误Order
    57192a49
    648540858 authored
    2023-05-29 20:18:42 +0800  
    Browse Code »
  • 修复设备列表状态显示
    6bbac849
    648540858 authored
    2023-05-29 15:24:18 +0800  
    Browse Code »
  • 修复地图页面云台状态显示以及状态显示
    d0083447
    648540858 authored
    2023-05-29 15:16:44 +0800  
    Browse Code »
  • 添加文档
    a91fe69f
    648540858 authored
    2023-05-29 09:40:36 +0800  
    Browse Code »
  • Merge branch 'postgresql' into wvp-28181-2.0
    56397198
    648540858 authored
    2023-05-29 09:25:45 +0800  
    Browse Code »
  • 修复升级sql
    d72c1c0c
    648540858 authored
    2023-05-29 09:23:21 +0800  
    Browse Code »