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>

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

@ -1,93 +1,97 @@
<?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>
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" /> <!-- 控制台输出 -->
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
<!-- 控制台输出 --> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<encoder> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<pattern>${log.pattern}</pattern> </encoder>
</encoder> </appender>
</appender> <logger name="com.ruoyi" level="DEBUG" />
<logger name="ch.qos.logback" level="WARN" />
<!-- 系统日志输出 --> <root level="DEBUG">
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender-ref ref="Console" /><!-- 输出到控制台-->
<file>${log.path}/sys-info.log</file> </root>
<!-- 循环政策：基于时间创建日志文件 --> </then>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <else>
<!-- 日志文件名格式 --> <property name="LOG_HOME" value="${user.dir}/log" />
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern> <!-- 日志输出格式 -->
<!-- 日志最大的历史 60天 --> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
<maxHistory>60</maxHistory> <!-- 普通日志，INFO -->
</rollingPolicy> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<pattern>${log.pattern}</pattern> <FileNamePattern>
</encoder> ${LOG_HOME}/%d{yyyy-MM-dd}.%i.log
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- 过滤的级别 --> <maxFileSize>100MB</maxFileSize>
<level>INFO</level> </timeBasedFileNamingAndTriggeringPolicy>
<!-- 匹配时的操作：接收（记录） --> </FileNamePattern>
<onMatch>ACCEPT</onMatch> <!-- 保留最多15天的日志，过期的日志会被自动删除 -->
<!-- 不匹配时的操作：拒绝（不记录） --> <maxHistory>10</maxHistory>
<onMismatch>DENY</onMismatch> <!-- 保留最多3GB的日志，过期的日志会被自动删除 -->
</filter> <totalSizeCap>3GB</totalSizeCap>
</appender> </rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender"> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<file>${log.path}/sys-error.log</file> </encoder>
<!-- 循环政策：基于时间创建日志文件 --> </appender>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 --> <!-- 错误日志，ERROR -->
<fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern> <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 日志最大的历史 60天 --> <!-- 过滤器，只记录WARN级别的日志 -->
<maxHistory>60</maxHistory> <filter class="ch.qos.logback.classic.filter.LevelFilter">
</rollingPolicy> <level>ERROR</level>
<encoder> <onMatch>ACCEPT</onMatch>
<pattern>${log.pattern}</pattern> <onMismatch>DENY</onMismatch>
</encoder> </filter>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 过滤的级别 --> <FileNamePattern>
<level>ERROR</level> ${LOG_HOME}/%d{yyyy-MM-dd}.%i.error.log
<!-- 匹配时的操作：接收（记录） --> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<onMatch>ACCEPT</onMatch> <maxFileSize>100MB</maxFileSize>
<!-- 不匹配时的操作：拒绝（不记录） --> </timeBasedFileNamingAndTriggeringPolicy>
<onMismatch>DENY</onMismatch> </FileNamePattern>
</filter> <!-- 保留最多15天的日志，过期的日志会被自动删除 -->
</appender> <maxHistory>15</maxHistory>
<!-- 保留最多3GB的日志，过期的日志会被自动删除 -->
<!-- 用户访问日志输出 --> <totalSizeCap>3GB</totalSizeCap>
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender"> </rollingPolicy>
<file>${log.path}/sys-user.log</file> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<!-- 按天回滚 daily --> </encoder>
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern> </appender>
<!-- 日志最大的历史 60天 -->
<maxHistory>60</maxHistory> <!-- 用户访问日志输出 -->
</rollingPolicy> <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder> <file>${LOG_HOME}/sys-user.log</file>
<pattern>${log.pattern}</pattern> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
</encoder> <!-- 按天回滚 daily -->
</appender> <fileNamePattern>${LOG_HOME}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
<!-- 系统模块日志级别控制 --> <maxHistory>60</maxHistory>
<logger name="com.ruoyi" level="info" /> </rollingPolicy>
<!-- Spring日志级别控制 --> <encoder>
<logger name="org.springframework" level="warn" /> <pattern>${log.pattern}</pattern>
</encoder>
<root level="info"> </appender>
<appender-ref ref="console" />
</root>
<logger name="com.ruoyi" level="INFO" />
<!--系统操作日志--> <logger name="ch.qos.logback" level="WARN" />
<root level="info"> <!-- Spring日志级别控制 -->
<appender-ref ref="file_info" /> <logger name="org.springframework" level="warn" />
<appender-ref ref="file_error" /> <root level="DEBUG">
</root> <appender-ref ref="FILE" />
<appender-ref ref="FILE_ERROR" />
<!--系统用户操作日志--> </root>
<logger name="sys-user" level="info"> <!--系统用户操作日志-->
<appender-ref ref="sys-user"/> <logger name="sys-user" level="info">
</logger> <appender-ref ref="sys-user"/>
</configuration> </logger>
</else>
</if>
</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;