wangshaoping
/
platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

基础框架发布: 8.2.41 

1. 规则引擎将枚举变量替换为枚举值返回给客户端。
  2. 决策引擎增加血缘关系查询
  3. 修改 logback 日志配置

前端核心发布: 8.2.135
  1. 修改错误处理机制
  2. 决策引擎增加血缘关系查询
main
wangshaoping 1 month ago
parent
01817b613d
commit
ad99187028
2 changed files with 202 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 143
      io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml
  2. 142
      io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring2.xml

143
io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring.xml
View File

@ -13,130 +13,105 @@
<property name="homedir" value="${application.home.dir}"/> <property name="homedir" value="${application.home.dir}"/>
<property name="pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n"/> <property name="pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n"/>
<!-- 控制台日志, 仅显示 INFO+ 的日志 --> <!-- 数据库连接日志(ALL) -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <appender name="FILE_DB_CONNECTION_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder> <encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/db-connection.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/db-connection.%d.%i.log</fileNamePattern>
<maxHistory>190</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>INFO</level> <level>TRACE</level>
</filter> </filter>
</appender> </appender>
<!-- 信息日志文件, 仅显示 INFO 的日志 --> <!-- 数据库连接日志(WARN+) -->
<appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE_DB_CONNECTION_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder> <encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/info.log</file> <file>${homedir}/logs/db-connection-error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/info.%d.%i.log</fileNamePattern> <fileNamePattern>${homedir}/logs/db-connection-error.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory> <maxHistory>190</maxHistory>
<maxFileSize>100MB</maxFileSize> <maxFileSize>100MB</maxFileSize>
</rollingPolicy> </rollingPolicy>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level>
</filter>
</appender> </appender>
<root level="info"> <!-- 应用日志(INFO+) -->
<appender-ref ref="STDOUT" /> <appender name="FILE_APPLICATION_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<appender-ref ref="FILE_INFO" />
</root>
<logger name="io.sc.engine.rule.generated" level="debug" additivity="false">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE_INFO" />
</logger>
<!-- 所有日志文件, 显示 TRACE+ 的日志 -->
<!--
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder> <encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/log.log</file> <file>${homedir}/logs/log.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/log.%d.%i.log</fileNamePattern> <fileNamePattern>${homedir}/logs/log.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory> <maxHistory>190</maxHistory>
<maxFileSize>100MB</maxFileSize> <maxFileSize>100MB</maxFileSize>
</rollingPolicy> </rollingPolicy>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>TRACE</level> <level>INFO</level>
</filter> </filter>
</appender> </appender>
-->
<!-- 调试日志文件, 仅显示 DEBUG 的日志 --> <!-- 应用日志(WARN+) -->
<!-- <appender name="FILE_APPLICATION_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<appender name="FILE_DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder> <encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/debug.log</file> <file>${homedir}/logs/log-error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/debug.%d.%i.log</fileNamePattern> <fileNamePattern>${homedir}/logs/log-error.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory> <maxHistory>190</maxHistory>
<maxFileSize>100MB</maxFileSize> <maxFileSize>100MB</maxFileSize>
</rollingPolicy> </rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>DEBUG</level> <level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
-->
<!-- 信息日志文件, 仅显示 INFO 的日志 --> <!-- 决策引擎日志(DEBUG+) -->
<!-- <appender name="FILE_RE_DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder> <encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/info.log</file> <file>${homedir}/logs/re-debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/info.%d.%i.log</fileNamePattern> <fileNamePattern>${homedir}/logs/re-debug.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory> <maxHistory>190</maxHistory>
<maxFileSize>100MB</maxFileSize> <maxFileSize>100MB</maxFileSize>
</rollingPolicy> </rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>INFO</level> <level>DEBUG</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
-->
<!-- 警告日志文件,, 仅显示 WARN 的日志 --> <!-- 控制台日志 -->
<!-- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<appender name="FILE_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder> <encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/warn.log</file> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <level>INFO</level>
<fileNamePattern>${homedir}/logs/warn.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
-->
<!-- 错误日志文件, 仅显示 ERROR 的日志 --> <!-- 根日志 -->
<!--
<appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/error.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-->
<!--
<root level="info"> <root level="info">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />
<appender-ref ref="FILE" /> <appender-ref ref="FILE_APPLICATION_INFO" />
<appender-ref ref="FILE_DEBUG" /> <appender-ref ref="FILE_APPLICATION_ERROR" />
<appender-ref ref="FILE_INFO" />
<appender-ref ref="FILE_WARN" />
<appender-ref ref="FILE_ERROR" />
</root> </root>
-->
<!-- 数据库连接日志(ALL) -->
<logger name="com.zaxxer.hikari" level="trace">
<appender-ref ref="FILE_DB_CONNECTION_ALL" />
<appender-ref ref="FILE_DB_CONNECTION_ERROR" />
</logger>
<!-- 数据库连接日志(WARN+) -->
<logger name="io.sc.platform.jdbc.autoconfigure" level="warn">
<appender-ref ref="FILE_DB_CONNECTION_ALL" />
<appender-ref ref="FILE_DB_CONNECTION_ERROR" />
</logger>
<!-- 决策引擎日志(DEBUG+) -->
<logger name="io.sc.engine.rule.generated" level="debug" additivity="false">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE_RE_DEBUG" />
</logger>
</configuration> </configuration>

