|
|
@@ -1,7 +1,6 @@
|
|
|
package top.lvzhiqiang.config;
|
|
|
|
|
|
import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
|
|
|
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
|
|
@@ -12,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
|
|
|
* 2022/3/13 12:40
|
|
|
*/
|
|
|
@Configuration
|
|
|
-@ConditionalOnBean(XXLJobMarkerConfiguration.Marker.class)
|
|
|
+//@ConditionalOnBean(XXLJobMarkerConfiguration.Marker.class)
|
|
|
public class XXLJobAutoConfiguration {
|
|
|
/**
|
|
|
* 设置XXL-JOB定时任务属性值
|
|
|
@@ -20,7 +19,7 @@ public class XXLJobAutoConfiguration {
|
|
|
* @return com.riskraider.config.job.XXLJobProperties
|
|
|
* @author shiyong
|
|
|
* 2022/3/13 12:49
|
|
|
- */
|
|
|
+ */
|
|
|
@Bean
|
|
|
public XXLJobProperties xxlJobProperties() {
|
|
|
return new XXLJobProperties();
|
|
|
@@ -33,7 +32,7 @@ public class XXLJobAutoConfiguration {
|
|
|
* @return com.xxl.job.core.executor.impl.XxlJobSpringExecutor
|
|
|
* @author shiyong
|
|
|
* 2022/3/13 12:57
|
|
|
- */
|
|
|
+ */
|
|
|
@Bean
|
|
|
public XxlJobSpringExecutor xxlJobExecutor(XXLJobProperties xxlJobProperties) {
|
|
|
XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
|