Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,147 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

298 Commits (5bde5ff5f2f6d4fbd14a40189ed7ac88f9e7eca5)

Author SHA1 Message Date
648540858 b78e6dfd70 Merge branch 'master' into dev/数据库统合 2024-12-16 17:55:46 +08:00
648540858 b37b9f3b03 支持配置管理页面登录超时时间 2024-12-16 16:14:28 +08:00
648540858 3e78af64de 增加RPC录像列表查询 2024-12-13 15:02:06 +08:00
648540858 72da4cfa3c Merge branch 'master' into dev/数据库统合 
# Conflicts:
#	README.md
 2024-12-09 15:47:15 +08:00
648540858 5777a8e93c 去除动态数据库切换 2024-12-06 17:11:22 +08:00
648540858 0cacdb5928 增加数据库结构以及接口 2024-11-20 22:33:21 +08:00
648540858 6e8c7708b5 恢复application.yml默认值 2024-11-11 18:07:22 +08:00
648540858 efc62ed3f1 优化预置位/自动扫描/巡航设置 2024-11-11 18:06:58 +08:00
648540858 711fefa168 去除不常用的日志文件打印 2024-11-03 07:38:42 +08:00
648540858 71c0de2aa9 初步实现前端展示 2024-11-01 14:51:11 +08:00
648540858 effb705f99 支持服务端日志传入前端 2024-10-31 17:37:34 +08:00
648540858 6141a8bc45 增强心跳消息并发处理 2024-10-30 15:19:38 +08:00
648540858 2492b0d638 修复 SiP消息超时未未回复无法识别的BUG 2024-10-16 17:17:17 +08:00
648540858 38f476c86b 调整配置文件详情名称便于新手理解 2024-10-13 20:54:33 +08:00
648540858 183183568b 恢复application配置 2024-10-12 09:11:46 +08:00
648540858 37a3f56ffd 调整配置以及数据库目录 2024-10-12 09:11:21 +08:00
648540858 3e0170b164 调整配置以及数据库目录 2024-10-11 15:28:19 +08:00
648540858 8ef8773db6 调整国标级联时设备信息的获取 2024-09-28 14:04:43 +08:00
648540858 800d6c926a 修复数据库语法兼容以及redis接收推流信息导入 2024-09-14 15:19:07 +08:00
648540858 5a259aaa63 临时提交 2024-08-24 00:18:54 +08:00
648540858 2f4d983f9f 修复拉流看方式回显 2024-07-22 11:07:58 +08:00
panlinlin 1dc0cb0c83 临时提交 2024-07-19 20:29:10 +08:00
648540858 52aa4e6e85 实现GbChannelServiceImpl 2024-07-05 17:22:21 +08:00
648540858 b2aa5c839d 临时提交 2024-06-27 17:51:13 +08:00
648540858 68fce9177f 临时提交 2024-06-25 16:45:31 +08:00
648540858 da2662ab27 国标28181-支持自动识别网卡监听，可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858 c1b0365b02 增加设备上线判断双逻辑，兼容华为设备（前一条的描述大华是错误的，大华没有这个问题）注册后不再发送注册的设备 2024-06-12 11:16:21 +08:00
648540858 0ac27b03ff 增加设备上线判断双逻辑，兼容大华注册后不再发送注册的设备 2024-06-12 11:10:10 +08:00
648540858 2c89fae49a Merge branch 'refs/heads/2.7.1' 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
 2024-05-23 17:32:15 +08:00
648540858 2daa59d78c 支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题 2024-05-23 17:10:45 +08:00
648540858 b57dbeac13 优化通道更新 2024-04-20 18:58:53 +08:00
648540858 3639d2224d 临时提交 2024-04-18 17:22:25 +08:00
648540858 6025eb29fd 添加注释 2024-04-18 16:30:21 +08:00
648540858 55a240bb45 临时提交 2024-04-18 15:52:34 +08:00
648540858 313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858 bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
leesam 23beb4fde0 Merge branch 'master' into develop-add-api-key 2024-04-01 09:19:46 +08:00
leesam 24b4f02a70 [bugfix]读取jwk的Bug修复 2024-03-20 11:05:57 +08:00
leesam 76208975bf [add]支持其他平台通过ApiKey调用系统相关接口 2024-03-19 16:53:01 +08:00
648540858 00fb00a4c3 修复dev配置文件中的logback-spring配置 2024-03-16 21:37:44 +08:00
648540858 2e7c9a7341 Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml
 2024-02-07 20:30:37 +08:00
648540858 fc74ce9de4 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/resources/application-dev.yml
 2024-01-31 17:25:32 +08:00
648540858 68fbc8fef1 优化跨域配置，默认允许全部跨域 2024-01-31 17:23:47 +08:00
648540858 97a87542a6 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	pom.xml
 2024-01-22 10:37:13 +08:00
648540858 9a89cf81b8 添加多数据源配置实例 2024-01-22 00:33:04 +08:00
648540858 a2cac5ca12 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	pom.xml
 2024-01-04 18:34:46 +08:00
648540858 6120e6bd7b 添加金仓数据库x86驱动，优化兼容接口通道列表查询。修复多个通道同时推送 2024-01-04 17:26:47 +08:00
648540858 67d1ff0d26 Merge branch 'wvp-28181-2.0' into feature/record 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-12-18 14:23:48 +08:00
648540858 df3f5795e7 修复非鉴权接口的跨域失败问题 2023-12-15 17:45:47 +08:00
648540858 eac72fd06e 优化日志打印样式 2023-12-13 14:37:08 +08:00