648540858 ff5ba1698a Merge branch 'refs/heads/master' into dev/master-通道结构重构 ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

2024-07-22 14:29:54 +08:00

..

common

Merge remote-tracking branch 'gitee-c/dev/master-通道结构重构' into dev/master-通道结构重构

2024-06-26 18:41:37 +08:00

conf

添加通道编号构建页面

2024-07-12 17:52:05 +08:00

gb28181

Merge branch 'refs/heads/master' into dev/master-通道结构重构

2024-07-22 14:29:54 +08:00

jt1078

使用Slf4j注解打印日志

2024-07-03 17:24:35 +08:00

media

临时提交

2024-07-20 06:44:53 +08:00

service

Merge branch 'refs/heads/master' into dev/master-通道结构重构

2024-07-22 14:29:54 +08:00

storager

修复推流信息播放

2024-07-16 17:44:27 +08:00

streamProxy

临时提交

2024-07-22 14:20:40 +08:00

streamPush

优化拉流代理

2024-07-19 17:54:14 +08:00

utils

使用Slf4j注解打印日志

2024-07-03 17:24:35 +08:00

vmanager

临时提交

2024-07-11 18:25:16 +08:00

web/gb28181

临时提交

2024-07-10 14:43:22 +08:00

VManageBootstrap.java

优化日志以及属性设置代码

2024-07-03 17:09:49 +08:00