Merge branch '2.6.7' into wvp-28181-2.0

# Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2023-04-08 15:29:15 +08:00
parent 59ab2adb2e 0858f7995b
commit 8c4922cbe1
11 changed files with 217 additions and 241 deletions
--- a/src/main/java/com/genersoft/iot/vmp/utils/ConfigConst.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/ConfigConst.java
@@ -1,8 +0,0 @@
-package com.genersoft.iot.vmp.utils;
-
-public class ConfigConst {
-    /**
-     * 播流最大并发个数
-     */
-    public static final Integer MAX_STRTEAM_COUNT = 10000;
-}