diff --git a/common/common-redis/src/main/java/com/tacit/common/redis/config/RedisConfig.java b/common/common-redis/src/main/java/com/tacit/common/redis/config/RedisConfig.java index ef6caf0..6931b3a 100644 --- a/common/common-redis/src/main/java/com/tacit/common/redis/config/RedisConfig.java +++ b/common/common-redis/src/main/java/com/tacit/common/redis/config/RedisConfig.java @@ -10,11 +10,12 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; @Configuration -@ComponentScan(basePackages = "com.tacit.common.redis") +@ComponentScan(basePackages = "com.tacit.common.redis.utils") public class RedisConfig { @Bean @@ -48,4 +49,11 @@ public class RedisConfig { template.afterPropertiesSet(); return template; } + + @Bean + public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory factory) { + StringRedisTemplate template = new StringRedisTemplate(); + template.setConnectionFactory(factory); + return template; + } } \ No newline at end of file diff --git a/common/common-redis/src/main/java/com/tacit/common/redis/utils/RedisUtils.java b/common/common-redis/src/main/java/com/tacit/common/redis/utils/RedisUtils.java index 3346b52..d1586dd 100644 --- a/common/common-redis/src/main/java/com/tacit/common/redis/utils/RedisUtils.java +++ b/common/common-redis/src/main/java/com/tacit/common/redis/utils/RedisUtils.java @@ -6,7 +6,10 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; /** @@ -17,10 +20,10 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component public class RedisUtils { - @Autowired(required = false) + @Autowired private RedisTemplate redisTemplate; - @Autowired(required = false) + @Autowired private StringRedisTemplate stringRedisTemplate; // ============================ String ============================= diff --git a/tacit-admin/src/main/java/com/tacit/admin/AdminApplication.java b/tacit-admin/src/main/java/com/tacit/admin/AdminApplication.java index fd89c0e..a0a7f55 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/AdminApplication.java +++ b/tacit-admin/src/main/java/com/tacit/admin/AdminApplication.java @@ -1,13 +1,15 @@ package com.tacit.admin; +import com.tacit.common.redis.config.RedisConfig; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; @SpringBootApplication +@Import(RedisConfig.class) @MapperScan("com.tacit.admin.mapper") @EnableDiscoveryClient @EnableFeignClients(basePackages = "com.tacit.common.feign") @@ -16,4 +18,4 @@ public class AdminApplication { SpringApplication.run(AdminApplication.class, args); System.out.println("====== admin start ======"); } -} +} \ No newline at end of file diff --git a/tacit-app-api/src/main/java/com/tacit/app/AppApiApplication.java b/tacit-app-api/src/main/java/com/tacit/app/AppApiApplication.java index 45c1669..d8d9789 100644 --- a/tacit-app-api/src/main/java/com/tacit/app/AppApiApplication.java +++ b/tacit-app-api/src/main/java/com/tacit/app/AppApiApplication.java @@ -4,9 +4,11 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; +import com.tacit.common.redis.config.RedisConfig; @SpringBootApplication +@Import(RedisConfig.class) @MapperScan("com.tacit.app.mapper") @EnableFeignClients(basePackages = "com.tacit.common.feign") public class AppApiApplication { @@ -14,4 +16,4 @@ public class AppApiApplication { SpringApplication.run(AppApiApplication.class, args); System.out.println("====== app api start ======"); } -} +} \ No newline at end of file diff --git a/tacit-gateway/src/main/java/com/tacit/gateway/GatewayApplication.java b/tacit-gateway/src/main/java/com/tacit/gateway/GatewayApplication.java index 753cb5f..2dc8df7 100644 --- a/tacit-gateway/src/main/java/com/tacit/gateway/GatewayApplication.java +++ b/tacit-gateway/src/main/java/com/tacit/gateway/GatewayApplication.java @@ -1,10 +1,13 @@ package com.tacit.gateway; +import com.tacit.common.redis.config.RedisConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Import; +@Import(RedisConfig.class) @SpringBootApplication @EnableDiscoveryClient public class GatewayApplication {