aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-15 10:07:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,094 Commits 27 Branches 1 Tag 209 MiB
66f32d799d
Commit Graph

2094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
648540858
66f32d799d 临时提交 2023-12-27 14:28:58 +08:00
648540858
aa11d02dbf 优化手动添加设备后设备的登录 2023-12-27 09:41:48 +08:00
648540858
a7f1bd95df 临时提交 2023-12-26 23:46:24 +08:00
648540858
14fe1936d0 合并主线 2023-12-26 18:34:41 +08:00
648540858
da8a7d67e4 Merge branch 'wvp-28181-2.0' into 结构优化 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
 2023-12-26 15:42:34 +08:00
648540858
f8d2b933b1 为每个接口添加调试接口需要的描述 2023-12-26 15:30:24 +08:00
648540858
7c07ae9421 修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口 2023-12-26 15:03:00 +08:00
648540858
33fba05a38
Merge pull request #1219 from xiaoQQya/develop 
Feature: 新增通道编辑功能
 2023-12-26 09:52:03 +08:00
xiaoQQya
3ab4ce0a83 perf: 分屏监控设备列表优先使用自定义通道名称 2023-12-26 08:50:41 +08:00
648540858
b38c7eef70 补充字段 2023-12-25 23:45:00 +08:00
648540858
746cd2543d 优化设备列表查询，支持搜索。支持获取流信息 2023-12-25 17:50:37 +08:00
648540858
8b9bac5cb3 添加摄像机控制接口 2023-12-23 00:49:28 +08:00
648540858
67507e64b2 优化预置位设置 2023-12-22 18:09:17 +08:00
648540858
974e822f84 优化预置位查询 2023-12-21 15:31:28 +08:00
648540858
35fd5eee63 优化预置位查询 2023-12-21 13:16:03 +08:00
648540858
52c56bfdf2 优化点播超时的日志以及代码 2023-12-20 23:55:03 +08:00
648540858
8a605ad722 临时提交 2023-12-20 18:02:47 +08:00
648540858
913d4bdc8f 修复拉流代理 2023-12-19 23:17:58 +08:00
648540858
9ae08fd6c3 修复推流的添加 2023-12-19 18:49:49 +08:00
648540858
6d0361edf8 Merge branch 'wvp-28181-2.0' into 结构优化 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
 2023-12-19 17:27:50 +08:00
648540858
36c641c467 实现目录订阅的相关接口 2023-12-19 16:50:47 +08:00
xiaoQQya
9ae520a58a feat(channel): 新增通道支持自定义名称、位置及云台类型 2023-12-19 15:22:09 +08:00
648540858
31ab6eb174 临时提交 2023-12-19 14:39:16 +08:00
xiaoQQya
ef58f29cfc perf(catlog): 优化同步通道时通道名称的处理 
通道名称为空时，默认使用通道编码作为通道名称，避免级联时因通道名称为空导致上级接收通道失败
 2023-12-19 10:07:48 +08:00
648540858
74ce2be55b 临时提交 2023-12-18 23:44:37 +08:00
648540858
964d55431f 修复推流无声音的问题 2023-12-18 14:43:04 +08:00
648540858
76d09bcadb 修复sql注入 #1112 2023-12-18 11:14:59 +08:00
648540858
18a9f86a0a
Merge pull request #1209 from DavidSche/fix-1208 
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误
 2023-12-18 09:59:06 +08:00
648540858
7430c98309 增加日志提示 2023-12-17 23:41:21 +08:00
648540858
d8011e9ee7 去除只有udp收流支持ssrc校验的判断 2023-12-17 23:33:18 +08:00
648540858
cb1f1417b6 兼容回复的invite 200OK消息中缺少ssrc(y字段)的情况 2023-12-15 22:44:41 +08:00
648540858
0a245c4cfe 修复非鉴权接口的跨域失败问题 2023-12-15 17:54:34 +08:00
648540858
3a1fc63d7a 优化ssrc释放逻辑 2023-12-15 17:28:55 +08:00
648540858
2397344973 优化ssrc释放逻辑 2023-12-15 16:44:46 +08:00
648540858
04a1bfa329 优化事务释放逻辑 2023-12-15 16:25:05 +08:00
648540858
b699158e43 修复点播流地址修改 2023-12-13 14:43:42 +08:00
648540858
eac72fd06e 优化日志打印样式 2023-12-13 14:37:08 +08:00
648540858
94edd95824
Merge pull request #1205 from xu-bin-bin/wvp-28181-2.0 
修改输出的日志格式
 2023-12-13 14:31:06 +08:00
davidche
572c8850dc
fix bug #1208 修复拉流代理启用状态下调用启用接口的返回错误 2023-12-13 13:48:04 +08:00
648540858
b4b9ad2873 修复写入事务信息callid错误 2023-12-13 09:40:30 +08:00
648540858
dc841a9dcf 临时提交 2023-12-12 17:57:19 +08:00
xubinbin
42a2772d1a bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195 2023-12-12 17:09:04 +08:00
xubinbin
360fe689b1 增加日志记录时的完全限定类名，用于定位日志位置。 
ps：2023-12-12 16:30:58.779 [Thread-10]  INFO --- gov.nist.javax.sip.stack.UDPMessageChannel : 81 Done processing MESSAGE sip:44010200492000000003@4401020049 SIP/2.0
日志中的“gov.nist.javax.sip.stack.UDPMessageChannel”内容
 2023-12-12 16:41:15 +08:00
xubinbin
5a9621840c 修改控制台输出日志格式，增加显示线程名称，调用类的全类路径以及日子输出行的行号。 2023-12-12 16:37:06 +08:00
648540858
e0686dd426 临时提交 2023-12-11 23:09:58 +08:00
648540858
31dcde7cc1 临时提交 2023-12-11 22:49:48 +08:00
648540858
92669f192f 临时提交 2023-12-11 21:18:53 +08:00
648540858
b7af59b2ce 修复拉流代理 2023-12-11 14:52:52 +08:00
648540858
e73d00060e
Merge pull request #1137 from xiaoQQya/develop 
bugfix: 修复推流鉴权、报警推送等问题
 2023-12-11 10:22:26 +08:00
648540858
7a52db4e89
Merge pull request #1138 from shuxiaoyuan/fix-subscribe-catalog 
bugfix：设备地址变化会引起目录订阅任务失效，需要重新添加
 2023-12-11 10:11:36 +08:00