Merge branch 'master' of ssh://192.168.240.178:18081/eapim/eapim-admin

# Conflicts:
#	WebContent/WEB-INF/properties/env.P.properties
#	src/main/resources/logback-dev.xml
This commit is contained in:
Rinjae
2025-09-26 16:18:03 +09:00
73 changed files with 9415 additions and 66 deletions
+2 -5
View File
@@ -5,14 +5,11 @@
<property name="LOG_HOME" value="/Log/App/eapim/${inst.Name:-devSvr00}" />
<property name="BACKUP_HOME" value="${LOG_HOME}/backup/" />
<property name="LOG_LEVEL" value="${LOGBACK_LOG_LEVEL:-DEBUG}" />
<property name="PREFIX" value="${inst.Type:-ems}"></property>
<property name="LOG_HOME" value="/Log/apim/${PREFIX}/${inst.Name}"></property>
<property name="BACKUP_HOME" value="${LOG_HOME}/backup/"></property>
<property name="LOG_LEVEL" value="${LOGBACK_LOG_LEVEL:-DEBUG}" />
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>utf-8</charset>
<pattern>%d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
@@ -28,6 +25,7 @@
<maxHistory>10</maxHistory>
</rollingPolicy>
<encoder>
<charset>utf-8</charset>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
@@ -176,6 +174,5 @@
<root>
<level value="DEBUG" />
<appender-ref ref="STDOUT" />
<appender-ref ref="CONSOLE" />
</root>
</configuration>