Commit Graph

357 Commits

Author SHA1 Message Date
648540858
7a39f8a439 Merge branch 'master' into dev/ws-log 2024-11-04 10:16:20 +08:00
648540858
2c4311b58c 修复运维中心中开启历史日志后再开启实时日志连接失败 2024-11-04 10:15:45 +08:00
chipunderblade
a75d364e40 fix: fix swagger incorrect path 2024-11-04 09:06:54 +08:00
648540858
a6993b35fd 实现日志文件检索和日志文件下载接口 2024-11-03 00:32:39 +08:00
648540858
9789fcd3fa 尝试websocket支持登陆 2024-11-02 12:11:52 +08:00
648540858
71c0de2aa9 初步实现前端展示 2024-11-01 14:51:11 +08:00
648540858
effb705f99 支持服务端日志传入前端 2024-10-31 17:37:34 +08:00
648540858
396961ea20 策略配置文件增加注释与使用Lombok 2024-10-30 15:19:17 +08:00
648540858
98b4566c6c 移除操作日志记录到数据库功能 2024-10-29 16:56:14 +08:00
648540858
d2fc2df77b 优化通道刷新的时接收下级消息的效率 2024-10-22 17:41:42 +08:00
648540858
2492b0d638 修复 SiP消息超时未未回复无法识别的BUG 2024-10-16 17:17:17 +08:00
648540858
59a52705cf 临时提交 2024-09-25 14:32:09 +08:00
648540858
3b2a28fd00 移除旧的数据库操作类 2024-09-24 15:59:47 +08:00
648540858
800d6c926a 修复数据库语法兼容以及redis接收推流信息导入 2024-09-14 15:19:07 +08:00
648540858
0722aa3aeb 临时提交 2024-08-22 18:05:57 +08:00
648540858
88abf36d6f 临时提交 2024-08-18 23:01:02 +08:00
648540858
9247c7e805 完善国标级联点播推流,拉流代理,国标 2024-08-17 22:31:13 +08:00
648540858
abed3ecbec 临时提交 2024-08-15 17:45:24 +08:00
panlinlin
76a0d248ef 临时提交 2024-08-10 23:27:21 +08:00
648540858
3ce973d2ee 临时提交 2024-07-30 17:58:18 +08:00
648540858
5a812e7f08 临时提交 2024-07-24 17:54:19 +08:00
648540858
6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858
cb403689b4 添加通道编号构建页面 2024-07-12 17:52:05 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
799932f614 优化日志以及属性设置代码 2024-07-03 16:14:18 +08:00
648540858
57a230afb3 Merge branch 'refs/heads/2.7.1'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
2024-06-25 09:45:34 +08:00
648540858
099c65ff40 调整点播默认超时时间为10秒 2024-06-20 19:30:25 +08:00
panlinlin
7b46769a16 修复国标录像下载后负载统计未清除的BUG 2024-06-13 23:15:51 +08:00
648540858
da2662ab27 国标28181-支持自动识别网卡监听,可以不再配置SIP.IP 2024-06-13 18:10:01 +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
fe9b8154e0 去除调试日志 2024-05-23 17:15:14 +08:00
648540858
2daa59d78c 支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题 2024-05-23 17:10:45 +08:00
648540858
5564cfb384 优化大量notify 移动位置订阅的入库 2024-05-13 17:22:36 +08:00
648540858
39c3274294 合并分支 2024-04-25 17:53:24 +08:00
648540858
d41d6b34af Merge branch 'refs/heads/2.7.0'
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.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/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-04-23 20:59:20 +08:00
648540858
8cba63642f 优化notify消息处理 2024-04-22 20:29:36 +08:00
648540858
b57dbeac13 优化通道更新 2024-04-20 18:58:53 +08:00
648540858
0d0b31f715 临时提交 2024-04-19 10:27:24 +08:00
648540858
0dab86f0b8 临时提交 2024-04-19 10:22:34 +08:00
648540858
9adf12ca6a 临时提交 2024-04-18 17:34:00 +08:00
648540858
3639d2224d 临时提交 2024-04-18 17:22:25 +08:00
648540858
f536123b11 修改toString方法 2024-04-18 17:05:03 +08:00
648540858
2a765a93eb 添加RedisRpcResponse的toString 2024-04-18 17:00:13 +08:00
648540858
6025eb29fd 添加注释 2024-04-18 16:30:21 +08:00
648540858
bf6e09d231 修复多wvp国标级联机制 2024-04-17 12:56:22 +08:00
648540858
f357bece62 优化回调设置方式 2024-04-16 22:22:00 +08:00
648540858
9c6765d44e 重构多wvp国标级联机制 2024-04-16 22:10:35 +08:00
648540858
b4168c02cb 优化多wvp国标级联推流 2024-04-16 00:10:38 +08:00
648540858
f9abfca003 临时提交 2024-04-15 21:33:22 +08:00