github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

去除序号居中

pull/59/MERGE
RuoYi 2018-12-29 12:04:53 +08:00
parent 8b07f8925f
commit e9a7cc7bc7
7 changed files with 9 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-ry-admin-war.cmd
View File

@ -1,2 +0,0 @@
call mvn clean install -f ../pom.xml
call mvn clean package -f ../ruoyi-admin/pom-war.xml

90
ruoyi-admin/pom-war.xml
View File

@ -1,90 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<artifactId>ruoyi-admin-war</artifactId>
<description>
web服务入口(war)
</description>
<dependencies>
<!-- spring-boot-devtools -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <!-- 表示依赖不会传递 -->
</dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi.version}</version>
</dependency>
<!-- war 包模式特殊配置: 覆盖tomcat依赖，由外部提供 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${artifactId}</warName>
</configuration>
</plugin>
</plugins>
<finalName>${artifactId}</finalName>
</build>
</project>

1
ruoyi-admin/src/main/resources/templates/monitor/online/online.html
View File

@ -55,7 +55,6 @@
},
{
title: "序号",
align: "center",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}

1
ruoyi-admin/src/main/resources/templates/tool/gen/gen.html
View File

@ -57,7 +57,6 @@
},
{
title: "序号",
align: "center",
formatter: function (value, row, index) {
return $.table.serialNumber(index);
}

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);
}
}

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

@ -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;