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

修改logback

This commit is contained in:
kingsfighter 2020-09-19 10:54:01 +08:00
parent 73ac9f619c
commit fcbeaa4695
4 changed files with 129 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@ -195,6 +195,19 @@
<version>${ruoyi.version}</version> <version>${ruoyi.version}</version>
</dependency> </dependency>
<!-- log相关 -->
<!--http://logback.qos.ch/setup.html#janino -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
<version>2.7.8</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

13
ruoyi-admin/pom.xml
View File

@ -73,6 +73,19 @@
<artifactId>ruoyi-generator</artifactId> <artifactId>ruoyi-generator</artifactId>
</dependency> </dependency>
<!-- log相关 -->
<!--http://logback.qos.ch/setup.html#janino -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
<version>2.7.8</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

124
ruoyi-admin/src/main/resources/logback.xml
View File

@ -1,68 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration scan="true" scanPeriod="600 seconds" debug="true">
<!-- 日志存放路径 --> <!-- 这个日志配置文件，区分了windows和linux机器，windows机器日志输出到控制台，linux机器日志输出文件，这个配置满足大部分项目需求 -->
<property name="log.path" value="/home/ruoyi/logs" /> <if condition='property("os.name").contains("Windows")'>
<then>
<!-- 控制台输出 -->
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder>
</appender>
<logger name="com.ruoyi" level="DEBUG" />
<logger name="ch.qos.logback" level="WARN" />
<root level="DEBUG">
<appender-ref ref="Console" /><!-- 输出到控制台-->
</root>
</then>
<else>
<property name="LOG_HOME" value="${user.dir}/log" />
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<!-- 普通日志，INFO -->
<!-- 控制台输出 --> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<encoder> <FileNamePattern>
<pattern>${log.pattern}</pattern> ${LOG_HOME}/%d{yyyy-MM-dd}.%i.log
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</FileNamePattern>
<!-- 保留最多15天的日志，过期的日志会被自动删除 -->
<maxHistory>10</maxHistory>
<!-- 保留最多3GB的日志，过期的日志会被自动删除 -->
<totalSizeCap>3GB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>
<!-- 系统日志输出 --> <!-- 错误日志，ERROR -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file> <!-- 过滤器，只记录WARN级别的日志 -->
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
<level>ERROR</level> <level>ERROR</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch> <onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>
${LOG_HOME}/%d{yyyy-MM-dd}.%i.error.log
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</FileNamePattern>
<!-- 保留最多15天的日志，过期的日志会被自动删除 -->
<maxHistory>15</maxHistory>
<!-- 保留最多3GB的日志，过期的日志会被自动删除 -->
<totalSizeCap>3GB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
</encoder>
</appender> </appender>
<!-- 用户访问日志输出 --> <!-- 用户访问日志输出 -->
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-user.log</file> <file>${LOG_HOME}/sys-user.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 按天回滚 daily --> <!-- 按天回滚 daily -->
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>${LOG_HOME}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 --> <!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <maxHistory>60</maxHistory>
</rollingPolicy> </rollingPolicy>
@ -71,23 +78,20 @@
</encoder> </encoder>
</appender> </appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" /> <logger name="com.ruoyi" level="INFO" />
<logger name="ch.qos.logback" level="WARN" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />
<root level="DEBUG">
<root level="info"> <appender-ref ref="FILE" />
<appender-ref ref="console" /> <appender-ref ref="FILE_ERROR" />
</root> </root>
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
<!--系统用户操作日志--> <!--系统用户操作日志-->
<logger name="sys-user" level="info"> <logger name="sys-user" level="info">
<appender-ref ref="sys-user"/> <appender-ref ref="sys-user"/>
</logger> </logger>
</else>
</if>
</configuration> </configuration>

12
ruoyi-admin/src/main/resources/templates/dfm/queueManage.html
View File

@ -152,28 +152,28 @@
//获取列表中所有数据 //获取列表中所有数据
var rows = $('#bootstrap-table').bootstrapTable('getData',{useCurrentPage:true,includeHiddenRows:true}); var rows = $('#bootstrap-table').bootstrapTable('getData',{useCurrentPage:true,includeHiddenRows:true});
var upImg = "/img/up.gif"; var upImg = "<i class='fa fa-arrow-up'></i>";
var downImg = "/img/down.gif"; var downImg = "<i class='fa fa-arrow-down'></i>";
if(index == 0) { if(index == 0) {
if(hasPre) { if(hasPre) {
html += "<a href=\"javascript:changePri("+ row.id +",'up');\"><img style=\"border:0px;\"src=\""+ upImg +"\" /></a>"; html += "<a style='margin-right: 10px' href=\"javascript:changePri("+ row.id +",'up');\">"+upImg+"</a>";
} }
} else { } else {
if(PROJECT_STATE_DAICHA == rows[index-1].state) if(PROJECT_STATE_DAICHA == rows[index-1].state)
{ {
html += "<a href=\"javascript:changePri("+ row.id +",'up');\"><img style=\"border:0px;\"src=\""+ upImg + "\" /></a>"; html += "<a style='margin-right: 10px' href=\"javascript:changePri("+ row.id +",'up');\">"+upImg+"</a>";
} }
} }
if(index == rows.length-1) { if(index == rows.length-1) {
if(hasNext) { if(hasNext) {
html += "<a href=\"javascript:changePri("+ row.id +",'down');\"><img style=\"border:0px;\"src=\"/img/down.gif\" /></a>"; html += "<a style='margin-right: 10px' href=\"javascript:changePri("+ row.id +",'down');\">"+downImg+"</a>";
} }
} else { } else {
if(PROJECT_STATE_DAICHA == rows[index+1].state) if(PROJECT_STATE_DAICHA == rows[index+1].state)
{ {
html += "<a href=\"javascript:changePri("+ row.id +",'down');\"><img style=\"border:0px;\"src=\"/img/down.gif\" /></a>"; html += "<a style='margin-right: 10px' href=\"javascript:changePri("+ row.id +",'down');\">"+downImg+"</a>";
} }
} }
return html; return html;