hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除序号居中

Browse Source
This commit is contained in:
RuoYi
2018-12-29 12:04:53 +08:00
parent 8b07f8925f
commit e9a7cc7bc7
7 changed files with 9 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationShutdownBean.java
View File

@ -33,7 +33,7 @@ public class ApplicationShutdownBean
private void shutdownSpringSessionValidationScheduler()
{
if(springSessionValidationScheduler != null && springSessionValidationScheduler.isEnabled())
if (springSessionValidationScheduler != null && springSessionValidationScheduler.isEnabled())
{
try
{
@ -42,10 +42,11 @@ public class ApplicationShutdownBean
}
catch (Exception e)
{
logger.error(e.getMessage(),e);
logger.error(e.getMessage(), e);
}
}
}
private void shutdownAsyncManager()
{
try
@ -55,7 +56,7 @@ public class ApplicationShutdownBean
}
catch (Exception e)
{
logger.error(e.getMessage(),e);
logger.error(e.getMessage(), e);
}
}
}

2
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java
View File

@ -44,6 +44,6 @@ public class AsyncManager
public void shutdown(long timeout, TimeUnit unit) throws Exception
{
executor.shutdown();
executor.awaitTermination(timeout,unit);
executor.awaitTermination(timeout, unit);
}
}

8
ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java
View File

@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
public class SpringSessionValidationScheduler implements SessionValidationScheduler
{
private static final Logger log = LoggerFactory.getLogger(SpringSessionValidationScheduler.class);
public static final long DEFAULT_SESSION_VALIDATION_INTERVAL = DefaultSessionManager.DEFAULT_SESSION_VALIDATION_INTERVAL;
/**
@ -134,16 +134,16 @@ public class SpringSessionValidationScheduler implements SessionValidationSchedu
log.debug("Stopping Spring Scheduler session validation job...");
}
if(this.enabled)
if (this.enabled)
{
executorService.shutdown();
try
{
executorService.awaitTermination(10,TimeUnit.SECONDS);
executorService.awaitTermination(10, TimeUnit.SECONDS);
}
catch (InterruptedException e)
{
log.error(e.getMessage(),e);
log.error(e.getMessage(), e);
}
}
this.enabled = false;