diff --git a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java deleted file mode 100644 index 0035248c..00000000 --- a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.genersoft.iot.vmp.conf.redis; - - -import com.alibaba.fastjson2.support.spring.data.redis.GenericFastJsonRedisSerializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.annotation.Order; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -import org.springframework.data.redis.listener.PatternTopic; -import org.springframework.data.redis.listener.RedisMessageListenerContainer; - - -/** - * Redis中间件配置类,使用spring-data-redis集成,自动从application.yml中加载redis配置 - * swwheihei - * 2019年5月30日 上午10:58:25 - * - */ -@Configuration -@Order(value=1) -public class RedisConfig { - - - @Bean - public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { - RedisTemplate redisTemplate = new RedisTemplate<>(); - // 使用fastJson序列化 - GenericFastJsonRedisSerializer fastJsonRedisSerializer = new GenericFastJsonRedisSerializer(); - // value值的序列化采用fastJsonRedisSerializer - redisTemplate.setValueSerializer(fastJsonRedisSerializer); - redisTemplate.setHashValueSerializer(fastJsonRedisSerializer); - - // key的序列化采用StringRedisSerializer - redisTemplate.setKeySerializer(new StringRedisSerializer()); - redisTemplate.setHashKeySerializer(new StringRedisSerializer()); - redisTemplate.setConnectionFactory(redisConnectionFactory); - return redisTemplate; - } -} diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java index ea248fde..e6bbb5fa 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java @@ -1,13 +1,10 @@ package com.genersoft.iot.vmp.media.zlm.dto; -import com.genersoft.iot.vmp.gb28181.session.SSRCFactory; import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.util.ObjectUtils; -import java.util.HashMap; - @Schema(description = "流媒体服务信息") public class MediaServerItem{ @@ -80,20 +77,10 @@ public class MediaServerItem{ @Schema(description = "是否是默认ZLM") private boolean defaultServer; -// @Schema(description = "SSRC信息") -// private SsrcConfig ssrcConfig; - @Schema(description = "当前使用到的端口") private int currentPort; - /** - * 每一台ZLM都有一套独立的SSRC列表 - * 在ApplicationCheckRunner里对mediaServerSsrcMap进行初始化 - */ - @Schema(description = "ID") - private HashMap mediaServerSsrcMap; - public MediaServerItem() { } @@ -279,14 +266,6 @@ public class MediaServerItem{ this.updateTime = updateTime; } - public HashMap getMediaServerSsrcMap() { - return mediaServerSsrcMap; - } - - public void setMediaServerSsrcMap(HashMap mediaServerSsrcMap) { - this.mediaServerSsrcMap = mediaServerSsrcMap; - } - public int getCurrentPort() { return currentPort; } diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index 07177f08..856359cd 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -10,8 +10,6 @@ import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.gb28181.event.EventPublisher; import com.genersoft.iot.vmp.gb28181.session.SSRCFactory; -import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager; -import com.genersoft.iot.vmp.gb28181.session.SsrcConfig; import com.genersoft.iot.vmp.media.zlm.AssistRESTfulUtils; import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;