From f86809ad47d46b9e4a2ad0f693ef6fe2f680554f Mon Sep 17 00:00:00 2001 From: wangkang Date: Sat, 29 Jul 2017 11:00:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E8=A7=84?= =?UTF-8?q?=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../udf/core/domain/mail/AttachmentInfo.java | 6 ------ .../itkk/udf/core/domain/mail/InlineInfo.java | 6 ------ .../java/org/itkk/udf/core/utils/DateUtil.java | 3 +-- .../java/org/itkk/udf/cors/CorsConfig.java | 4 ++-- .../org/itkk/udf/mail/web/IMailController.java | 2 +- .../itkk/udf/scheduler/client/IExecutor.java | 2 +- .../client/web/ISchClientController.java | 16 +++++++--------- .../org/itkk/udf/scheduler/job/RmsJob.java | 3 +-- .../udf/scheduler/listener/SchListener.java | 18 +++--------------- .../itkk/udf/scheduler/service/JobService.java | 10 ++++------ .../udf/scheduler/service/TriggerService.java | 6 ------ .../web/ISchClientCallbackController.java | 14 ++++++-------- .../scheduler/web/ISchedulerController.java | 12 +++++------- 13 files changed, 31 insertions(+), 71 deletions(-) diff --git a/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/AttachmentInfo.java b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/AttachmentInfo.java index 556ec76..f08f0ca 100644 --- a/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/AttachmentInfo.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/AttachmentInfo.java @@ -1,9 +1,3 @@ -/** - * AttachmentInfo.java - * Created at 2017-05-29 - * Created by Administrator - * Copyright (C) 2016 itkk.org, All rights reserved. - */ package org.itkk.udf.core.domain.mail; import io.swagger.annotations.ApiModel; diff --git a/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/InlineInfo.java b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/InlineInfo.java index 3192e02..151b2cf 100644 --- a/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/InlineInfo.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/domain/mail/InlineInfo.java @@ -1,9 +1,3 @@ -/** - * InlineInfo.java - * Created at 2017-05-29 - * Created by Administrator - * Copyright (C) 2016 itkk.org, All rights reserved. - */ package org.itkk.udf.core.domain.mail; import io.swagger.annotations.ApiModel; diff --git a/udf-starter-core/src/main/java/org/itkk/udf/core/utils/DateUtil.java b/udf-starter-core/src/main/java/org/itkk/udf/core/utils/DateUtil.java index 5125f00..a877073 100644 --- a/udf-starter-core/src/main/java/org/itkk/udf/core/utils/DateUtil.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/utils/DateUtil.java @@ -170,8 +170,7 @@ public class DateUtil { * @return 转化后的日期时间. * @throws ParseException 异常 */ - public static String stringToTimezone(String srcFormater, String srcDateTime, String dstFormater, - String dstTimeZoneId) throws ParseException { + public static String stringToTimezone(String srcFormater, String srcDateTime, String dstFormater, String dstTimeZoneId) throws ParseException { //NOSONAR if (srcFormater == null || "".equals(srcFormater)) { return null; } diff --git a/udf-starter-cors/src/main/java/org/itkk/udf/cors/CorsConfig.java b/udf-starter-cors/src/main/java/org/itkk/udf/cors/CorsConfig.java index 9a4b4fa..e3783ac 100644 --- a/udf-starter-cors/src/main/java/org/itkk/udf/cors/CorsConfig.java +++ b/udf-starter-cors/src/main/java/org/itkk/udf/cors/CorsConfig.java @@ -42,8 +42,8 @@ public class CorsConfig { * @return WebMvcConfigurer */ @Bean - public WebMvcConfigurer corsConfigurer() { //NOSONAR - return new WebMvcConfigurerAdapter() { + public WebMvcConfigurer corsConfigurer() { + return new WebMvcConfigurerAdapter() { //NOSONAR @Override public void addCorsMappings(CorsRegistry registry) { //扫描地址 diff --git a/udf-starter-mail/src/main/java/org/itkk/udf/mail/web/IMailController.java b/udf-starter-mail/src/main/java/org/itkk/udf/mail/web/IMailController.java index 59e5ace..7472e9e 100644 --- a/udf-starter-mail/src/main/java/org/itkk/udf/mail/web/IMailController.java +++ b/udf-starter-mail/src/main/java/org/itkk/udf/mail/web/IMailController.java @@ -28,7 +28,7 @@ import javax.validation.Valid; @Api(value = "邮件服务", consumes = "application/json", produces = "application/json", protocols = "http") @RequestMapping(value = "/service/mail") -public interface IMailController { +public interface IMailController { //NOSONAR /** * 描述 : 发送邮件 diff --git a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/IExecutor.java b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/IExecutor.java index 6a9ea0b..5eae4df 100644 --- a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/IExecutor.java +++ b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/IExecutor.java @@ -13,7 +13,7 @@ import java.util.Map; * * @author Administrator */ -public interface IExecutor { +public interface IExecutor { //NOSONAR /** * 描述 : 执行方法 diff --git a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/web/ISchClientController.java b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/web/ISchClientController.java index a11fdca..59b7813 100644 --- a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/web/ISchClientController.java +++ b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/web/ISchClientController.java @@ -6,18 +6,16 @@ */ package org.itkk.udf.scheduler.client.web; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -import org.itkk.udf.core.RestResponse; -import org.itkk.udf.scheduler.client.domain.RmsJobParam; -import org.itkk.udf.scheduler.client.domain.RmsJobResult; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.itkk.udf.core.RestResponse; +import org.itkk.udf.scheduler.client.domain.RmsJobParam; +import org.itkk.udf.scheduler.client.domain.RmsJobResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; /** * 描述 : ISchClientController @@ -27,7 +25,7 @@ import io.swagger.annotations.ApiOperation; @Api(value = "计划任务客户端", consumes = "application/json", produces = "application/json", protocols = "http") @RequestMapping(value = "/service/scheduler/client") -public interface ISchClientController { +public interface ISchClientController { //NOSONAR /** * 描述 : 执行计划任务 diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/RmsJob.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/RmsJob.java index d2c46fc..1f37df9 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/RmsJob.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/job/RmsJob.java @@ -41,8 +41,7 @@ public class RmsJob extends AbstractBaseJob { private static final Logger LOGGER = LoggerFactory.getLogger(RmsJob.class); @Override - protected void executeInternal(JobExecutionContext jobExecutionContext) - throws JobExecutionException { + protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException { //NOSONAR //从trigger中获得jobDataMap JobDataMap jobDataMap = jobExecutionContext.getTrigger().getJobDataMap(); //获得必要字段 diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/SchListener.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/SchListener.java index a051b5c..97ea464 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/SchListener.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/SchListener.java @@ -1,28 +1,16 @@ -/** - * SchListener.java - * Created at 2017-06-01 - * Created by Administrator - * Copyright (C) 2016 itkk.org, All rights reserved. - */ package org.itkk.udf.scheduler.listener; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.SchedulerException; -import org.quartz.SchedulerListener; -import org.quartz.Trigger; -import org.quartz.TriggerKey; +import org.itkk.udf.scheduler.IListenerLog; +import org.quartz.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.itkk.udf.scheduler.IListenerLog; - /** *

- * ClassName: SchedulerListener + * ClassName: SchListener *

*

* Description: 计划任务监听器 diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/JobService.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/JobService.java index 00e74d7..322d9fa 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/JobService.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/service/JobService.java @@ -103,14 +103,12 @@ public class JobService { jobDataMap = new JobDataMap(jobDetailMeta.getDataMap()); } //实例化作业 - JobDetail jobDetail = - JobBuilder.newJob(((Class) Class.forName(jobDetailMeta.getClassName()))) - .withIdentity(jobKey).withDescription(jobDetailMeta.getDescription()) - .requestRecovery(jobDetailMeta.getRecovery()) - .storeDurably(jobDetailMeta.getDurability()).setJobData(jobDataMap).build(); + JobDetail jobDetail = JobBuilder.newJob(((Class) Class.forName(jobDetailMeta.getClassName()))) //NOSONAR + .withIdentity(jobKey).withDescription(jobDetailMeta.getDescription()) + .requestRecovery(jobDetailMeta.getRecovery()) + .storeDurably(jobDetailMeta.getDurability()).setJobData(jobDataMap).build(); // 添加job sch.addJob(jobDetail, true, !jobDetailMeta.getDurability()); - } /** 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 2134b07..ebf5ca8 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 @@ -1,9 +1,3 @@ -/** - * TriggerService.java - * Created at 2017-06-02 - * Created by Administrator - * Copyright (C) 2016 itkk.org, All rights reserved. - */ package org.itkk.udf.scheduler.service; import org.apache.commons.collections4.CollectionUtils; diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchClientCallbackController.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchClientCallbackController.java index 7ad6e5c..92afa36 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchClientCallbackController.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchClientCallbackController.java @@ -6,17 +6,15 @@ */ package org.itkk.udf.scheduler.web; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -import org.itkk.udf.core.RestResponse; -import org.itkk.udf.scheduler.client.domain.RmsJobResult; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.itkk.udf.core.RestResponse; +import org.itkk.udf.scheduler.client.domain.RmsJobResult; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; /** * 描述 : ISchClientCallbackController @@ -26,7 +24,7 @@ import io.swagger.annotations.ApiOperation; @Api(value = "调度客户端回调服务", consumes = "application/json", produces = "application/json", protocols = "http") @RequestMapping(value = "/service/scheduler/client/callback") -public interface ISchClientCallbackController { +public interface ISchClientCallbackController { //NOSONAR /** * 描述 : 客户端回调 diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchedulerController.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchedulerController.java index 471455d..99f4220 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchedulerController.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/web/ISchedulerController.java @@ -6,16 +6,14 @@ */ package org.itkk.udf.scheduler.web; -import org.quartz.SchedulerException; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -import org.itkk.udf.core.RestResponse; - import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.itkk.udf.core.RestResponse; +import org.quartz.SchedulerException; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; /** * 描述 : IJobController @@ -25,7 +23,7 @@ import io.swagger.annotations.ApiOperation; @Api(value = "调度服务", consumes = "application/json", produces = "application/json", protocols = "http") @RequestMapping(value = "/service/scheduler") -public interface ISchedulerController { +public interface ISchedulerController { //NOSONAR /** * 描述 : 清理数据