From 916eda42cbc7da7e4485d970ecd4a2cd0ae19139 Mon Sep 17 00:00:00 2001 From: wangkang Date: Thu, 17 Aug 2017 10:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0lombook?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/handle/ExceptionHandle.java | 2 +- .../java/org/itkk/udf/core/xss/XssFilter.java | 4 +- .../main/java/org/itkk/udf/id/IdWorker.java | 4 +- .../src/main/java/org/itkk/udf/rms/Rms.java | 2 +- .../udf/rms/RmsAuthHandlerInterceptor.java | 6 +- .../udf/scheduler/client/SchClientHandle.java | 6 +- .../org/itkk/udf/scheduler/job/RmsJob.java | 2 +- .../scheduler/listener/JobDetailListener.java | 6 +- .../udf/scheduler/listener/SchListener.java | 144 +++++++++--------- .../listener/TriggerDetailListener.java | 6 +- 10 files changed, 91 insertions(+), 91 deletions(-) diff --git a/udf-starter-core/src/main/java/org/itkk/udf/core/exception/handle/ExceptionHandle.java b/udf-starter-core/src/main/java/org/itkk/udf/core/exception/handle/ExceptionHandle.java index 0b6de99..49784eb 100644 --- a/udf-starter-core/src/main/java/org/itkk/udf/core/exception/handle/ExceptionHandle.java +++ b/udf-starter-core/src/main/java/org/itkk/udf/core/exception/handle/ExceptionHandle.java @@ -91,7 +91,7 @@ public class ExceptionHandle extends ResponseEntityExceptionHandler { error.setStackTrace(ExceptionUtils.getStackTrace(exception)); } error.setDate(new Date()); - this.log.error(exception.getClass().getName(), exception); + log.error(exception.getClass().getName(), exception); return error; } } 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 72a0608..531c549 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 @@ -24,7 +24,7 @@ public class XssFilter implements Filter { @Override public void init(FilterConfig filterConfig) throws ServletException { - this.log.debug("(XssFilter) initialize"); + log.debug("(XssFilter) initialize"); } @Override @@ -37,7 +37,7 @@ public class XssFilter implements Filter { @Override public void destroy() { - this.log.debug("(XssFilter) destroy"); + log.debug("(XssFilter) destroy"); } } diff --git a/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java b/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java index d3a115e..c6ef9e2 100644 --- a/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java +++ b/udf-starter-id/src/main/java/org/itkk/udf/id/IdWorker.java @@ -133,7 +133,7 @@ public class IdWorker { } else { throw new SystemRuntimeException("type must not be null"); } - this.log.info("type:{},datacenterId:{},workerId:{}", type, this.datacenterId, this.workerId); + log.info("type:{},datacenterId:{},workerId:{}", type, this.datacenterId, this.workerId); } /** @@ -154,7 +154,7 @@ public class IdWorker { } this.workerId = workerId; this.datacenterId = datacenterId; - this.log.info("datacenterId:{},workerId:{}", maxDatacenterId, maxWorkerId); + log.info("datacenterId:{},workerId:{}", maxDatacenterId, maxWorkerId); } /** 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 d39a446..93a8236 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 @@ -80,7 +80,7 @@ public class Rms { //构建请求消息体 HttpEntity requestEntity = new HttpEntity<>(input, httpHeaders); //请求并且返回 - this.log.info("rms url : {} , method : {} ", path, method); + log.info("rms url : {} , method : {} ", path, method); return restTemplate.exchange(path, HttpMethod.resolve(method), requestEntity, responseType, uriVariables != null ? uriVariables : new HashMap()); } 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 2840ec2..33ea2bf 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 @@ -75,7 +75,7 @@ public class RmsAuthHandlerInterceptor implements HandlerInterceptor { rmsServiceCode = request.getParameter(Constant.HEADER_SERVICE_CODE_CODE); } //日志 - this.log.info("profiles.active:{},rmsApplicationName:{},rmsSign:{},rmsServiceCode:{},url:{},method:{}", profilesActive, rmsApplicationName, rmsSign, rmsServiceCode, url, method); + log.info("profiles.active:{},rmsApplicationName:{},rmsSign:{},rmsServiceCode:{},url:{},method:{}", profilesActive, rmsApplicationName, rmsSign, rmsServiceCode, url, method); //判断systemTag是否有效 if (!this.rmsProperties.getApplication().containsKey(rmsApplicationName)) { throw new AuthException("unrecognized systemTag:" + rmsApplicationName); @@ -129,13 +129,13 @@ public class RmsAuthHandlerInterceptor implements HandlerInterceptor { @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { - this.log.debug("SystemTagAuthHandlerInterceptor.postHandle"); + log.debug("SystemTagAuthHandlerInterceptor.postHandle"); } @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { - this.log.debug("SystemTagAuthHandlerInterceptor.afterCompletion"); + log.debug("SystemTagAuthHandlerInterceptor.afterCompletion"); } } diff --git a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/SchClientHandle.java b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/SchClientHandle.java index fa4dd5f..c0bfdda 100644 --- a/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/SchClientHandle.java +++ b/udf-starter-scheduler-client/src/main/java/org/itkk/udf/scheduler/client/SchClientHandle.java @@ -66,7 +66,7 @@ public class SchClientHandle implements ApplicationContextAware { //回调 this.callback(result); //抛出异常 - this.log.error("asyncHandle error:", e); + log.error("asyncHandle error:", e); throw new SchException(e); } @@ -95,7 +95,7 @@ public class SchClientHandle implements ApplicationContextAware { */ @Retryable(maxAttempts = 3, value = Exception.class) private void callback(RmsJobResult result) { - this.log.info("try to callback"); + log.info("try to callback"); final String serviceCode = "SCH_CLIENT_CALLBACK_1"; rms.call(serviceCode, result, null, new ParameterizedTypeReference>() { }, null); @@ -108,7 +108,7 @@ public class SchClientHandle implements ApplicationContextAware { */ @Recover public void recover(Exception e) { - this.log.error("try to callback failed:", e); + log.error("try to callback failed:", e); } @Override 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 01a7f3e..f974111 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 @@ -87,7 +87,7 @@ public class RmsJob extends AbstractBaseJob { //记录 saveRmsJobLog(rmsJobParam, result); //抛出异常 - this.log.error("RmsJob error:", e); + log.error("RmsJob error:", e); throw new JobExecutionException(e); } } diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/JobDetailListener.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/JobDetailListener.java index 5e66456..a76501d 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/JobDetailListener.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/JobDetailListener.java @@ -47,7 +47,7 @@ public class JobDetailListener implements JobListener { try { this.listenerService.saveJobToBeExecuted(context); } catch (SchedulerException e) { - this.log.error("jobToBeExecuted:", e); + log.error("jobToBeExecuted:", e); } } @@ -56,7 +56,7 @@ public class JobDetailListener implements JobListener { try { this.listenerService.saveJobExecutionVetoed(context); } catch (SchedulerException e) { - this.log.error("jobExecutionVetoed:", e); + log.error("jobExecutionVetoed:", e); } } @@ -65,7 +65,7 @@ public class JobDetailListener implements JobListener { try { this.listenerService.saveJobWasExecuted(context, jobException); } catch (SchedulerException e) { - this.log.error("jobWasExecuted:", e); + log.error("jobWasExecuted:", e); } } 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 92bb845..9b9088c 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 @@ -46,68 +46,68 @@ public class SchListener implements SchedulerListener { @Override public void triggerPaused(TriggerKey triggerKey) { - String log = "(triggerPaused)" + triggerKey.getName() + "/" + triggerKey.getGroup() + "被暂停了"; - this.log.info(log); + String logMsg = "(triggerPaused)" + triggerKey.getName() + "/" + triggerKey.getGroup() + "被暂停了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void triggerResumed(TriggerKey triggerKey) { - String log = + String logMsg = "(triggerResumed)" + triggerKey.getName() + CHAR_1 + triggerKey.getGroup() + "被恢复了"; - this.log.info(log); + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void jobScheduled(Trigger trigger) { - String log = "(jobScheduled)" + ZHUOYE + trigger.getJobKey().getName() + CHAR_1 + String logMsg = "(jobScheduled)" + ZHUOYE + trigger.getJobKey().getName() + CHAR_1 + trigger.getJobKey().getGroup() + "被触发器" + trigger.getKey().getName() + CHAR_1 + trigger.getKey().getGroup() + "触发了"; - this.log.info(log); + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void jobUnscheduled(TriggerKey triggerKey) { - String log = + String logMsg = "(jobUnscheduled)" + triggerKey.getName() + CHAR_1 + triggerKey.getGroup() + "被移除了"; - this.log.info(log); + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void triggerFinalized(Trigger trigger) { - String log = "(triggerFinalized)" + ZHUOYE + trigger.getJobKey().getName() + CHAR_1 + String logMsg = "(triggerFinalized)" + ZHUOYE + trigger.getJobKey().getName() + CHAR_1 + trigger.getJobKey().getGroup() + ",触发器" + trigger.getKey().getName() + CHAR_1 + trigger.getKey().getGroup() + "已经执行完成,后续将不会继续触发"; - this.log.info(log); + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void triggersPaused(String triggerGroup) { if (StringUtils.isEmpty(triggerGroup)) { - String log = "(triggersPaused)" + "触发器组全部被暂停了"; - this.log.info(log); + String logMsg = "(triggersPaused)" + "触发器组全部被暂停了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } else { - String log = "(triggersPaused)" + "触发器组" + triggerGroup + "被暂停了"; - this.log.info(log); + String logMsg = "(triggersPaused)" + "触发器组" + triggerGroup + "被暂停了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @@ -116,61 +116,61 @@ public class SchListener implements SchedulerListener { @Override public void triggersResumed(String triggerGroup) { if (StringUtils.isEmpty(triggerGroup)) { - String log = "(triggersResumed)" + "触发器组全部被恢复了"; - this.log.info(log); + String logMsg = "(triggersResumed)" + "触发器组全部被恢复了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } else { - String log = "(triggersResumed)" + "触发器组" + triggerGroup + "被恢复了"; - this.log.info(log); + String logMsg = "(triggersResumed)" + "触发器组" + triggerGroup + "被恢复了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } } @Override public void jobAdded(JobDetail jobDetail) { - String log = "(jobAdded)" + ZHUOYE + jobDetail.getKey().getName() + CHAR_1 + String logMsg = "(jobAdded)" + ZHUOYE + jobDetail.getKey().getName() + CHAR_1 + jobDetail.getKey().getGroup() + "被添加了"; - this.log.info(log); + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void jobDeleted(JobKey jobKey) { - String log = "(jobDeleted)" + ZHUOYE + jobKey.getName() + CHAR_1 + jobKey.getGroup() + "被删除了"; - this.log.info(log); + String logMsg = "(jobDeleted)" + ZHUOYE + jobKey.getName() + CHAR_1 + jobKey.getGroup() + "被删除了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void jobPaused(JobKey jobKey) { - String log = "(jobPaused)" + ZHUOYE + jobKey.getName() + CHAR_1 + jobKey.getGroup() + "被暂停了"; - this.log.info(log); + String logMsg = "(jobPaused)" + ZHUOYE + jobKey.getName() + CHAR_1 + jobKey.getGroup() + "被暂停了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void jobsPaused(String jobGroup) { if (StringUtils.isEmpty(jobGroup)) { - String log = "(jobsPaused)" + "作业全部被暂停了"; - this.log.info(log); + String logMsg = "(jobsPaused)" + "作业全部被暂停了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } else { - String log = "(jobsPaused)" + "作业组" + jobGroup + "被暂停了"; - this.log.info(log); + String logMsg = "(jobsPaused)" + "作业组" + jobGroup + "被暂停了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @@ -178,26 +178,26 @@ public class SchListener implements SchedulerListener { @Override public void jobResumed(JobKey jobKey) { - String log = "(jobResumed)" + ZHUOYE + jobKey.getName() + CHAR_1 + jobKey.getGroup() + "被恢复了"; - this.log.info(log); + String logMsg = "(jobResumed)" + ZHUOYE + jobKey.getName() + CHAR_1 + jobKey.getGroup() + "被恢复了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void jobsResumed(String jobGroup) { if (StringUtils.isEmpty(jobGroup)) { - String log = "(jobsResumed)" + "作业全部被恢复了"; - this.log.info(log); + String logMsg = "(jobsResumed)" + "作业全部被恢复了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } else { - String log = "(jobsResumed)" + "作业组" + jobGroup + "被恢复了"; - this.log.info(log); + String logMsg = "(jobsResumed)" + "作业组" + jobGroup + "被恢复了"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } } @@ -206,64 +206,64 @@ public class SchListener implements SchedulerListener { public void schedulerError(String msg, SchedulerException cause) { // 获得异常详细信息 String exceptionDetail = ExceptionUtils.getStackTrace(cause); - String log = "(schedulerError)" + "计划任务出错:" + msg + "\n" + exceptionDetail; - this.log.info(log); + String logMsg = "(schedulerError)" + "计划任务出错:" + msg + "\n" + exceptionDetail; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void schedulerInStandbyMode() { - String log = "(schedulerInStandbyMode)" + "计划任务为待机状态"; - this.log.info(log); + String logMsg = "(schedulerInStandbyMode)" + "计划任务为待机状态"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void schedulerStarted() { - String log = "(schedulerStarted)" + "计划任务已经启动"; - this.log.info(log); + String logMsg = "(schedulerStarted)" + "计划任务已经启动"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void schedulerStarting() { - String log = "(schedulerStarting)" + "计划任务正在启动中"; - this.log.info(log); + String logMsg = "(schedulerStarting)" + "计划任务正在启动中"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void schedulerShutdown() { - String log = "(schedulerShutdown)" + "计划任务已关闭"; - this.log.info(log); + String logMsg = "(schedulerShutdown)" + "计划任务已关闭"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void schedulerShuttingdown() { - String log = "(schedulerShuttingdown)" + "计划任务正在关闭中"; - this.log.info(log); + String logMsg = "(schedulerShuttingdown)" + "计划任务正在关闭中"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } @Override public void schedulingDataCleared() { - String log = "(schedulingDataCleared)" + "计划任务数据被清除"; - this.log.info(log); + String logMsg = "(schedulingDataCleared)" + "计划任务数据被清除"; + log.info(logMsg); if (listenerLog != null) { - listenerLog.save(log); + listenerLog.save(logMsg); } } } diff --git a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/TriggerDetailListener.java b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/TriggerDetailListener.java index 079276d..7845617 100644 --- a/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/TriggerDetailListener.java +++ b/udf-starter-scheduler/src/main/java/org/itkk/udf/scheduler/listener/TriggerDetailListener.java @@ -48,7 +48,7 @@ public class TriggerDetailListener implements TriggerListener { try { this.listenerService.saveTriggerFired(context); } catch (SchedulerException e) { - this.log.error("triggerFired error:", e); + log.error("triggerFired error:", e); } } @@ -58,7 +58,7 @@ public class TriggerDetailListener implements TriggerListener { try { vetoed = this.listenerService.saveVetoJobExecution(context); } catch (SchedulerException e) { - this.log.error("vetoJobExecution error:", e); + log.error("vetoJobExecution error:", e); } return vetoed; } @@ -74,7 +74,7 @@ public class TriggerDetailListener implements TriggerListener { try { this.listenerService.saveTriggerComplete(context, triggerInstructionCode); } catch (SchedulerException e) { - this.log.error("triggerComplete error:", e); + log.error("triggerComplete error:", e); } } }