aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-23 21:47:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,767 Commits 27 Branches 1 Tag 209 MiB
6b3732b8c4
Commit Graph

171 Commits

Author SHA1 Message Date
648540858
6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
#	src/main/resources/all-application.yml
#	web_src/package-lock.json
 2023-06-19 20:19:31 +08:00
648540858
8942ab0112 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范 2023-06-19 18:42:36 +08:00
648540858
f4960b2618 修复移动位置获取接口超时 #857 2023-06-14 17:04:41 +08:00
648540858
db3240d918 优化截图获取接口 2023-06-05 11:10:15 +08:00
648540858
b7d85a270e 修复添加目录SQL错误 #881 2023-06-05 09:39:59 +08:00
648540858
5a152791c0 添加获取截图接口 2023-05-29 23:28:06 +08:00
648540858
c429a34e53 修复国标视频点播三种级联并发点播和录像下载的问题 2023-05-08 17:18:08 +08:00
648540858
490c55381f 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:59:12 +08:00
648540858
e2f9ee8f7b 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题 2023-05-06 17:40:57 +08:00
648540858
91bfbc36f1 优化设备注册，支持到期续订，优化国标级联到期续订。 2023-03-28 14:09:41 +08:00
648540858
4f22994cdb 优化国标级联的更新 2023-03-25 10:04:57 +08:00
648540858
bc7cc73d52 修复可空时间参数的校验 #784 2023-03-22 15:21:22 +08:00
648540858
5fab97cf7e 支持不同域的前后端分离部署 2023-03-15 19:05:56 +08:00
648540858
048a6ce072 优化报警时间 2023-03-08 11:42:28 +08:00
648540858
a7c3cf5316 优化跨域配置，支持同域的前后端分离部署 2023-03-05 09:53:26 +08:00
648540858
4446218f9e 修复通道导入bug 2023-02-20 15:21:41 +08:00
648540858
7be636f8b8 修复更新通道是更新各个坐标系德位置信息 2023-02-15 18:30:35 +08:00
648540858
03ee15ece2
Merge pull request #741 from gaofuwang/wvp-28181-2.0 
修复WVP作为下级平台接收上级平台DeviceControl、RecordInfo信令处理问题和Alarm信令上报上级平台问题
 2023-02-09 14:13:44 +08:00
gaofw189
55ee6f5f0d 修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑 2023-02-07 09:26:08 +08:00
gaofw189
25fca14e62 修复WVP作为下级平台接受deviceControl指令的问题-修复指令响应 2023-02-06 10:35:32 +08:00
gaofw189
7a9f001dcb 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。 2023-02-02 18:21:25 +08:00
lin
2d492c5b6b 国标回放超时时间使用点播超时一样的字段 2023-02-01 10:09:01 +08:00
648540858
fd3a4ef472 修复国标录像回放以及录像下载 2023-01-06 11:43:27 +08:00
648540858
09a23bc80e 修复布防撤防 #717 2023-01-05 17:49:34 +08:00
jiang
37e973949f 优化兼容接口 2022-12-28 10:58:48 +08:00
648540858
276f077dc7 优化接口 2022-12-23 16:52:30 +08:00
648540858
c1145a8163 优化级联注册，以及sip日志 2022-12-12 10:28:36 +08:00
648540858
131ea77669 接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址 2022-12-06 10:33:43 +08:00
648540858
f89491ada3 修复单端口模式下ssrc的释放 #667 2022-11-25 14:38:46 +08:00
648540858
1983b8b0a7 国标级联->选择通道支持移除目前下所有以及全部添加到目录下 2022-11-22 12:55:29 +08:00
648540858
8cab9f23b0 修复使用来源IP作为流ip配置 2022-11-21 10:07:27 +08:00
648540858
23710f1c64 优化多网卡下的localIp获取 2022-11-17 17:01:54 +08:00
648540858
d340a37a00 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-11-17 11:31:30 +08:00
648540858
694076dc8c 优化国标级联发流并发能力 2022-11-16 09:39:27 +08:00
648540858
8870f5f5a1 优化使用来源ip作为流ip 2022-11-10 09:40:01 +08:00
648540858
96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
 2022-11-08 20:43:25 +08:00
WuPeng
ab909feedf 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +08:00
648540858
aed45e0f0d 优化多网卡 2022-10-28 16:40:12 +08:00
648540858
55b53caef1 支持手动添加，为设备设置单独的密码 2022-10-18 17:35:44 +08:00
648540858
470be2dc36 修复开始点播功能接口调用返回参数与定义的不符 #635 2022-10-18 17:35:32 +08:00
648540858
a4f48a1522 修复回看控制失效 #619 2022-09-30 17:54:58 +08:00
648540858
4c6c77be7a 异常情况打印信息优化 2022-09-23 23:15:44 +08:00
648540858
cd117ed228 dialog去除以及异常情况处理优化 2022-09-23 23:15:39 +08:00
648540858
710600db6f 优化sip消息，去除自动dialog创建 2022-09-21 18:18:37 +08:00
648540858
3146e63fc0 优化异常处理 2022-09-01 17:53:00 +08:00
648540858
2de4c322f6 去除对redis key过期事件的使用；重构国标级联的注册保活 2022-08-31 11:29:13 +08:00
648540858
9e2630ee32 增加zlm心跳超时的判定时间 2022-08-29 14:04:54 +08:00
648540858
9f680a2e9e 修复bug以及日志按照，错误/sip/数据库 分割 2022-08-26 18:03:09 +08:00
648540858
f24b6fa13f 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858
042b28b2d6 支持全局异常和统一返回结果 2022-08-22 16:17:28 +08:00