142
io.sc.platform.core/src/main/resources/io/sc/platform/core/config/logback-spring2.xml
View File

@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- 自动扫描本文件，如果发生变化，则重新初始化日志系统，并设置每隔5秒钟扫描一次 -->
<configuration debug="false" scan="true" scanPeriod="15 seconds">
<!--
以下为 logback 的 spring 扩展支持的功能，即支持从 application.properties 文件中获取属性，并在此文件中采用 ${} 方式使用。
要使用此功能，必须使用 logback-ext-spring 扩展 jar 包，以 gradle 构建系统，则需要加入以下依赖
dependencies {
compile(
"org.logback-extensions:logback-ext-spring:0.1.2"
)
}
-->
<property name="homedir" value="${application.home.dir}"/>
<property name="pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n"/>
<!-- 控制台日志, 仅显示 INFO+ 的日志 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>INFO</level>
</filter>
</appender>
<!-- 信息日志文件, 仅显示 INFO 的日志 -->
<appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/info.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
</appender>
<root level="info">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE_INFO" />
</root>
<logger name="io.sc.engine.rule.generated" level="debug" additivity="false">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE_INFO" />
</logger>
<!-- 所有日志文件, 显示 TRACE+ 的日志 -->
<!--
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/log.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/log.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>TRACE</level>
</filter>
</appender>
-->
<!-- 调试日志文件, 仅显示 DEBUG 的日志 -->
<!--
<appender name="FILE_DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/debug.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>DEBUG</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-->
<!-- 信息日志文件, 仅显示 INFO 的日志 -->
<!--
<appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/info.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>INFO</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-->
<!-- 警告日志文件,, 仅显示 WARN 的日志 -->
<!--
<appender name="FILE_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/warn.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/warn.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>WARN</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-->
<!-- 错误日志文件, 仅显示 ERROR 的日志 -->
<!--
<appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder><pattern>${pattern}</pattern></encoder>
<file>${homedir}/logs/error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${homedir}/logs/error.%d.%i.log</fileNamePattern>
<maxHistory>180</maxHistory>
<maxFileSize>100MB</maxFileSize>
</rollingPolicy>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-->
<!--
<root level="info">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
<appender-ref ref="FILE_DEBUG" />
<appender-ref ref="FILE_INFO" />
<appender-ref ref="FILE_WARN" />
<appender-ref ref="FILE_ERROR" />
</root>
-->
</configuration>
Write Preview
Loading…
Cancel
Save