Merge remote-tracking branch 'origin/develop' into new_feature

pull/649/head
pizihao 3 years ago
commit a762f532c5

@ -14,11 +14,6 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-config</artifactId>
<version>${revision}</version>
</dependency>
<dependency> <dependency>
<groupId>cn.hippo4j</groupId> <groupId>cn.hippo4j</groupId>

@ -36,6 +36,7 @@ import cn.hippo4j.message.config.MessageConfiguration;
import cn.hippo4j.message.service.AlarmControlHandler; import cn.hippo4j.message.service.AlarmControlHandler;
import cn.hippo4j.message.service.Hippo4jBaseSendMessageService; import cn.hippo4j.message.service.Hippo4jBaseSendMessageService;
import cn.hippo4j.message.service.Hippo4jSendMessageService; import cn.hippo4j.message.service.Hippo4jSendMessageService;
import cn.hippo4j.springboot.starter.adapter.web.EnableWebAdapter;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@ -53,6 +54,7 @@ import org.springframework.core.annotation.Order;
* Dynamic thread-pool core auto configuration. * Dynamic thread-pool core auto configuration.
*/ */
@Configuration @Configuration
@EnableWebAdapter
@AllArgsConstructor @AllArgsConstructor
@ConditionalOnBean(MarkerConfiguration.Marker.class) @ConditionalOnBean(MarkerConfiguration.Marker.class)
@EnableConfigurationProperties(BootstrapConfigProperties.class) @EnableConfigurationProperties(BootstrapConfigProperties.class)

Loading…
Cancel
Save