mxd 4 lat temu
rodzic
commit
08702ce3d6

+ 2 - 0
src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicMongoAutoConfiguration.java

@@ -2,6 +2,7 @@ package org.ssssssss.magicapi.spring.boot.starter;
 
 
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCollection;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
@@ -16,6 +17,7 @@ import org.ssssssss.script.reflection.AbstractReflection;
  */
  */
 @Configuration
 @Configuration
 @ConditionalOnBean(MongoTemplate.class)
 @ConditionalOnBean(MongoTemplate.class)
+@AutoConfigureBefore(MagicAPIAutoConfiguration.class)
 public class MagicMongoAutoConfiguration {
 public class MagicMongoAutoConfiguration {
 
 
 	/**
 	/**

+ 3 - 1
src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicRedisAutoConfiguration.java

@@ -1,5 +1,6 @@
 package org.ssssssss.magicapi.spring.boot.starter;
 package org.ssssssss.magicapi.spring.boot.starter;
 
 
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -16,9 +17,10 @@ import org.ssssssss.magicapi.modules.RedisModule;
  */
  */
 @ConditionalOnBean(RedisConnectionFactory.class)
 @ConditionalOnBean(RedisConnectionFactory.class)
 @Configuration
 @Configuration
+@AutoConfigureBefore(MagicAPIAutoConfiguration.class)
 public class MagicRedisAutoConfiguration {
 public class MagicRedisAutoConfiguration {
 
 
-	private MagicAPIProperties properties;
+	private final MagicAPIProperties properties;
 
 
 	public MagicRedisAutoConfiguration(MagicAPIProperties properties) {
 	public MagicRedisAutoConfiguration(MagicAPIProperties properties) {
 		this.properties = properties;
 		this.properties = properties;