From 26ab11eb011f04b44edf7d5c7117408d4d761d02 Mon Sep 17 00:00:00 2001 From: jmxd <838425805@qq.com> Date: Sat, 15 Apr 2023 09:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E9=9B=86=E7=BE=A4=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cluster/MagicClusterConfiguration.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/magic-api-plugins/magic-api-plugin-cluster/src/main/java/org/ssssssss/magicapi/cluster/MagicClusterConfiguration.java b/magic-api-plugins/magic-api-plugin-cluster/src/main/java/org/ssssssss/magicapi/cluster/MagicClusterConfiguration.java index ee7ed3c1..7e2b69ad 100644 --- a/magic-api-plugins/magic-api-plugin-cluster/src/main/java/org/ssssssss/magicapi/cluster/MagicClusterConfiguration.java +++ b/magic-api-plugins/magic-api-plugin-cluster/src/main/java/org/ssssssss/magicapi/cluster/MagicClusterConfiguration.java @@ -2,15 +2,11 @@ package org.ssssssss.magicapi.cluster; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.listener.ChannelTopic; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.ssssssss.magicapi.core.config.MagicAPIProperties; @@ -19,9 +15,10 @@ import org.ssssssss.magicapi.core.model.MagicNotify; import org.ssssssss.magicapi.core.model.Plugin; import org.ssssssss.magicapi.core.service.MagicAPIService; import org.ssssssss.magicapi.core.service.MagicNotifyService; +import org.ssssssss.magicapi.redis.RedisModule; import org.ssssssss.magicapi.utils.JsonUtils; -import java.util.Objects; +import java.util.Arrays; @EnableConfigurationProperties(ClusterConfig.class) @@ -32,14 +29,11 @@ public class MagicClusterConfiguration implements MagicPluginConfiguration { private final MagicAPIProperties properties; - private final StringRedisTemplate stringRedisTemplate; - private final Logger logger = LoggerFactory.getLogger(MagicClusterConfiguration.class); - public MagicClusterConfiguration(MagicAPIProperties properties, ClusterConfig config, ObjectProvider stringRedisTemplateProvider) { + public MagicClusterConfiguration(MagicAPIProperties properties, ClusterConfig config) { this.properties = properties; this.config = config; - this.stringRedisTemplate = stringRedisTemplateProvider.getIfAvailable(); } @Override @@ -52,8 +46,8 @@ public class MagicClusterConfiguration implements MagicPluginConfiguration { */ @Bean @ConditionalOnMissingBean - public MagicNotifyService magicNotifyService() { - return magicNotify -> stringRedisTemplate.convertAndSend(config.getChannel(), Objects.requireNonNull(JsonUtils.toJsonString(magicNotify))); + public MagicNotifyService magicNotifyService(RedisModule redisModule) { + return magicNotify -> redisModule.execute("publish", Arrays.asList(config.getChannel(), JsonUtils.toJsonString(magicNotify))); } /**