From 01127611fa97994e94cdbeab50018e97df3805be Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Fri, 24 May 2024 16:27:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E5=8E=BB=E9=99=A4EnableSna?= =?UTF-8?q?ilJob=E7=9A=84group=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E7=94=A8yml=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/aizuda/snailjob/client/starter/EnableSnailJob.java | 7 ------- .../snailjob/client/starter/SnailJobClientsRegistrar.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/EnableSnailJob.java b/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/EnableSnailJob.java index fac4231b3..ba5980711 100644 --- a/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/EnableSnailJob.java +++ b/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/EnableSnailJob.java @@ -33,13 +33,6 @@ import java.lang.annotation.*; @Import(SnailJobClientsRegistrar.class) public @interface EnableSnailJob { - /** - * 表示该重试数据属于哪个系统并且全局唯一 - * - * @return - */ - String group(); - /** * 控制多个Aop的执行顺序, * 需要注意的是这里顺序要比事务的Aop要提前 diff --git a/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/SnailJobClientsRegistrar.java b/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/SnailJobClientsRegistrar.java index ccf2a379a..b6bd703cc 100644 --- a/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/SnailJobClientsRegistrar.java +++ b/snail-job-client-starter/src/main/java/com/aizuda/snailjob/client/starter/SnailJobClientsRegistrar.java @@ -23,7 +23,6 @@ public class SnailJobClientsRegistrar implements ImportBeanDefinitionRegistrar, public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { Map attrs = importingClassMetadata.getAnnotationAttributes(EnableSnailJob.class.getName()); Map systemEnvironment = standardEnvironment.getSystemProperties(); - systemEnvironment.put("snail-job.group", attrs.get("group")); systemEnvironment.put("snail-job.aop.order", attrs.get("order")); } @@ -32,6 +31,7 @@ public class SnailJobClientsRegistrar implements ImportBeanDefinitionRegistrar, StandardEnvironment standardEnvironment = (StandardEnvironment) environment; this.standardEnvironment = standardEnvironment; Map systemEnvironment = standardEnvironment.getSystemProperties(); + // 添加了 EnableSnailJob 默认就是开启，无需手动配置 systemEnvironment.put("snail-job.enabled", true); } }