fajiao
/
wvp-GB28181-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 52cd02de51 更新播放器 648540858 2022-03-28 15:26:48 +0800
  • c23a529296 Merge branch 'wvp-28181-2.0' of https://github.91chi.fun/https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 #413 mk1990 2022-03-28 14:36:13 +0800
  • 60278ee6ad 修复国标目录发送缺失的问题 648540858 2022-03-28 11:03:17 +0800
  • a1b6e56427 1. 修改control.vue 报Invalid prop: type check failed for prop "column". Expected Number with value 1, got String with value "1". 2. 修改control.vue Error: [vue-clipboards] Invalid value. Please use a valid value. 3. 修改DeviceList.vue 刷新时报 [Vue warn]: Avoid mutating a prop directly since the value will be overwritten whenever the parent component re-renders. Instead, use a data or computed property based on the prop's value. Prop being mutated: "loading" mk1990 2022-03-28 10:11:13 +0800
  • 9aee7d42e3 兼容海康 媒体通知 消息from字段不是设备ID的问题 648540858 2022-03-25 18:05:05 +0800
  • daab2586ca 优化国标级联上级要求tcp推流时的回复 648540858 2022-03-25 17:22:17 +0800
  • 7d9cc96ef5 优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。 648540858 2022-03-25 16:05:14 +0800
  • e9586687f7 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2022-03-25 10:01:12 +0800
  • a77ba194ad 优化目录推送CivilCode值 648540858 2022-03-24 15:59:38 +0800
  • 2142b7ffcd
         Merge pull request #379 from MeBetterMan/wvp-28181-2.0 648540858 2022-03-22 11:45:11 +0800
  • bc1b8098a2 修身颠簸与录像回放redis前缀重复的问题 648540858 2022-03-21 16:58:42 +0800
  • b565523684
         Merge pull request #403 from brewswang/wvp-28181-2.0 648540858 2022-03-17 14:56:15 +0800
  • 7af3cb03ec 执法记录仪在更新目录数据的时候需要更新位置信息 #403 brewswang 2022-03-17 12:39:59 +0800
  • 59ef6e67d3 统一国标设备与级联平台字符集的使用 648540858 2022-03-17 10:29:49 +0800
  • c8f9f19c38 #393 648540858 2022-03-16 17:46:24 +0800
  • 4a0fd9ead3 修复合并pr带来的bug 648540858 2022-03-16 16:55:04 +0800
  • 57e6cdefdf #401 648540858 2022-03-16 16:46:18 +0800
  • bf10cc1b35
         Merge pull request #399 from nikmu/wvp-28181-2.0 648540858 2022-03-16 16:42:50 +0800
  • 69d9692f61 删除重复字段 wangyimeng 2022-03-16 15:27:12 +0800
  • ba3c38d7d3 去掉createinfo中的cseq参数 #399 朱俊杰 2022-03-16 11:21:39 +0800
  • b1c479b938 修复info请求头中的cseq序列 朱俊杰 2022-03-16 11:18:09 +0800
  • e752dbd1a7 修复推流关联平台的bug again 648540858 2022-03-16 10:12:31 +0800
  • 691313b778
         Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2022-03-16 08:54:31 +0800
  • 66aac4526b 修复推流关联平台的bug 648540858 2022-03-15 17:45:55 +0800
  • d21a00418e 修复推流关联平台的bug 648540858 2022-03-15 16:58:50 +0800
  • 70ada79c7a 修复device_channel的Id改变带来的tree查询bug 朱俊杰 2022-03-15 16:31:06 +0800
  • 0dfce85d2f 必须提前在zlm上配置port_range属性，不然自动配置此属性可能不成功 648540858 2022-03-15 15:40:15 +0800
  • ea08969bfc 使用zlm原生的rtp随机端口配置 648540858 2022-03-15 15:37:22 +0800
  • 0e69251281 修复多平台同时导入时的bug 648540858 2022-03-15 11:44:11 +0800
  • 11d40d3e22 #396 648540858 2022-03-15 10:47:07 +0800
  • 42901d0374
         Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2022-03-15 10:28:23 +0800
  • 28e5c1ae05 修复平台编辑的bug 648540858 2022-03-15 10:13:19 +0800
  • 28b1ed8b0d 修复使用ffmpeg拉流代理时ffmpeg cmd模板空白的bug 648540858 2022-03-15 09:45:11 +0800
  • bde0e13682 #394 648540858 2022-03-14 18:34:25 +0800
  • 354a39961a 优化点播, 级联点播级联录像。级联列表显示订阅状态 648540858 2022-03-14 18:24:30 +0800
  • 1171cf1ea9 使用zlm新特性支持对与国标流关闭音频以加快拉流速度 648540858 2022-03-14 11:36:01 +0800
  • 93c0c8c2fd 实时视频根据https协议设置视频路径 #392 huangweitao 2022-03-11 14:25:19 +0800
  • 61e91afd91 #390 648540858 2022-03-11 11:22:55 +0800
  • 1c95f1b4aa 移除多余字段 648540858 2022-03-11 11:22:47 +0800
  • 5cfaad2d6d #376 648540858 2022-03-11 09:58:36 +0800
  • 4a22611320 优化目录订阅时父节点的更新 648540858 2022-03-11 09:54:35 +0800
  • 98d12ecd6b
         Merge pull request #388 from AbnerSC/wvp-28181-2.0 648540858 2022-03-11 09:49:48 +0800
  • 45e9fc880c
         Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 #388 648540858 2022-03-11 09:49:38 +0800
  • 1cb2b2cc5f
         Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2022-03-10 21:00:42 +0800
  • 4e3247e44e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 648540858 2022-03-10 20:54:14 +0800
  • c1d7f867c2 优化目录订阅以及国标级联目录订阅回复 648540858 2022-03-10 20:53:56 +0800
  • 5e272330c2 Merge branch 'wvp-28181-2.0' of github.com:AbnerSC/wvp-GB28181-pro into wvp-28181-2.0 dengming 2022-03-10 17:52:59 +0800
  • 4abbf4df07
         Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 sc.dm 2022-03-10 17:42:02 +0800
  • a948b38dd6 优化pom配置，解决编译Failed to perform fetch问题 dengming 2022-03-10 17:40:45 +0800
  • f88c70d38c 删除重复字段，channelId字段查询了两次 dengming 2022-03-10 17:27:07 +0800
  • d474bf929e 删除多余依赖包com.google.guava:30.0-jre，项目引用了版本31 dengming 2022-03-10 15:24:50 +0800
  • bef7fb2440 修复关闭按需拉流无效的问题 dengming 2022-03-10 15:08:41 +0800
  • 3b5ce2e4d1
         Merge pull request #387 from AbnerSC/wvp-28181-2.0 648540858 2022-03-10 14:59:12 +0800
  • ec97c6a7d0 修复云端录像播放和下载路径错误的问题 #387 dengming 2022-03-10 11:33:51 +0800
  • 00a8a4a6f3 optimize--优化jar包运行获取通道截图的资源地址的配置 #386 chenjialing 2022-03-10 10:12:54 +0800
  • bea63f67e7
         Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 #379 Fang 2022-03-07 14:21:29 +0800
  • 335916f1f1 InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。 李防 2022-03-07 14:20:27 +0800
  • 41616f726d 修复导入通道时无平台关联时的bug 648540858 2022-03-07 10:47:06 +0800
  • 21506440d2
         Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2022-03-07 09:01:14 +0800
  • a45bb7d9df 导出sql 648540858 2022-03-07 08:27:38 +0800
  • ca79100b6f 优化失败的录像点播的ssrc释放逻辑 648540858 2022-03-07 01:23:23 +0800
  • b2c953fc76 优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项 648540858 2022-03-07 01:17:45 +0800
  • 9d37b411ec
         Merge pull request #375 from MeBetterMan/wvp-28181-2.0 648540858 2022-03-06 00:09:34 +0800
  • cbea5f64c9 修改3个小bug #375 李防 2022-03-05 17:05:05 +0800
  • bb50a24314
         Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2022-03-04 20:37:17 +0800
  • 3dc1e0368e 修复合并分支造成的bug 648540858 2022-03-04 15:59:29 +0800
  • ee746e53cd Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0 648540858 2022-03-04 15:39:30 +0800
  • 50c2a5a728 Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题" 648540858 2022-03-04 15:36:16 +0800
  • cadd0ee038 Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0 648540858 2022-03-04 15:29:56 +0800
  • 83671d8f10 Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-03-04 15:27:28 +0800
  • 16e8aa323f 修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题 648540858 2022-03-04 11:26:53 +0800
  • 1f39c6c62f readme更新 648540858 2022-03-04 10:32:28 +0800
  • b10a65483d 去除lombok，readme更新 648540858 2022-03-04 10:30:55 +0800
  • e5370bbd6e
         Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2022-03-03 19:52:16 +0800
  • d21322a932 优化国标级联录像预览 648540858 2022-03-03 18:23:52 +0800
  • 01a619f9e3 Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-03-03 16:55:20 +0800
  • 28d7fd3b58 参数名错误 648540858 2022-03-03 16:54:47 +0800
  • 14174ff400 Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-03-03 16:28:32 +0800
  • b019106c44
         Merge pull request #365 from TristingChen/zlm-node-manage 648540858 2022-03-03 16:23:03 +0800
  • 368c9de9c4 fixed--设备刷新超时时间设置为3s #367 chenjialing 2022-03-03 15:10:30 +0800
  • 2eb1ca2d94 国标录像支持多端同时播放 648540858 2022-03-03 15:57:28 +0800
  • af885ca4d9 节点管理--某个zlm节点删除之后，数据库中仍有数据，导致再次添加该zlm节点 #365 chenjialing 2022-03-02 18:29:02 +0800
  • b225b53510 fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复 chenjialing 2022-03-03 12:09:28 +0800
  • 6a4cdc36b1 修复正则×号是引起的错误 648540858 2022-03-02 18:11:43 +0800
  • d73630c49f 修复bug 648540858 2022-03-02 15:04:24 +0800
  • 128ccc7ff7
         !6 update web_src/src/components/dialog/changePassword.vue. Merge pull request !6 from lanss/N/A panll 2022-03-02 06:27:57 +0000
  • 0993bedb46
         !11 修改内存泄露 Merge pull request !11 from ydpd/wvp-28181-2.0 panll 2022-03-02 06:26:54 +0000
  • bbb808d83f
         !9 update sql/mysql.sql. Merge pull request !9 from 随波/N/A panll 2022-03-02 06:25:19 +0000
  • ae83bd6d06
         !8 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java. Merge pull request !8 from 随波/N/A panll 2022-03-02 06:24:26 +0000
  • 94af90fa14
         !7 rPort 变更了HostAddres也要变 Merge pull request !7 from ckb_test/N/A panll 2022-03-02 06:23:31 +0000
  • 1dcdbc3742 Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-03-02 12:52:37 +0800
  • f5640fddb7 优化国标级联的目录订阅 648540858 2022-03-02 11:48:20 +0800
  • e42a0a50ca
         Update mysql.sql #358 SaltFish 2022-03-02 11:37:04 +0800
  • 8f9a530296
         Merge pull request #360 from TristingChen/alarm-test 648540858 2022-03-02 09:22:20 +0800
  • fe0b5c33f9 告警信息上报过程中，AlarmType存储失败的解决 #360 chenjialing 2022-03-02 09:18:17 +0800
  • 86f87c4665 修改内存泄露 ydpd 2022-03-02 00:24:14 +0800
  • e66b839659 修改内存泄露 ydpd 2022-03-02 00:02:03 +0800
  • 29191373aa Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-03-01 22:07:01 +0800
  • 298d104fec 优化配置文件与日志 648540858 2022-03-01 21:59:31 +0800
  • 41a31a9111 告警信息上报过程中，AlarmType存储失败的解决 #359 chenjialing 2022-03-01 18:50:58 +0800