Skip to content

Commit b5dfa69

Browse files
committed
Merge branch '2.3.x' of https://github.com/minbox-projects/api-boot into 2.3.x
2 parents 14cd5f5 + 45149c2 commit b5dfa69

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/logging/ApiBootLoggingAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
ApiBootLoggingWebAutoConfiguration.class,
6464
ApiBootLoggingGlobalLogStorageAutoConfiguration.class
6565
})
66+
@EnableLoggingClient
6667
public class ApiBootLoggingAutoConfiguration {
6768
/**
6869
* logger instance

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/logging/admin/ApiBootLoggingAdminAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.minbox.framework.api.boot.autoconfigure.logging.admin.ui.ApiBootLoggingAdminUiAutoConfiguration;
2121
import org.minbox.framework.logging.admin.LoggingAdminFactoryBean;
2222
import org.minbox.framework.logging.admin.storage.LoggingDataSourceStorage;
23+
import org.minbox.framework.logging.spring.context.annotation.admin.EnableLoggingAdmin;
2324
import org.slf4j.Logger;
2425
import org.slf4j.LoggerFactory;
2526
import org.springframework.beans.factory.BeanCreationException;
@@ -51,6 +52,7 @@
5152
ApiBootLoggingAdminUiAutoConfiguration.class
5253
})
5354
@EnableAsync
55+
@EnableLoggingAdmin
5456
public class ApiBootLoggingAdminAutoConfiguration {
5557
/**
5658
* logger instance

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/mongo/ApiBootMongoClientSettingsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
@Configuration
2525
@EnableConfigurationProperties(ApiBootMongoClientSettingsProperties.class)
26-
@ConditionalOnClass(MongoClient.class)
26+
@ConditionalOnClass(MongoClientSettingsBean.class)
2727
@AutoConfigureBefore(MongoAutoConfiguration.class)
2828
public class ApiBootMongoClientSettingsAutoConfiguration {
2929
private MongoClientSettingsBean clientSettingsBean;

0 commit comments

Comments
 (0)