From 630cb0babb264657d8a07476e328654573620f8c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 一月 2022 13:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-core/src/main/java/com/java110/core/log/LoggerFactory.java |   55 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/log/LoggerFactory.java b/java110-core/src/main/java/com/java110/core/log/LoggerFactory.java
index 258b4f7..b893ec1 100644
--- a/java110-core/src/main/java/com/java110/core/log/LoggerFactory.java
+++ b/java110-core/src/main/java/com/java110/core/log/LoggerFactory.java
@@ -1,5 +1,6 @@
 package com.java110.core.log;
 
+import com.java110.dto.system.SystemLogDto;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
 
@@ -25,23 +26,23 @@
 
     @Override
     public boolean isTraceEnabled() {
-        return LogAgent.getLogSwatch();
+        return SystemLogDto.getLogSwatch();
     }
 
 
     @Override
     public boolean isDebugEnabled() {
-        return LogAgent.getLogSwatch();
+        return SystemLogDto.getLogSwatch();
     }
 
     @Override
     public boolean isInfoEnabled() {
-        return LogAgent.getLogSwatch();
+        return SystemLogDto.getLogSwatch();
     }
 
     @Override
     public boolean isErrorEnabled() {
-        return LogAgent.getLogSwatch();
+        return SystemLogDto.getLogSwatch();
     }
 
 
@@ -61,35 +62,35 @@
         return this.logger.isDebugEnabled(marker);
     }
     public void trace(String message) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(this.logPrefix + message);
         }
 
     }
 
     public void trace(String message, Object arg) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(this.logPrefix + message, arg);
         }
 
     }
 
     public void trace(String message, Object arg1, Object arg2) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(this.logPrefix + message, arg1, arg2);
         }
 
     }
 
     public void trace(String message, Object... args) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(this.logPrefix + message, args);
         }
 
     }
 
     public void trace(String msg, Throwable t) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(this.logPrefix + msg, t);
         }
 
@@ -101,35 +102,35 @@
     }
 
     public void trace(Marker marker, String msg) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(marker, this.logPrefix + msg);
         }
 
     }
 
     public void trace(Marker marker, String format, Object arg) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(marker, this.logPrefix + format, arg);
         }
 
     }
 
     public void trace(Marker marker, String format, Object arg1, Object arg2) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(marker, this.logPrefix + format, arg1, arg2);
         }
 
     }
 
     public void trace(Marker marker, String format, Object... argArray) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(marker, this.logPrefix + format, argArray);
         }
 
     }
 
     public void trace(Marker marker, String msg, Throwable t) {
-        if (this.logger.isTraceEnabled()) {
+        if (this.isTraceEnabled()) {
             this.logger.trace(marker, this.logPrefix + msg, t);
         }
 
@@ -137,35 +138,35 @@
 
 
     public void debug(String message) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(this.logPrefix + message);
         }
 
     }
 
     public void debug(String message, Object arg) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(this.logPrefix + message, arg);
         }
 
     }
 
     public void debug(String message, Object arg1, Object arg2) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(this.logPrefix + message, arg1, arg2);
         }
 
     }
 
     public void debug(String message, Object... args) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(this.logPrefix + message, args);
         }
 
     }
 
     public void debug(String msg, Throwable t) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(this.logPrefix + msg, t);
         }
 
@@ -173,35 +174,35 @@
 
 
     public void debug(Marker marker, String msg) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(marker, this.logPrefix + msg);
         }
 
     }
 
     public void debug(Marker marker, String format, Object arg) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(marker, this.logPrefix + format, arg);
         }
 
     }
 
     public void debug(Marker marker, String format, Object arg1, Object arg2) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(marker, this.logPrefix + format, arg1, arg2);
         }
 
     }
 
     public void debug(Marker marker, String format, Object... arguments) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(marker, this.logPrefix + format, arguments);
         }
 
     }
 
     public void debug(Marker marker, String msg, Throwable t) {
-        if (this.logger.isDebugEnabled()) {
+        if (this.isDebugEnabled()) {
             this.logger.debug(marker, this.logPrefix + msg, t);
         }
 
@@ -272,7 +273,7 @@
     }
 
     public void error(String message, Object... args) {
-        if (this.logger.isErrorEnabled()) {
+        if (this.isErrorEnabled()) {
             this.logger.error(this.logPrefix + message, args);
         }
     }
@@ -304,7 +305,7 @@
     }
 
     public void info(String message) {
-        if (this.logger.isInfoEnabled()) {
+        if (this.isInfoEnabled()) {
             this.logger.info(this.logPrefix + message);
         }
     }
@@ -318,7 +319,7 @@
     }
 
     public void info(String message, Object... args) {
-        if (this.logger.isInfoEnabled()) {
+        if (this.isInfoEnabled()) {
             this.logger.info(this.logPrefix + message, args);
         }
     }

--
Gitblit v1.8.0