Commit Graph

556 Commits

Author SHA1 Message Date
648540858
2060a2117c 优化编码信息的展示 2024-11-14 17:05:12 +08:00
648540858
34e8ed70c7 优化zlm接入逻辑 2024-11-14 12:31:35 +08:00
648540858
c9e2ad1b45 优化运维中心样式 2024-11-04 15:46:03 +08:00
648540858
f106675dc6 支持历史日志的查看,过滤以及下载 2024-11-03 14:37:30 +08:00
648540858
711fefa168 去除不常用的日志文件打印 2024-11-03 07:38:42 +08:00
648540858
a6993b35fd 实现日志文件检索和日志文件下载接口 2024-11-03 00:32:39 +08:00
shaowei
8384736c22 修复因为int自动装箱导致year和month为空时,接口报错 2024-10-31 01:16:25 +08:00
648540858
98b4566c6c 移除操作日志记录到数据库功能 2024-10-29 16:56:14 +08:00
648540858
059635c2cc 修复国标点播缓存启动未清理的BUG 2024-10-25 17:41:50 +08:00
648540858
34cc8251e2 优化国标设备点播的信息的Redis缓存策略 2024-10-25 14:46:51 +08:00
648540858
0ddc374c34 修复多zlm节点上线时的空指针异常+单端口收流未设置到zlm的BUG 2024-10-24 15:55:38 +08:00
648540858
b9738c6bfc 修复 角色查询中的重复调用 #1496 2024-10-15 17:17:10 +08:00
648540858
3078162c58 优化文档, 优化notify-catalog大并发处理 2024-10-11 15:24:46 +08:00
648540858
3140672e63 修复国标录像下载 2024-09-10 16:50:54 +08:00
648540858
da441a67f8 临时提交 2024-09-06 17:56:24 +08:00
648540858
cce1d1de40 重构INVITE消息处理中的上级点播请求 2024-08-14 17:19:19 +08:00
648540858
b246fd6a20 临时提交 2024-07-26 17:53:10 +08:00
648540858
6bd0cdd37b 临时提交 2024-07-23 18:00:47 +08:00
648540858
6619c5c53d 临时提交 2024-07-11 18:25:16 +08:00
648540858
a084fac7cd 优化通道数据显示 2024-07-10 17:33:04 +08:00
648540858
b843958ed7 临时提交 2024-07-10 14:43:22 +08:00
panlinlin
aa9397ca21 临时提交 2024-07-10 00:07:01 +08:00
648540858
046e7802f3 临时提交 2024-07-09 17:55:51 +08:00
648540858
b98cfd1fed 使用Slf4j注解打印日志 2024-07-03 17:24:35 +08:00
648540858
adf040ec4b 优化日志以及属性设置代码 2024-07-03 17:09:49 +08:00
648540858
88c021948f 临时提交 2024-06-27 18:41:58 +08:00
648540858
400eef2d2e 临时提交 2024-06-27 16:02:43 +08:00
648540858
f32eb14125 临时提交 2024-06-26 18:36:32 +08:00
648540858
7255e5a887 临时提交 2024-06-25 16:59:22 +08:00
648540858
e4c11bfebe Merge branch 'refs/heads/master' into dev/master-通道结构重构
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
2024-06-25 16:46:47 +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
306c42b4b7 临时提交 2024-06-20 22:29:50 +08:00
648540858
1909c7f71f 调整参数名称 2024-06-17 10:08:09 +08:00
648540858
b1d9ea8082 Merge pull request #1492 from iwanlebron/master
修复参数名称
2024-06-17 10:06:51 +08:00
648540858
f3ea07bdcd 调整转码后的流的输出位置 2024-06-14 17:03:55 +08:00
648540858
da2662ab27 国标28181-支持自动识别网卡监听,可以不再配置SIP.IP 2024-06-13 18:10:01 +08:00
648540858
2cf7178cb7 Merge branch 'refs/heads/2.7.1' 2024-06-11 10:14:14 +08:00
648540858
f8ef14bfea 修复移动位置位置订阅上报间隔为0的bug 2024-06-11 10:08:13 +08:00
Iwan Lebron
f6157cc42c 修复参数名称 2024-06-10 09:18:37 +08:00
648540858
764d04b497 调整上级观看消息的发送 2024-05-29 15:02:51 +08:00
648540858
3a056acbc1 合并271分支 2024-05-24 10:18:29 +08:00
648540858
aeeb61d141 合并271分支 2024-05-23 17:47:43 +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
d70bfb53dd 修复兼容zlm-pro转码时无人管看自动移除失败的BUG 2024-05-20 11:37:07 +08:00
648540858
186b00e9b3 支持下载多个云端录像的zip压缩包 2024-05-08 11:18:47 +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
3639d2224d 临时提交 2024-04-18 17:22:25 +08:00
648540858
f34143df6d 修改totalReaderCount类型 2024-04-12 10:36:18 +08:00
648540858
b45d71ba6d Merge pull request #1389 from ancienter/develop-add-api-key
[add]新增ApiKey管理功能
2024-04-10 22:56:14 +08:00
648540858
f458c9b793 优化代码调用 2024-04-10 22:38:12 +08:00