648540858 e5fd66ef96 Merge branch 'master' into 重构/1078 ...

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java

2024-11-10 15:29:53 +08:00

..

common

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

conf

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

gb28181

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

jt1078

修复启动异常

2024-10-21 06:57:53 +08:00

media

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

service

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

storager

移除操作日志记录到数据库功能

2024-10-29 16:56:14 +08:00

streamProxy

修复国标点播缓存启动未清理的BUG

2024-10-25 17:41:50 +08:00

streamPush

策略配置文件增加注释与使用Lombok

2024-10-30 15:19:17 +08:00

utils

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

vmanager

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

web/gb28181

移除旧的数据库操作类

2024-09-24 15:59:47 +08:00

VManageBootstrap.java

优化报警推送

2024-10-28 17:53:27 +08:00