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

1127 Commits (d295f3c51271c26a5f65c0184bfa27fe1af80f54)

Author SHA1 Message Date
648540858 d295f3c512 修复合并后的问题 2023-04-18 14:06:07 +08:00
648540858 66ab09396c Merge branch 'wvp-28181-2.0' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-04-04 09:18:33 +08:00
648540858 b4048fbe80 合并开源主线 2023-04-04 09:09:07 +08:00
648540858 786c76ba71 Merge branch 'main' into main-dev 2023-04-03 18:39:29 +08:00
648540858 617c407318 兼容设备 2023-04-03 18:39:11 +08:00
648540858 f89ef3abf4 优化移动位置notify消息处理 2023-04-03 15:06:08 +08:00
648540858 4f2d47385d 去除redis工具类直接使用RedisTemplate存取数据 2023-04-03 10:26:55 +08:00
648540858 053cd130aa 修复 设备注册时报错 #799 2023-03-31 09:10:16 +08:00
648540858 056162d742 去除测试代码 2023-03-31 09:03:14 +08:00
648540858 e166cc366c Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-03-31 09:00:36 +08:00
648540858 c953943083 处理警告 2023-03-31 09:00:04 +08:00
648540858 1421b4743c 修复SQL错误 #802 2023-03-31 08:59:03 +08:00
648540858 2e5d94181a 支持修改页面展示的sip ip 2023-03-31 08:56:54 +08:00
648540858 8a590d5c39
Merge pull request #800 from yjkhtddx/wvp-28181-2.0 
优先使用SIP认证用户名
 2023-03-30 09:01:36 +08:00
刘跃龙 ed5dde81f6 优先使用SIP认证用户名 2023-03-29 09:59:47 +08:00
648540858 6c969a63dd 去除druid数据库连接池，使用spring支持的hikari 2023-03-29 09:44:45 +08:00
648540858 3227dcd082 添加兼容接口预置位添加调用删除，列表查询 2023-03-28 17:56:43 +08:00
648540858 91bfbc36f1 优化设备注册，支持到期续订，优化国标级联到期续订。 2023-03-28 14:09:41 +08:00
648540858 58d1f0ea16 修复云端录像界面 2023-03-27 15:47:04 +08:00
648540858 3b1516afe5 优化录像配置。不再使用zlm默认的http服务器 2023-03-25 18:40:29 +08:00
648540858 4f22994cdb 优化国标级联的更新 2023-03-25 10:04:57 +08:00
648540858 193e1a24a1 优化对assist接口的代理 2023-03-23 20:52:05 +08:00
648540858 a4328e3d4f 修复关闭接口鉴权后跨域设置失效的问题 2023-03-23 08:52:35 +08:00
648540858 f210952ed2 优化国标级联中的通道全部导入 2023-03-22 15:21:22 +08:00
xiaoQQya de969b7760 fix(snap): 修复 rtsp 端口为空时使用 mp4 协议截图失败的问题 2023-03-22 15:21:22 +08:00
648540858 c85c994972 修复设备点播时指定流媒体 2023-03-22 15:21:22 +08:00
648540858 66234dc288 优化点播后截图以及截图的展示 2023-03-22 15:21:22 +08:00
xiaoQQya df9f6a8927 perf(streamInfo): 优化点播接口返回流信息中的 RTMP/RTSP/RTC 链接 2023-03-22 15:21:22 +08:00
xiaoQQya 713aa00acc perf(snap): 优化点播成功后截图使用 rtsp 流, 新增对 H265 编码视频截图的支持 2023-03-22 15:21:22 +08:00
逐浪人 3fd60f8676 Update UserController.java 
修复修改密码报错，传递id参数为0的bug
 2023-03-22 15:21:22 +08:00
648540858 bc7cc73d52 修复可空时间参数的校验 #784 2023-03-22 15:21:22 +08:00
648540858 82adc0cb23 完善语音对讲级联 2023-03-21 15:55:24 +08:00
648540858 4eac6dcc94 修复启动偶现报错 2023-03-21 14:22:40 +08:00
648540858 455e58f866 优化合并对讲broadcast级联模式 2023-03-21 14:21:45 +08:00
648540858 6b1d966255 优化合并对讲broadcast级联模式 2023-03-21 10:27:07 +08:00
648540858 4362a5b499 主线合并对讲broadcast级联模式 2023-03-20 15:42:59 +08:00
648540858 26bdf2e776 Merge branch '级联' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue
 2023-03-20 15:31:43 +08:00
648540858 b3c4636520 主线合并talk模式 2023-03-20 14:40:17 +08:00
648540858 039fbf7e24 Merge branch 'talk' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-03-20 14:32:53 +08:00
648540858 a000ed6062 完善talk模式 2023-03-20 14:20:28 +08:00
StreamLuna eb173b1b24 fix: 根据国标设备编号查询设备没有返回通道数 2023-03-20 10:58:44 +08:00
648540858 ebe24a6c32 优化redis连接 2023-03-20 10:05:00 +08:00
648540858 782300452c 优化对海康平台的兼容性 2023-03-17 17:08:37 +08:00
648540858 d3027b0668 优化消息通道 2023-03-17 15:14:00 +08:00
648540858 22a205e8fc 优化异常处理 2023-03-17 14:02:16 +08:00
648540858 c3ce2bc5d0 优化异常处理以及级联设备状态查询 2023-03-17 13:22:05 +08:00
648540858 72b9239c5a 优化消息通道 2023-03-16 20:32:22 +08:00
648540858 eec4e347d7 优化端口保持 2023-03-16 20:19:00 +08:00
648540858 bb3f219a61 国标级联回复目录数据中添加云台类型 2023-03-15 23:28:22 +08:00
648540858 2bf07305aa Merge branch 'wvp-28181-2.0' into wvp-jwt-token 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/resources/all-application.yml
 2023-03-15 22:58:28 +08:00