去除jedis，方便支持redis集群

648540858

2022-08-10 82ab6b1760b8787e31bed4020a0831c64fa05077

去除jedis，方便支持redis集群

 pom.xml

@@ -61,13 +61,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
             <exclusions>
                <!-- 去掉  Lettuce 的依赖，  Spring Boot 优先使用 Lettuce 作为 Redis 客户端 -->
                <exclusion>
                    <groupId>io.lettuce</groupId>
                    <artifactId>lettuce-core</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -92,11 +85,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>

        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
        </dependency>

        <!-- druid数据库连接池 -->

 src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java

@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.conf;



import com.alibaba.fastjson.parser.ParserConfig;

import com.genersoft.iot.vmp.common.VideoManagerConstants;

import com.genersoft.iot.vmp.service.impl.*;

import org.apache.commons.lang3.StringUtils;

@@ -9,15 +10,14 @@
import org.springframework.context.annotation.Bean;

import org.springframework.context.annotation.Configuration;

import org.springframework.data.redis.connection.RedisConnectionFactory;

import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;

import org.springframework.data.redis.core.RedisTemplate;

import org.springframework.data.redis.listener.PatternTopic;

import org.springframework.data.redis.listener.RedisMessageListenerContainer;

import org.springframework.data.redis.serializer.StringRedisSerializer;



import com.alibaba.fastjson.parser.ParserConfig;

import com.genersoft.iot.vmp.utils.redis.FastJsonRedisSerializer;

import redis.clients.jedis.JedisPool;

import redis.clients.jedis.JedisPoolConfig;





/**

 * @description:Redis中间件配置类，使用spring-data-redis集成，自动从application.yml中加载redis配置

@@ -27,23 +27,6 @@
 */

@Configuration

public class RedisConfig extends CachingConfigurerSupport {



    @Value("${spring.redis.host}")

    private String host;

    @Value("${spring.redis.port}")

    private int port;

    @Value("${spring.redis.database}")

    private int database;

    @Value("${spring.redis.password}")

    private String password;

    @Value("${spring.redis.timeout}")

    private int timeout;

    @Value("${spring.redis.poolMaxTotal:1000}")

    private int poolMaxTotal;

    @Value("${spring.redis.poolMaxIdle:500}")

    private int poolMaxIdle;

    @Value("${spring.redis.poolMaxWait:5}")

    private int poolMaxWait;



    @Autowired

    private RedisGpsMsgListener redisGPSMsgListener;

@@ -61,36 +44,24 @@
    private RedisPushStreamStatusMsgListener redisPushStreamStatusMsgListener;



    @Bean

    public JedisPool jedisPool() {

        if (StringUtils.isBlank(password)) {

            password = null;

        }

        JedisPoolConfig poolConfig = new JedisPoolConfig();

        poolConfig.setMaxIdle(poolMaxIdle);

        poolConfig.setMaxTotal(poolMaxTotal);

        // 秒转毫秒

        poolConfig.setMaxWaitMillis(poolMaxWait * 1000L);

        JedisPool jp = new JedisPool(poolConfig, host, port, timeout * 1000, password, database);

        return jp;

    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {

        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();

        // 使用fastJson序列化

        FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer(Object.class);

        // value值的序列化采用fastJsonRedisSerializer

        redisTemplate.setValueSerializer(fastJsonRedisSerializer);

        redisTemplate.setHashValueSerializer(fastJsonRedisSerializer);

        // 全局开启AutoType，不建议使用

         ParserConfig.getGlobalInstance().setAutoTypeSupport(true);

        // 建议使用这种方式，小范围指定白名单，需要序列化的类

//        ParserConfig.getGlobalInstance().addAccept("com.avatar");

        // key的序列化采用StringRedisSerializer

        redisTemplate.setKeySerializer(new StringRedisSerializer());

        redisTemplate.setHashKeySerializer(new StringRedisSerializer());

        redisTemplate.setConnectionFactory(redisConnectionFactory);

        return redisTemplate;

    }



    @Bean("redisTemplate")

    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {

        RedisTemplate<Object, Object> template = new RedisTemplate<>();

        template.setConnectionFactory(redisConnectionFactory);

        // 使用fastjson进行序列化处理，提高解析效率

        FastJsonRedisSerializer<Object> serializer = new FastJsonRedisSerializer<Object>(Object.class);

        // value值的序列化采用fastJsonRedisSerializer

        template.setValueSerializer(serializer);

        template.setHashValueSerializer(serializer);

        // key的序列化采用StringRedisSerializer

        template.setKeySerializer(new StringRedisSerializer());

        template.setHashKeySerializer(new StringRedisSerializer());

        template.setConnectionFactory(redisConnectionFactory);

        // 使用fastjson时需设置此项，否则会报异常not support type

        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);

        return template;

    }



    /**

     * redis消息监听器容器 可以添加多个监听不同话题的redis监听器，只需要把消息监听器和相应的消息订阅处理器绑定，该消息监听器


 src/main/java/com/genersoft/iot/vmp/conf/RedisKeyExpirationEventMessageListener.java

@@ -28,7 +28,7 @@
            RedisConnection connection = this.listenerContainer.getConnectionFactory().getConnection();
            Properties config = connection.getConfig("notify-keyspace-events");
            try {
                if (!config.getProperty("notify-keyspace-events").equals(keyspaceNotificationsConfigParameter)) {
                if (!keyspaceNotificationsConfigParameter.equals(config.getProperty("notify-keyspace-events"))) {
                    connection.setConfig("notify-keyspace-events", keyspaceNotificationsConfigParameter);
                }
            } finally {

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -445,12 +445,15 @@
                if (streamInfo!=null){

                    redisCatchStorage.stopPlay(streamInfo);

                    storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());

                    // 如果正在给上级推送，则发送bye



                }else{

                    streamInfo = redisCatchStorage.queryPlayback(null, null, stream, null);

                    if (streamInfo != null) {

                        redisCatchStorage.stopPlayback(streamInfo.getDeviceID(), streamInfo.getChannelId(),

                                streamInfo.getStream(), null);

                    }

                    // 如果正在给上级推送，则发送bye

                }

            }else {

                if (!"rtp".equals(app)){


 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -36,7 +36,6 @@
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.utils.redis.JedisUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;

@@ -90,9 +89,6 @@

    @Autowired
    private EventPublisher publisher;

    @Autowired
    JedisUtil jedisUtil;

    /**
     * 初始化

 src/main/java/com/genersoft/iot/vmp/utils/redis/JedisUtil.java

File was deleted

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -148,6 +148,8 @@
        // 超时处理
        result.onTimeout(()->{
            logger.warn(String.format("设备预览/回放停止超时，deviceId/channelId：%s_%s ", deviceId, channelId));
            redisCatchStorage.stopPlay(streamInfo);
            storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
            RequestMessage msg = new RequestMessage();
            msg.setId(uuid);
            msg.setKey(key);