diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/AbstractOnlineTicketService.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/AbstractOnlineTicketService.java index d2cb1d5d5..fc16f2ee4 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/AbstractOnlineTicketService.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/AbstractOnlineTicketService.java @@ -73,7 +73,7 @@ public class AbstractOnlineTicketService implements OnlineTicketService{ String lastLogoffTime = DateUtils.formatDateTime(new Date()); _logger.trace("{} user {} terminate Ticket {} ." ,lastLogoffTime,username, onlineTicket); this.profileLastLogoffTime(userId, lastLogoffTime); - this.sessionLogoff(userId, lastLogoffTime); + this.sessionLogoff(onlineTicket, lastLogoffTime); remove(onlineTicket); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtJobs.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtJobs.java index 67135fa28..665f4e304 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtJobs.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtJobs.java @@ -20,7 +20,7 @@ package org.maxkey; import org.maxkey.authn.online.OnlineTicketService; import org.maxkey.jobs.AccountsStrategyJob; import org.maxkey.jobs.DynamicGroupsJob; -import org.maxkey.jobs.OnlineTicketListenerJob; +import org.maxkey.jobs.TicketListenerJob; import org.maxkey.persistence.service.AccountsService; import org.maxkey.persistence.service.GroupsService; import org.quartz.CronScheduleBuilder; @@ -52,10 +52,10 @@ public class MaxKeyMgtJobs implements InitializingBean { JobDataMap jobDataMap = new JobDataMap(); jobDataMap.put("service", onlineTicketService); addJobScheduler( - OnlineTicketListenerJob.class, + TicketListenerJob.class, schedulerFactoryBean, jobDataMap, - "* 10 * * * ? ",//10 minutes + "0 0/1 * * * ?",//10 minutes "TicketListener" ); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/jobs/OnlineTicketListenerJob.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/jobs/TicketListenerJob.java similarity index 78% rename from maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/jobs/OnlineTicketListenerJob.java rename to maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/jobs/TicketListenerJob.java index 7ac622008..f8afe0618 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/jobs/OnlineTicketListenerJob.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/jobs/TicketListenerJob.java @@ -25,8 +25,8 @@ import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OnlineTicketListenerJob extends AbstractScheduleJob implements Job , Serializable { - final static Logger _logger = LoggerFactory.getLogger(OnlineTicketListenerJob.class); +public class TicketListenerJob extends AbstractScheduleJob implements Job , Serializable { + final static Logger _logger = LoggerFactory.getLogger(TicketListenerJob.class); private static final long serialVersionUID = 4782358765969474833L; @@ -37,7 +37,7 @@ public class OnlineTicketListenerJob extends AbstractScheduleJob implements Jo if(jobStatus == JOBSTATUS.RUNNING) {return;} init(context); - _logger.debug("OnlineTicketListener Job is running ... " ); + _logger.debug("TicketListener Job is running ... " ); jobStatus = JOBSTATUS.RUNNING; try { if(onlineTicketService != null) { @@ -50,7 +50,7 @@ public class OnlineTicketListenerJob extends AbstractScheduleJob implements Jo } } } - _logger.debug("OnlineTicketListener Job finished " ); + _logger.debug("TicketListener Job finished " ); jobStatus = JOBSTATUS.FINISHED; }catch(Exception e) { jobStatus = JOBSTATUS.ERROR; @@ -60,10 +60,10 @@ public class OnlineTicketListenerJob extends AbstractScheduleJob implements Jo } @Override - void init(JobExecutionContext context){ - if(onlineTicketService == null) { - onlineTicketService = - (OnlineTicketService) context.getMergedJobDataMap().get("service"); - } - } + void init(JobExecutionContext context){ + if(onlineTicketService == null) { + onlineTicketService = + (OnlineTicketService) context.getMergedJobDataMap().get("service"); + } + } }