diff --git a/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java b/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java
index 0e0146f..ce8cd42 100644
--- a/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java
+++ b/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitMqConfig.java
@@ -6,13 +6,13 @@
*/
package org.itkk.udf.amqp.rabbitmq;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.amqp.core.DirectExchange;
import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
/**
* 描述 : RabbitMq配置
*
@@ -47,4 +47,24 @@ public class RabbitMqConfig {
return new Jackson2JsonMessageConverter(objectMapper);
}
+ /**
+ * exchangeMessageLog
+ *
+ * @return DirectExchange
+ */
+ @Bean
+ public DirectExchange exchangeMessageLog() {
+ return new DirectExchange(RabbitmqConstant.EXCHANGE_MESSAGE_LOG.class.getSimpleName(), true, false);
+ }
+
+ /**
+ * exchangeMessageLogDlx
+ *
+ * @return DirectExchange
+ */
+ @Bean
+ public DirectExchange exchangeMessageLogDlx() {
+ return new DirectExchange(RabbitmqConstant.EXCHANGE_MESSAGE_LOG_DLX.class.getSimpleName(), true, false);
+ }
+
}
diff --git a/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitmqConstant.java b/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitmqConstant.java
index 7ee4f7d..4f7eefa 100644
--- a/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitmqConstant.java
+++ b/udf-starter-amqp-rabbitmq/src/main/java/org/itkk/udf/amqp/rabbitmq/RabbitmqConstant.java
@@ -23,6 +23,20 @@ public class RabbitmqConstant {
*/
public static final String X_DEAD_LETTER_ROUTING_KEY = "x-dead-letter-routing-key";
+ /**
+ * (EXCHANGE)消息记录
+ */
+ public enum EXCHANGE_MESSAGE_LOG {
+
+ }
+
+ /**
+ * (EXCHANGE)消息记录(死信)
+ */
+ public enum EXCHANGE_MESSAGE_LOG_DLX {
+
+ }
+
/**
* 描述 : 私有化构造函数
*/
diff --git a/udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssFilter.java b/udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssFilter.java
index 531c549..5016f40 100644
--- a/udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssFilter.java
+++ b/udf-starter-core/src/main/java/org/itkk/udf/core/xss/XssFilter.java
@@ -23,7 +23,7 @@ import java.io.IOException;
public class XssFilter implements Filter {
@Override
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(FilterConfig filterConfig) {
log.debug("(XssFilter) initialize");
}
diff --git a/udf-starter-dal-mybatis/src/main/java/org/itkk/udf/dal/mybatis/plugin/pagequery/Page.java b/udf-starter-dal-mybatis/src/main/java/org/itkk/udf/dal/mybatis/plugin/pagequery/Page.java
index 74c6440..b376fb7 100644
--- a/udf-starter-dal-mybatis/src/main/java/org/itkk/udf/dal/mybatis/plugin/pagequery/Page.java
+++ b/udf-starter-dal-mybatis/src/main/java/org/itkk/udf/dal/mybatis/plugin/pagequery/Page.java
@@ -25,25 +25,25 @@ public class Page
diff --git a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerDataMapKey.java b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerDataMapKey.java index d2f4dd6..c02f75f 100644 --- a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerDataMapKey.java +++ b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerDataMapKey.java @@ -42,7 +42,7 @@ public enum TriggerDataMapKey { * Field value: 参数值 *
*/ - private String value = null; + private String value; /** *diff --git a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerType.java b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerType.java index 04d634a..76d7306 100644 --- a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerType.java +++ b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/TriggerType.java @@ -30,7 +30,7 @@ public enum TriggerType { * Field value: 参数值 *
*/ - private String value = null; + private String value; /** *diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledLog.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledLog.java index db2f584..4870bc6 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledLog.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledLog.java @@ -6,11 +6,9 @@ */ package org.itkk.udf.scheduler.job; +import org.itkk.udf.scheduler.IListenerEvent; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import org.itkk.udf.scheduler.IListenerEvent; /** *
@@ -30,8 +28,7 @@ import org.itkk.udf.scheduler.IListenerEvent; public class ClearScheduledLog extends AbstractBaseJob { @Override - protected void executeInternal(JobExecutionContext jobExecutionContext) - throws JobExecutionException { + protected void executeInternal(JobExecutionContext jobExecutionContext) { IListenerEvent listenerLog = this.getApplicationContext().getBean(IListenerEvent.class); if (listenerLog != null) { listenerLog.clearScheduledLog(); diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledTriggerLog.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledTriggerLog.java index 0ad8d56..34c1625 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledTriggerLog.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/ClearScheduledTriggerLog.java @@ -6,11 +6,9 @@ */ package org.itkk.udf.scheduler.job; +import org.itkk.udf.scheduler.IListenerEvent; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - -import org.itkk.udf.scheduler.IListenerEvent; /** *
@@ -30,8 +28,7 @@ import org.itkk.udf.scheduler.IListenerEvent; public class ClearScheduledTriggerLog extends AbstractBaseJob { @Override - protected void executeInternal(JobExecutionContext jobExecutionContext) - throws JobExecutionException { + protected void executeInternal(JobExecutionContext jobExecutionContext) { IListenerEvent triggerLog = this.getApplicationContext().getBean(IListenerEvent.class); if (triggerLog != null) { triggerLog.clearScheduledTriggerLog(); diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/TriggerService.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/TriggerService.java index ebf5ca8..0799ab0 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/TriggerService.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/TriggerService.java @@ -173,14 +173,18 @@ public class TriggerService { // 时区 cronTriggerBuilder.inTimeZone(TimeZone.getTimeZone(triggerMeta.getTimeZoneId())); // 设置触发机制 默认 SimpleTrigger.MISFIRE_INSTRUCTION_SMART_POLICY - if (CronTrigger.MISFIRE_INSTRUCTION_DO_NOTHING == triggerMeta.getMisfireInstruction()) { - cronTriggerBuilder.withMisfireHandlingInstructionDoNothing(); - } else if (CronTrigger.MISFIRE_INSTRUCTION_FIRE_ONCE_NOW == triggerMeta - .getMisfireInstruction()) { - cronTriggerBuilder.withMisfireHandlingInstructionFireAndProceed(); - } else if (CronTrigger.MISFIRE_INSTRUCTION_IGNORE_MISFIRE_POLICY == triggerMeta - .getMisfireInstruction()) { - cronTriggerBuilder.withMisfireHandlingInstructionIgnoreMisfires(); + switch (triggerMeta.getMisfireInstruction()) { + case CronTrigger.MISFIRE_INSTRUCTION_DO_NOTHING: + cronTriggerBuilder.withMisfireHandlingInstructionDoNothing(); + break; + case CronTrigger.MISFIRE_INSTRUCTION_FIRE_ONCE_NOW: + cronTriggerBuilder.withMisfireHandlingInstructionFireAndProceed(); + break; + case CronTrigger.MISFIRE_INSTRUCTION_IGNORE_MISFIRE_POLICY: + cronTriggerBuilder.withMisfireHandlingInstructionIgnoreMisfires(); + break; + default: + break; } // 将cronTrigger设置到triggerBuilder中 triggerBuilder.withSchedule(cronTriggerBuilder); @@ -245,23 +249,27 @@ public class TriggerService { // 重复时间 simpleTriggerBuilder.withIntervalInMilliseconds(triggerMeta.getIntervalInMilliseconds()); // 设置触发机制 默认 SimpleTrigger.MISFIRE_INSTRUCTION_SMART_POLICY - if (SimpleTrigger.MISFIRE_INSTRUCTION_FIRE_NOW == triggerMeta.getMisfireInstruction()) { - simpleTriggerBuilder.withMisfireHandlingInstructionFireNow(); - } else if (SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT == triggerMeta - .getMisfireInstruction()) { - simpleTriggerBuilder.withMisfireHandlingInstructionNextWithExistingCount(); - } else if (SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_REMAINING_COUNT == triggerMeta - .getMisfireInstruction()) { - simpleTriggerBuilder.withMisfireHandlingInstructionNextWithRemainingCount(); - } else if (SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_EXISTING_REPEAT_COUNT == triggerMeta - .getMisfireInstruction()) { - simpleTriggerBuilder.withMisfireHandlingInstructionNowWithExistingCount(); - } else if (SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_REMAINING_REPEAT_COUNT == triggerMeta - .getMisfireInstruction()) { - simpleTriggerBuilder.withMisfireHandlingInstructionNowWithRemainingCount(); - } else if (SimpleTrigger.MISFIRE_INSTRUCTION_IGNORE_MISFIRE_POLICY == triggerMeta - .getMisfireInstruction()) { - simpleTriggerBuilder.withMisfireHandlingInstructionIgnoreMisfires(); + switch (triggerMeta.getMisfireInstruction()) { + case SimpleTrigger.MISFIRE_INSTRUCTION_FIRE_NOW: + simpleTriggerBuilder.withMisfireHandlingInstructionFireNow(); + break; + case SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT: + simpleTriggerBuilder.withMisfireHandlingInstructionNextWithExistingCount(); + break; + case SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_REMAINING_COUNT: + simpleTriggerBuilder.withMisfireHandlingInstructionNextWithRemainingCount(); + break; + case SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_EXISTING_REPEAT_COUNT: + simpleTriggerBuilder.withMisfireHandlingInstructionNowWithExistingCount(); + break; + case SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_REMAINING_REPEAT_COUNT: + simpleTriggerBuilder.withMisfireHandlingInstructionNowWithRemainingCount(); + break; + case SimpleTrigger.MISFIRE_INSTRUCTION_IGNORE_MISFIRE_POLICY: + simpleTriggerBuilder.withMisfireHandlingInstructionIgnoreMisfires(); + break; + default: + break; } // 将SimpleTrigger设置到triggerBuilder中 triggerBuilder.withSchedule(simpleTriggerBuilder);