Commit Graph

13 Commits (2a4a0d36f2837e25dc9d937c96d2b950cf74a421)

Author SHA1 Message Date
648540858 8805966f89 优化拉流代理启停 2024-01-13 00:40:41 +08:00
648540858 fb39e4ff0e Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
2024-01-10 19:19:28 +08:00
648540858 a23c1aca40 合并269分支修复的内容 2024-01-10 19:14:11 +08:00
648540858 81a32fdb47 Merge branch '2.6.9' into wvp-28181-2.0 2024-01-10 19:12:06 +08:00
648540858 29f7a6b6eb 修复多wvp模式推流时信息存储错误 2024-01-10 18:55:14 +08:00
648540858 8db0192a27 添加拉流代理接口-新增拉流代理 2024-01-07 23:57:33 +08:00
648540858 7fd03a50a0 临时提交 2024-01-05 16:58:31 +08:00
648540858 2d5aa1e549 优化数据库 2024-01-03 15:58:01 +08:00
648540858 07503d6111 Merge branch 'wvp-28181-2.0' into 结构优化 2024-01-03 15:51:22 +08:00
648540858 9d61a93077 优化数据库sql文件组织方式 2024-01-03 15:50:47 +08:00
648540858 b4fb076246 Merge branch 'wvp-28181-2.0' into 结构优化
# Conflicts:
#	sql/2.6.9更新.sql
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
#	数据库/old/common.sql
2024-01-03 15:35:21 +08:00
648540858 f36eb7ebeb 添加打包文件 2023-11-02 14:17:20 +08:00
648540858 84c78be91c sql重命名为数据库 2023-11-01 15:36:35 +08:00