diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java index c83d8c2fe8..ee3c30fe90 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java @@ -1,7 +1,6 @@ package com.yxt.anrui.base; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -9,7 +8,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author dimengzhe */ -@EnableLoggingClient @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", "com.yxt.anrui.base" diff --git a/anrui-base/anrui-base-biz/src/main/resources/application.yml b/anrui-base/anrui-base-biz/src/main/resources/application.yml index 33c87604c4..34c87c5f37 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/application.yml +++ b/anrui-base/anrui-base-biz/src/main/resources/application.yml @@ -60,12 +60,3 @@ templateUrl: prefixUrl: http://120.46.131.15:8111/template/ -#配置ApiBoot Logging 日志组件 -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true - - diff --git a/anrui-base/anrui-base-biz/src/main/resources/logback-spring.xml b/anrui-base/anrui-base-biz/src/main/resources/logback-spring.xml index 9303b5381c..dd20b6ddb9 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/logback-spring.xml +++ b/anrui-base/anrui-base-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,50 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java index 1e5b2cf25f..53736970ac 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java @@ -1,7 +1,6 @@ package com.yxt.anrui.buscenter; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -10,7 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author dimengzhe */ -@EnableLoggingClient @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", "com.yxt.anrui.buscenter" diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application.yml b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application.yml index 69a46e157a..7ed1c1cc94 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application.yml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application.yml @@ -53,13 +53,6 @@ ribbon: ReadTimeout: 30000 ConnectTimeout: 30000 -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true - diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/logback-spring.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/logback-spring.xml index 7bbc07f6fd..74c0b4801f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/logback-spring.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,50 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java index 574923f721..c9d7087353 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java @@ -1,7 +1,6 @@ package com.yxt.anrui.crm; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -11,7 +10,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * @author dimengzhe */ -@EnableLoggingClient @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", "com.yxt.anrui.crm" diff --git a/anrui-crm/anrui-crm-biz/src/main/resources/application.yml b/anrui-crm/anrui-crm-biz/src/main/resources/application.yml index 2be18ec679..e979a1a3b0 100644 --- a/anrui-crm/anrui-crm-biz/src/main/resources/application.yml +++ b/anrui-crm/anrui-crm-biz/src/main/resources/application.yml @@ -40,13 +40,6 @@ mybatis-plus: call-setters-on-nulls: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true - diff --git a/anrui-crm/anrui-crm-biz/src/main/resources/logback-spring.xml b/anrui-crm/anrui-crm-biz/src/main/resources/logback-spring.xml index af6416bb83..c438d3ef2a 100644 --- a/anrui-crm/anrui-crm-biz/src/main/resources/logback-spring.xml +++ b/anrui-crm/anrui-crm-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,50 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java index 62a305fa32..5018991af4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/AnruiFinApplication.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.fin; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -44,7 +43,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @version 1.0 * @since 1.0 */ -@EnableLoggingClient @EnableDiscoveryClient @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/application.yml b/anrui-fin/anrui-fin-biz/src/main/resources/application.yml index 7f40812020..7a0c4e8349 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/application.yml +++ b/anrui-fin/anrui-fin-biz/src/main/resources/application.yml @@ -38,11 +38,4 @@ hystrix: #ribbon的超时时间 ribbon: ReadTimeout: 30000 - ConnectTimeout: 30000 - -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true \ No newline at end of file + ConnectTimeout: 30000 \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/logback-spring.xml b/anrui-fin/anrui-fin-biz/src/main/resources/logback-spring.xml index 375fae851f..1a369b5492 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/logback-spring.xml +++ b/anrui-fin/anrui-fin-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,54 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java index 920c5ad7cf..81ec6b7f8f 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/FlowableApplication.java @@ -1,7 +1,6 @@ package com.yxt.anrui.flowable; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -20,7 +19,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; }) @EnableDiscoveryClient @EnableFeignClients(basePackages = {"com.yxt.anrui.portal"}) -@EnableLoggingClient public class FlowableApplication { public static void main(String[] args) { diff --git a/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml b/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml index 41f4335ab0..42fdaed56c 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml +++ b/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml @@ -67,10 +67,3 @@ mybatis-plus: call-setters-on-nulls: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true - diff --git a/anrui-flowable/anrui-flowable-biz/src/main/resources/logback-spring.xml b/anrui-flowable/anrui-flowable-biz/src/main/resources/logback-spring.xml index 73e1c20afe..f2e1a0e0e6 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/resources/logback-spring.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,106 @@ - - - - - - - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - + + + - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true + + + + + + + + + + + + - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + ${CONSOLE_LOG_PATTERN} - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log + + + ${log.path}/sys-info.log + - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 60 - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + ${log.pattern} + - warn + + INFO + ACCEPT + DENY - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.path}/sys-error.log + - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB - + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 60 - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + ${log.pattern} - info + + ERROR + ACCEPT + DENY - + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 60 + - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + ${log.pattern} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java index 81825ae658..95b7f3cf5f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java @@ -1,7 +1,6 @@ package com.yxt.anrui.portal; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -10,7 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author dimengzhe */ -@EnableLoggingClient @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", "com.yxt.anrui.portal" diff --git a/anrui-portal/anrui-portal-biz/src/main/resources/application.yml b/anrui-portal/anrui-portal-biz/src/main/resources/application.yml index 0f352edc10..bf4df61b97 100644 --- a/anrui-portal/anrui-portal-biz/src/main/resources/application.yml +++ b/anrui-portal/anrui-portal-biz/src/main/resources/application.yml @@ -56,12 +56,6 @@ hystrix: ribbon: ReadTimeout: 30000 ConnectTimeout: 30000 -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true diff --git a/anrui-portal/anrui-portal-biz/src/main/resources/logback-spring.xml b/anrui-portal/anrui-portal-biz/src/main/resources/logback-spring.xml index fef7e8e8e0..9e5d65f038 100644 --- a/anrui-portal/anrui-portal-biz/src/main/resources/logback-spring.xml +++ b/anrui-portal/anrui-portal-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,50 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java index 3675b23b6e..6546639b6a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java @@ -1,7 +1,6 @@ package com.yxt.anrui.riskcenter; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -10,7 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author dimengzhe */ -@EnableLoggingClient @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", "com.yxt.anrui.riskcenter" diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml index 5ed76ddd17..037701b698 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml @@ -38,13 +38,6 @@ mybatis-plus: call-setters-on-nulls: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true - diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml index 18c7f3dca3..74c0b4801f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,50 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java index c410067d67..0add3a3f90 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.scm; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -44,7 +43,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @version 1.0 * @since 1.0 */ -@EnableLoggingClient @EnableDiscoveryClient @SpringBootApplication(scanBasePackages = { "com.yxt.common.base.config", diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/application.yml b/anrui-scm/anrui-scm-biz/src/main/resources/application.yml index e31b2c8b39..e83f16c41c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/resources/application.yml +++ b/anrui-scm/anrui-scm-biz/src/main/resources/application.yml @@ -38,11 +38,4 @@ hystrix: #ribbon的超时时间 ribbon: ReadTimeout: 30000 - ConnectTimeout: 30000 - -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true \ No newline at end of file + ConnectTimeout: 30000 \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/logback-spring.xml b/anrui-scm/anrui-scm-biz/src/main/resources/logback-spring.xml index 635650e460..daec56d908 100644 --- a/anrui-scm/anrui-scm-biz/src/main/resources/logback-spring.xml +++ b/anrui-scm/anrui-scm-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,54 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + + - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index c310dc3458..2f04e2bd5c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -1,7 +1,6 @@ package com.yxt.anrui.terminal; -import org.minbox.framework.logging.spring.context.annotation.client.EnableLoggingClient; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -10,7 +9,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author dimengzhe */ -@EnableLoggingClient @SpringBootApplication(scanBasePackages = { "com.yxt.anrui.terminal", "com.yxt.common.base.config" diff --git a/anrui-terminal/anrui-terminal-biz/src/main/resources/application.yml b/anrui-terminal/anrui-terminal-biz/src/main/resources/application.yml index cf3716af87..5fc74e9e02 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/resources/application.yml +++ b/anrui-terminal/anrui-terminal-biz/src/main/resources/application.yml @@ -39,13 +39,6 @@ ribbon: ReadTimeout: 30000 ConnectTimeout: 30000 -api: - boot: - logging: - show-console-log: true - #实现美化打印请求日志 - format-console-log-json: true - diff --git a/anrui-terminal/anrui-terminal-biz/src/main/resources/logback-spring.xml b/anrui-terminal/anrui-terminal-biz/src/main/resources/logback-spring.xml index b6cfc9da19..6b6f04a37e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/resources/logback-spring.xml +++ b/anrui-terminal/anrui-terminal-biz/src/main/resources/logback-spring.xml @@ -1,99 +1,50 @@ - - - - + + + + - %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) - - - - - - - ${LOG_PATH}/${APPDIR}/log_error.log - - ${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 500MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 + + + %yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n) + + - - error - ACCEPT - DENY - - - - ${LOG_PATH}/${APPDIR}/log_warn.log - - ${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 2MB - - - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - warn - ACCEPT - DENY - - + + + + + + + - - - - ${LOG_PATH}/${APPDIR}/log_info.log + + ${log.base}.log - ${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 2MB + ${log.base}.%d{yyyyMMdd}.%i.log.zip + + + + 1MB - true - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n - utf-8 - - - info - ACCEPT - DENY - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} + -%msg%n + - - - - - - - - - - - - - - + + \ No newline at end of file