diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/logback-common.xml b/ruoyi-common/ruoyi-common-web/src/main/resources/logback-common.xml similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/resources/logback-common.xml rename to ruoyi-common/ruoyi-common-web/src/main/resources/logback-common.xml diff --git a/ruoyi-gateway/src/main/resources/logback.xml b/ruoyi-gateway/src/main/resources/logback.xml index a2e187f8..4d66014c 100644 --- a/ruoyi-gateway/src/main/resources/logback.xml +++ b/ruoyi-gateway/src/main/resources/logback.xml @@ -5,6 +5,7 @@ + @@ -14,7 +15,89 @@ - + + + ${log.path}/console.log + + + ${log.path}/console.%d{yyyy-MM-dd}.log + + 1 + + + ${log.pattern} + utf-8 + + + + INFO + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + 0 + + 512 + + + + + + + + 0 + + 512 + + + @@ -24,5 +107,8 @@ + + + diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 2eb383cf..63667389 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -46,11 +46,6 @@ ruoyi-common-web - - com.ruoyi - ruoyi-common-core - - org.springframework.boot diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml index b3a3b25f..04be8cf7 100644 --- a/ruoyi-visual/ruoyi-seata-server/pom.xml +++ b/ruoyi-visual/ruoyi-seata-server/pom.xml @@ -54,8 +54,8 @@ - org.springframework.boot - spring-boot-starter-web + com.ruoyi + ruoyi-common-web log4j-to-slf4j @@ -179,11 +179,6 @@ logstash-logback-encoder - - com.ruoyi - ruoyi-common-core - - diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml index 74c99ac4..392ab9e4 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml @@ -53,8 +53,8 @@ - org.springframework.boot - spring-boot-starter-web + com.ruoyi + ruoyi-common-web org.apache.logging.log4j @@ -96,11 +96,6 @@ fastjson - - com.ruoyi - ruoyi-common-core - - diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml index 2fb0dd7d..1c38091c 100644 --- a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml @@ -30,8 +30,8 @@ - org.springframework.boot - spring-boot-starter-web + com.ruoyi + ruoyi-common-web