From 879025944ad36350f052777fb6731f928bf96fcb Mon Sep 17 00:00:00 2001 From: "udf_admin@163.com" Date: Sun, 10 Dec 2017 14:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E4=BB=B6=E6=97=A5=E5=BF=97=E4=BA=A4=E6=8D=A2=E6=9C=BA?= =?UTF-8?q?=20&=20=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=A7=84=E8=8C=83=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../udf/amqp/rabbitmq/RabbitMqConfig.java | 24 +++++++- .../udf/amqp/rabbitmq/RabbitmqConstant.java | 14 +++++ .../java/org/itkk/udf/core/xss/XssFilter.java | 2 +- .../dal/mybatis/plugin/pagequery/Page.java | 8 +-- .../itkk/udf/file/aliyun/oss/OssWarpper.java | 2 +- .../itkk/udf/qrcode/option/DrawOptions.java | 14 ++--- .../src/main/java/org/itkk/udf/rms/Rms.java | 2 +- .../udf/rms/RmsAuthHandlerInterceptor.java | 6 +- .../udf/scheduler/client/RmsJobStats.java | 2 +- .../scheduler/client/TriggerDataMapKey.java | 2 +- .../udf/scheduler/client/TriggerType.java | 2 +- .../udf/scheduler/job/ClearScheduledLog.java | 7 +-- .../job/ClearScheduledTriggerLog.java | 7 +-- .../udf/scheduler/service/TriggerService.java | 58 +++++++++++-------- 14 files changed, 92 insertions(+), 58 deletions(-) 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 implements Serializable { * 当前页,默认1 */ @ApiModelProperty(value = "当前页", required = true, dataType = "int") - private int curPage = 1; + private int curPage; /** * 每页数量,默认0 */ @ApiModelProperty(value = "每页行数", required = true, dataType = "int") - private int pageSize = 0; + private int pageSize; /** * 总页数 */ @ApiModelProperty(value = "总页数", required = true, dataType = "long") - private long totalPages = 0; + private long totalPages; /** * 总条数 */ @ApiModelProperty(value = "总行数", required = true, dataType = "long") - private long totalRecords = 0; + private long totalRecords; /** * 结果集 diff --git a/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/OssWarpper.java b/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/OssWarpper.java index 4a5525e..30c3d86 100644 --- a/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/OssWarpper.java +++ b/udf-starter-file-aliyun-oss/src/main/java/org/itkk/udf/file/aliyun/oss/OssWarpper.java @@ -54,7 +54,7 @@ public class OssWarpper { public PolicyResult getPolicy(String code) throws UnsupportedEncodingException { //判空 if (!aliyunOssProperties.getAuth().containsKey(code) || !aliyunOssProperties.getPath().containsKey(code)) { - throw new ParameterValidException("aliyun oss code:" + code + "未定义", null); + throw new ParameterValidException("aliyun oss code:" + code + "未定义", null); //NOSONAR } //获得认证信息 和 路径信息 AliyunOssAccessMeta auth = aliyunOssProperties.getAuth().get(code); diff --git a/udf-starter-qrcode/src/main/java/org/itkk/udf/qrcode/option/DrawOptions.java b/udf-starter-qrcode/src/main/java/org/itkk/udf/qrcode/option/DrawOptions.java index dfb058f..4d00236 100644 --- a/udf-starter-qrcode/src/main/java/org/itkk/udf/qrcode/option/DrawOptions.java +++ b/udf-starter-qrcode/src/main/java/org/itkk/udf/qrcode/option/DrawOptions.java @@ -68,13 +68,13 @@ public class DrawOptions { return true; } - - if (expandType == ExpandType.SIZE4) { - return size4Img != null; - } else if (expandType == ExpandType.COL2) { - return col2img != null; - } else { - return row2Img != null; + switch (expandType) { + case SIZE4: + return size4Img != null; + case COL2: + return col2img != null; + default: + return row2Img != null; } } } diff --git a/udf-starter-rms/src/main/java/org/itkk/udf/rms/Rms.java b/udf-starter-rms/src/main/java/org/itkk/udf/rms/Rms.java index 879e669..75694d9 100644 --- a/udf-starter-rms/src/main/java/org/itkk/udf/rms/Rms.java +++ b/udf-starter-rms/src/main/java/org/itkk/udf/rms/Rms.java @@ -75,7 +75,7 @@ public class Rms { * @param 输出类型 * @return 服务结果 */ - public ResponseEntity call(String host, int port, String serviceCode, HttpHeaders headers, I input, String uriParam, ParameterizedTypeReference responseType, Map uriVariables) { + public ResponseEntity call(String host, int port, String serviceCode, HttpHeaders headers, I input, String uriParam, ParameterizedTypeReference responseType, Map uriVariables) { //NOSONAR //客户端权限验证 verification(serviceCode); //获取服务元数据 diff --git a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsAuthHandlerInterceptor.java b/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsAuthHandlerInterceptor.java index 6df3452..001a694 100644 --- a/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsAuthHandlerInterceptor.java +++ b/udf-starter-rms/src/main/java/org/itkk/udf/rms/RmsAuthHandlerInterceptor.java @@ -127,14 +127,12 @@ public class RmsAuthHandlerInterceptor implements HandlerInterceptor { } @Override - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, - ModelAndView modelAndView) throws Exception { + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { log.debug("SystemTagAuthHandlerInterceptor.postHandle"); } @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) - throws Exception { + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { log.debug("SystemTagAuthHandlerInterceptor.afterCompletion"); } diff --git a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/RmsJobStats.java b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/RmsJobStats.java index 1c98824..3dc5d8f 100644 --- a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/RmsJobStats.java +++ b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/RmsJobStats.java @@ -34,7 +34,7 @@ public enum RmsJobStats { * Field value: 参数值 *

*/ - private Integer value = null; + private Integer value; /** *

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);