diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java index 60ed5634..f7c993e4 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java @@ -63,7 +63,7 @@ public class SynchronizerAutoConfiguration implements InitializingBean { if(synchronizer.getScheduler()!=null && !synchronizer.getScheduler().equals("") && CronExpression.isValidExpression(synchronizer.getScheduler())) { - _logger.debug("synchronizer details : " + synchronizer); + _logger.debug("synchronizer details : {}" , synchronizer); buildJob(scheduler,synchronizer); } } @@ -81,9 +81,9 @@ public class SynchronizerAutoConfiguration implements InitializingBean { JobDataMap jobDataMap = new JobDataMap(); jobDataMap.put("synchronizer", synchronizer); - _logger.debug("synchronizer : " + synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")"); - _logger.debug("synchronizer service : " + synchronizer.getService()); - _logger.debug("synchronizer Scheduler : " + synchronizer.getScheduler()); + _logger.debug("synchronizer : {}" , synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")"); + _logger.debug("synchronizer service : {}", synchronizer.getService()); + _logger.debug("synchronizer Scheduler : {} " ,synchronizer.getScheduler()); CronScheduleBuilder scheduleBuilder = CronScheduleBuilder.cronSchedule(synchronizer.getScheduler()); CronTrigger cronTrigger = TriggerBuilder.newTrigger() @@ -95,7 +95,7 @@ public class SynchronizerAutoConfiguration implements InitializingBean { } public List querySynchronizers(JdbcTemplate jdbcTemplate) { - List synchronizerList = jdbcTemplate.query(SYNCHRONIZERS_SELECT_STATEMENT, new RowMapper() { + return jdbcTemplate.query(SYNCHRONIZERS_SELECT_STATEMENT, new RowMapper() { public Synchronizers mapRow(ResultSet rs, int rowNum) throws SQLException { Synchronizers synchronizer = new Synchronizers(); synchronizer.setId( rs.getString("id")); @@ -125,8 +125,6 @@ public class SynchronizerAutoConfiguration implements InitializingBean { return synchronizer; } }); - - return synchronizerList; } @Override diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java index 33dcbe7e..c3662b39 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/AbstractSynchronizerService.java @@ -74,11 +74,11 @@ public abstract class AbstractSynchronizerService { } } - orgsNamePathMap =new HashMap(); + orgsNamePathMap =new HashMap<>(); orgsNamePathMap.put(rootOrganization.getNamePath(), rootOrganization); push(orgsNamePathMap,orgsList,rootOrganization); - _logger.trace("orgsNamePathMap " + orgsNamePathMap); + _logger.trace("orgsNamePathMap {}" , orgsNamePathMap); return orgsNamePathMap; } diff --git a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java index 1dfa02df..16b6dd4e 100644 --- a/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java +++ b/maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/synchronizer/SynchronizerJob.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class SynchronizerJob implements Job { - final static Logger _logger = LoggerFactory.getLogger(SynchronizerJob.class); + static final Logger logger = LoggerFactory.getLogger(SynchronizerJob.class); SynchronizersService synchronizersService; @@ -47,27 +47,27 @@ public class SynchronizerJob implements Job { //init jobStatus.put(synchronizer.getId(), JOBSTATUS.STOP) ; }else if(jobStatus.get(synchronizer.getId())== JOBSTATUS.RUNNING) { - _logger.info("SynchronizerJob is in running . " ); + logger.info("SynchronizerJob is in running . " ); return; } - _logger.debug("SynchronizerJob is running ... " ); + logger.debug("SynchronizerJob is running ... " ); jobStatus.put(synchronizer.getId(), JOBSTATUS.RUNNING) ; try { - _logger.debug("synchronizer : " + synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")"); - _logger.debug("synchronizer service : " + synchronizer.getService()); - _logger.debug("synchronizer Scheduler : " + synchronizer.getScheduler()); + logger.debug("synchronizer : {}" , synchronizer.getName()+"("+synchronizer.getId()+"_"+synchronizer.getSourceType()+")"); + logger.debug("synchronizer service : {}" , synchronizer.getService()); + logger.debug("synchronizer Scheduler : {}" , synchronizer.getScheduler()); ISynchronizerService service = (ISynchronizerService)WebContext.getBean(synchronizer.getService()); service.setSynchronizer(synchronizer); service.sync(); jobStatus.put(synchronizer.getId(), JOBSTATUS.FINISHED); - _logger.debug("SynchronizerJob is success " ); + logger.debug("SynchronizerJob is success " ); }catch(Exception e) { - _logger.error("Exception " ,e); + logger.error("Exception " ,e); jobStatus.put(synchronizer.getId(), JOBSTATUS.STOP); } - _logger.debug("SynchronizerJob is finished . " ); + logger.debug("SynchronizerJob is finished . " ); } @@ -78,7 +78,7 @@ public class SynchronizerJob implements Job { } //read synchronizer by id from database Synchronizers synchronizer = synchronizersService.get(jobSynchronizer.getId()); - _logger.trace("synchronizer " + synchronizer); + logger.trace("synchronizer {}" , synchronizer); return synchronizer; } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java index 63c95a13..59a1cd61 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/DynamicRolesListenerAdapter.java @@ -30,7 +30,7 @@ public class DynamicRolesListenerAdapter extends ListenerAdapter implements Job private static final long serialVersionUID = 8831626240807856084L; - private static RolesService rolesService = null; + private RolesService rolesService = null; @Override public void execute(JobExecutionContext context){ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java index 893a2fae..a2796eaf 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerAdapter.java @@ -33,7 +33,7 @@ public class ListenerAdapter { JobExecutionContext context; - public final static class JOBSTATUS{ + public static final class JOBSTATUS{ public static int STOP = 0; public static int RUNNING = 1; public static int ERROR = 2; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java index fe82ec2d..87328b52 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/listener/ListenerParameter.java @@ -20,6 +20,7 @@ package org.dromara.maxkey.listener; import org.quartz.JobDataMap; public class ListenerParameter { + JobDataMap parameters ; public ListenerParameter() {