diff --git a/bin/build-ry-admin-war.cmd b/bin/build-ry-admin-war.cmd deleted file mode 100644 index 57386886..00000000 --- a/bin/build-ry-admin-war.cmd +++ /dev/null @@ -1,2 +0,0 @@ -call mvn clean install -f ../pom.xml -call mvn clean package -f ../ruoyi-admin/pom-war.xml \ No newline at end of file diff --git a/ruoyi-admin/pom-war.xml b/ruoyi-admin/pom-war.xml deleted file mode 100644 index 10021104..00000000 --- a/ruoyi-admin/pom-war.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - ruoyi - com.ruoyi - 3.1 - - 4.0.0 - war - ruoyi-admin-war - - - web服务入口(war) - - - - - - - - org.springframework.boot - spring-boot-devtools - true - - - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - - - com.ruoyi - ruoyi-framework - ${ruoyi.version} - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - org.apache.tomcat.embed - tomcat-embed-jasper - provided - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.0.0 - - false - ${artifactId} - - - - ${artifactId} - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html index 8b0906ed..c5117d71 100644 --- a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html +++ b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html @@ -55,7 +55,6 @@ }, { title: "序号", - align: "center", formatter: function (value, row, index) { return $.table.serialNumber(index); } diff --git a/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html b/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html index cc51e13f..02a5ff88 100644 --- a/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html +++ b/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html @@ -57,7 +57,6 @@ }, { title: "序号", - align: "center", formatter: function (value, row, index) { return $.table.serialNumber(index); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationShutdownBean.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationShutdownBean.java index 715b4a83..d9d8b81b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationShutdownBean.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationShutdownBean.java @@ -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); } } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java index c64a0e4c..a1e345be 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java @@ -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); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java index e94cf678..e174b876 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java @@ -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;