Skip to content

Commit a558135

Browse files
committed
🐛 Fixing a bug. 解决mica生成的错误的导入文件的问题
1 parent 5df96fb commit a558135

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

src/main/java/com/pig4cloud/plugin/cache/MultilevelCacheAutoConfiguration.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.pig4cloud.plugin.cache;
22

33
import com.pig4cloud.plugin.cache.properties.CacheConfigProperties;
4-
import com.pig4cloud.plugin.cache.support.CacheMessageListener;
5-
import com.pig4cloud.plugin.cache.support.RedisCaffeineCacheManager;
6-
import com.pig4cloud.plugin.cache.support.RedisCaffeineCacheManagerCustomizer;
7-
import com.pig4cloud.plugin.cache.support.ServerIdGenerator;
4+
import com.pig4cloud.plugin.cache.support.*;
85
import org.springframework.beans.factory.ObjectProvider;
96
import org.springframework.beans.factory.annotation.Qualifier;
107
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -84,4 +81,12 @@ public CacheMessageListener cacheMessageListener(
8481
redisCaffeineCacheManager);
8582
}
8683

84+
@Bean
85+
@ConditionalOnMissingBean(ServerIdGenerator.class)
86+
public ServerIdGenerator redisSequenceServerIdGenerator(
87+
@Qualifier("stringKeyRedisTemplate") RedisTemplate<Object, Object> stringKeyRedisTemplate,
88+
CacheConfigProperties properties) {
89+
return new RedisSequenceServerIdGenerator(stringKeyRedisTemplate, properties);
90+
}
91+
8792
}

src/main/java/com/pig4cloud/plugin/cache/config/CacheJackson2ObjectMapperBuilderCustomizer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
import com.fasterxml.jackson.core.JsonParser;
55
import com.fasterxml.jackson.databind.DeserializationContext;
66
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
7+
import org.springframework.boot.autoconfigure.AutoConfiguration;
78
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
89
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
910
import org.springframework.cache.support.NullValue;
10-
import org.springframework.context.annotation.Configuration;
1111
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
1212

1313
/**
1414
* 为 jackson 添加序列化和反序列化 NullValue, CacheMessage 支持
1515
*
1616
* @author FlyInWind
1717
*/
18-
@Configuration(proxyBeanMethods = false)
18+
@AutoConfiguration
1919
@ConditionalOnClass(Jackson2ObjectMapperBuilder.class)
2020
public class CacheJackson2ObjectMapperBuilderCustomizer implements Jackson2ObjectMapperBuilderCustomizer {
2121

src/main/java/com/pig4cloud/plugin/cache/metrics/RedisCaffeineCacheMeterConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.micrometer.core.instrument.binder.MeterBinder;
44
import org.springframework.boot.actuate.metrics.cache.CacheMeterBinderProvider;
5+
import org.springframework.boot.autoconfigure.AutoConfiguration;
56
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
67
import org.springframework.context.annotation.Bean;
78
import org.springframework.context.annotation.Configuration;
@@ -12,7 +13,7 @@
1213
*
1314
* @author L.cm
1415
*/
15-
@Configuration(proxyBeanMethods = false)
16+
@AutoConfiguration
1617
@ConditionalOnClass({ MeterBinder.class, CacheMeterBinderProvider.class })
1718
public class RedisCaffeineCacheMeterConfiguration {
1819

src/main/java/com/pig4cloud/plugin/cache/support/RedisSequenceServerIdGenerator.java

+2-14
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
11
package com.pig4cloud.plugin.cache.support;
22

33
import com.pig4cloud.plugin.cache.properties.CacheConfigProperties;
4-
import org.springframework.beans.factory.annotation.Qualifier;
5-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
6-
import org.springframework.context.annotation.Configuration;
7-
import org.springframework.context.annotation.Lazy;
4+
import lombok.RequiredArgsConstructor;
85
import org.springframework.data.redis.core.RedisTemplate;
96

107
/**
118
* 通过redis key生成serverId
129
*
1310
* @author FlyInWind
1411
*/
15-
@Lazy
16-
@Configuration(proxyBeanMethods = false)
17-
@ConditionalOnMissingBean(ServerIdGenerator.class)
12+
@RequiredArgsConstructor
1813
public class RedisSequenceServerIdGenerator implements ServerIdGenerator {
1914

2015
protected final RedisTemplate<Object, Object> stringKeyRedisTemplate;
2116

2217
protected final CacheConfigProperties properties;
2318

24-
public RedisSequenceServerIdGenerator(
25-
@Qualifier("stringKeyRedisTemplate") RedisTemplate<Object, Object> stringKeyRedisTemplate,
26-
CacheConfigProperties properties) {
27-
this.stringKeyRedisTemplate = stringKeyRedisTemplate;
28-
this.properties = properties;
29-
}
30-
3119
@Override
3220
public Object get() {
3321
return stringKeyRedisTemplate.opsForValue().increment(properties.getRedis().getServerIdGeneratorKey());

0 commit comments

Comments
 (0)