Merge branch 'opengoofy:develop' into develop

pull/677/head
liulinfei121 3 years ago committed by GitHub
commit af6c0aa098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class MybatisPlusConfig { public class MybatisPlusConfig {
@Value("${spring.profiles.active}") @Value("${spring.profiles.active:mysql}")
private String profilesActive; private String profilesActive;
@Bean @Bean

@ -64,7 +64,7 @@ import org.springframework.core.annotation.Order;
ConfigHandlerConfiguration.EmbeddedApollo.class, ConfigHandlerConfiguration.EmbeddedZookeeper.class, ConfigHandlerConfiguration.EmbeddedApollo.class, ConfigHandlerConfiguration.EmbeddedZookeeper.class,
ConfigHandlerConfiguration.EmbeddedEtcd.class ConfigHandlerConfiguration.EmbeddedEtcd.class
}) })
public class DynamicThreadPoolCoreAutoConfiguration { public class DynamicThreadPoolAutoConfiguration {
private final BootstrapConfigProperties bootstrapConfigProperties; private final BootstrapConfigProperties bootstrapConfigProperties;

@ -1 +1 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.config.springboot.starter.config.DynamicThreadPoolCoreAutoConfiguration org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.hippo4j.config.springboot.starter.config.DynamicThreadPoolAutoConfiguration

Loading…
Cancel
Save