优化代码

java110-core/src/main/java/com/java110/core/log/LogAgent.java

@@ -25,6 +25,9 @@ public class LogAgent extends LoggerEngine{
     public static final String LOG_STATUS_S = "S";
     public static final String LOG_STATUS_F = "F";
 
+    private static String logSwatch = "logSwatch";
+    private static String LOG_SWATCH_ON = "ON";
+
 
     /**
      * 发送日志
@@ -136,4 +139,11 @@ public class LogAgent extends LoggerEngine{
         return message;
     }
 
+    public static boolean getLogSwatch() {
+        return logSwatch == LogAgent.LOG_SWATCH_ON?true:false;
+    }
+
+    public static void setLogSwatch(String logSwatch) {
+        LogAgent.logSwatch = logSwatch;
+    }
 }

java110-core/src/main/java/com/java110/core/log/LoggerFactory.java

@@ -0,0 +1,359 @@
+package com.java110.core.log;
+
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+
+public class LoggerFactory implements Logger {
+
+    private final Logger logger;
+
+    private final String logPrefix = "";
+
+    public LoggerFactory(Logger logger) {
+        this.logger = logger;
+    }
+
+    public static Logger getLogger(Class<?> clazz) {
+        Logger logger = org.slf4j.LoggerFactory.getLogger(clazz);
+        return new LoggerFactory(logger);
+    }
+
+    @Override
+    public String getName() {
+        return logger.getName();
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return LogAgent.getLogSwatch();
+    }
+
+
+    @Override
+    public boolean isDebugEnabled() {
+        return LogAgent.getLogSwatch();
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return LogAgent.getLogSwatch();
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return LogAgent.getLogSwatch();
+    }
+
+
+    @Override
+    public boolean isErrorEnabled(Marker marker) {
+        return this.isDebugEnabled(marker);
+    }
+
+    @Override
+    public boolean isWarnEnabled(Marker marker) {
+        return this.logger.isWarnEnabled(marker);
+    }
+
+
+    @Override
+    public boolean isDebugEnabled(Marker marker) {
+        return this.logger.isDebugEnabled(marker);
+    }
+    public void trace(String message) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(this.logPrefix + message);
+        }
+
+    }
+
+    public void trace(String message, Object arg) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(this.logPrefix + message, arg);
+        }
+
+    }
+
+    public void trace(String message, Object arg1, Object arg2) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(this.logPrefix + message, arg1, arg2);
+        }
+
+    }
+
+    public void trace(String message, Object... args) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(this.logPrefix + message, args);
+        }
+
+    }
+
+    public void trace(String msg, Throwable t) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(this.logPrefix + msg, t);
+        }
+
+    }
+
+    @Override
+    public boolean isTraceEnabled(Marker marker) {
+        return this.isTraceEnabled(marker);
+    }
+
+    public void trace(Marker marker, String msg) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(marker, this.logPrefix + msg);
+        }
+
+    }
+
+    public void trace(Marker marker, String format, Object arg) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(marker, this.logPrefix + format, arg);
+        }
+
+    }
+
+    public void trace(Marker marker, String format, Object arg1, Object arg2) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(marker, this.logPrefix + format, arg1, arg2);
+        }
+
+    }
+
+    public void trace(Marker marker, String format, Object... argArray) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(marker, this.logPrefix + format, argArray);
+        }
+
+    }
+
+    public void trace(Marker marker, String msg, Throwable t) {
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace(marker, this.logPrefix + msg, t);
+        }
+
+    }
+
+
+    public void debug(String message) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(this.logPrefix + message);
+        }
+
+    }
+
+    public void debug(String message, Object arg) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(this.logPrefix + message, arg);
+        }
+
+    }
+
+    public void debug(String message, Object arg1, Object arg2) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(this.logPrefix + message, arg1, arg2);
+        }
+
+    }
+
+    public void debug(String message, Object... args) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(this.logPrefix + message, args);
+        }
+
+    }
+
+    public void debug(String msg, Throwable t) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(this.logPrefix + msg, t);
+        }
+
+    }
+
+
+    public void debug(Marker marker, String msg) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(marker, this.logPrefix + msg);
+        }
+
+    }
+
+    public void debug(Marker marker, String format, Object arg) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(marker, this.logPrefix + format, arg);
+        }
+
+    }
+
+    public void debug(Marker marker, String format, Object arg1, Object arg2) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(marker, this.logPrefix + format, arg1, arg2);
+        }
+
+    }
+
+    public void debug(Marker marker, String format, Object... arguments) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(marker, this.logPrefix + format, arguments);
+        }
+
+    }
+
+    public void debug(Marker marker, String msg, Throwable t) {
+        if (this.logger.isDebugEnabled()) {
+            this.logger.debug(marker, this.logPrefix + msg, t);
+        }
+
+    }
+
+
+
+    public void warn(String message) {
+        if(this.isWarnEnabled()) {
+            this.logger.warn(this.logPrefix + message);
+        }
+    }
+
+    public void warn(String message, Object arg) {
+        this.logger.warn(this.logPrefix + message, arg);
+    }
+
+    public void warn(String message, Object arg1, Object arg2) {
+        this.logger.warn(this.logPrefix + message, arg1, arg2);
+    }
+
+    public void warn(String message, Object... args) {
+        if(this.isWarnEnabled()) {
+            this.logger.warn(this.logPrefix + message, args);
+        }
+    }
+
+    public void warn(String msg, Throwable t) {
+        this.logger.warn(this.logPrefix + msg, t);
+    }
+
+
+
+    public void warn(Marker marker, String msg) {
+        this.logger.warn(marker, this.logPrefix + msg);
+    }
+
+    public void warn(Marker marker, String format, Object arg) {
+        this.logger.warn(marker, this.logPrefix + format, arg);
+    }
+
+    public void warn(Marker marker, String format, Object arg1, Object arg2) {
+        this.logger.warn(marker, this.logPrefix + format, arg1, arg2);
+    }
+
+    public void warn(Marker marker, String format, Object... arguments) {
+        this.logger.warn(marker, this.logPrefix + format, arguments);
+    }
+
+    public void warn(Marker marker, String msg, Throwable t) {
+        this.logger.warn(marker, this.logPrefix + msg, t);
+    }
+
+
+
+    public void error(String message) {
+        if (this.logger.isErrorEnabled()) {
+            this.logger.error(this.logPrefix + message);
+        }
+    }
+
+    public void error(String message, Object arg) {
+        this.logger.error(this.logPrefix + message, arg);
+    }
+
+    public void error(String message, Object arg1, Object arg2) {
+        this.logger.error(this.logPrefix + message, arg1, arg2);
+    }
+
+    public void error(String message, Object... args) {
+        if (this.logger.isErrorEnabled()) {
+            this.logger.error(this.logPrefix + message, args);
+        }
+    }
+
+    public void error(String msg, Throwable t) {
+        this.logger.error(this.logPrefix + msg, t);
+    }
+
+
+
+    public void error(Marker marker, String msg) {
+        this.logger.error(marker, this.logPrefix + msg);
+    }
+
+    public void error(Marker marker, String format, Object arg) {
+        this.logger.error(marker, this.logPrefix + format, arg);
+    }
+
+    public void error(Marker marker, String format, Object arg1, Object arg2) {
+        this.logger.error(marker, this.logPrefix + format, arg1, arg2);
+    }
+
+    public void error(Marker marker, String format, Object... arguments) {
+        this.logger.error(marker, this.logPrefix + format, arguments);
+    }
+
+    public void error(Marker marker, String msg, Throwable t) {
+        this.logger.error(marker, this.logPrefix + msg, t);
+    }
+
+    public void info(String message) {
+        if (this.logger.isInfoEnabled()) {
+            this.logger.info(this.logPrefix + message);
+        }
+    }
+
+    public void info(String message, Object arg) {
+        this.logger.info(this.logPrefix + message, arg);
+    }
+
+    public void info(String message, Object arg1, Object arg2) {
+        this.logger.info(this.logPrefix + message, arg1, arg2);
+    }
+
+    public void info(String message, Object... args) {
+        if (this.logger.isInfoEnabled()) {
+            this.logger.info(this.logPrefix + message, args);
+        }
+    }
+
+    public void info(String msg, Throwable t) {
+        this.logger.info(this.logPrefix + msg, t);
+    }
+
+    @Override
+    public boolean isInfoEnabled(Marker marker) {
+        return false;
+    }
+
+    public void info(Marker marker, String msg) {
+        this.logger.info(marker, this.logPrefix + msg);
+    }
+
+    public void info(Marker marker, String format, Object arg) {
+        this.logger.info(marker, this.logPrefix + format, arg);
+    }
+
+    public void info(Marker marker, String format, Object arg1, Object arg2) {
+        this.logger.info(marker, this.logPrefix + format, arg1, arg2);
+    }
+
+    public void info(Marker marker, String format, Object... arguments) {
+        this.logger.info(marker, this.logPrefix + format, arguments);
+    }
+
+    public void info(Marker marker, String msg, Throwable t) {
+        this.logger.info(marker, this.logPrefix + msg, t);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return this.isWarnEnabled();
+    }
+}

java110-interface/src/main/java/com/java110/config/properties/code/Java110Properties.java

@@ -99,4 +99,5 @@ public class Java110Properties {
     public void setFtpPath(String ftpPath) {
         this.ftpPath = ftpPath;
     }
+
 }

java110-interface/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds">
 
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
 
     <!-- 控制台输出 -->
     <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
@@ -64,25 +64,22 @@
     <logger name="org.springframework" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="com.java110.api" level="DEBUG">
-        <appender-ref ref="STDOUT_FILE"/>
-    </logger>
     <logger name="com.java110.order" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="DEBUG">
+    <logger name="com.apache.ibatis" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="org.mybatis" level="DEBUG">
+    <logger name="org.mybatis" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.Statement" level="DEBUG">
+    <logger name="druid.sql.Statement" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.ResultSet" level="DEBUG">
+    <logger name="druid.sql.ResultSet" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
@@ -91,7 +88,7 @@
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="io.shardingsphere" level="DEBUG">
+    <logger name="io.shardingsphere" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 

java110-service/src/main/java/com/java110/service/init/ServiceStartInit.java

@@ -1,9 +1,12 @@
 package com.java110.service.init;
 
+import com.java110.core.log.LogAgent;
 import com.java110.utils.factory.ApplicationContextFactory;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.core.env.Environment;
 
 /**
  * Created by wuxw on 2018/5/7.
@@ -12,11 +15,19 @@ public class ServiceStartInit {
 
     private final static Logger logger = LoggerFactory.getLogger(ServiceStartInit.class);
 
+    private static Environment env;
 
     public static void initSystemConfig(ApplicationContext context){
         //加载配置文件，注册订单处理侦听
         try {
             ApplicationContextFactory.setApplicationContext(context);
+            env = context.getEnvironment();
+
+            String logSwitch = env.getProperty("LogSwitch");
+            if(!StringUtil.isEmpty(logSwitch)){
+                //设置日志级别
+                LogAgent.setLogSwatch(logSwitch);
+            }
         }
         catch (Exception ex) {
             throw new IllegalStateException("系统初始化失败", ex);

service-api/src/main/resources/java110.properties

@@ -1,5 +1,7 @@
 java110.mappingPath=
 
+java110.logSwitch=${logSwitch}
+
 # Single file max size
 java110.ftp.multipart.maxFileSize=100Mb
 # All files max size

service-common/src/main/resources/java110.properties

@@ -1,6 +1,5 @@
 java110.mappingPath=classpath:mapper/*/*.xml
 
-
 # Single file max size
 java110.ftp.multipart.maxFileSize=100Mb
 # All files max size

service-community/src/main/resources/java110.properties

@@ -1,3 +1,4 @@
 java110.mappingPath=classpath:mapper/community/**/*.xml,classpath:mapper/service/*.xml
 
 
+

service-dev/src/main/resources/java110.properties

@@ -1,3 +1,2 @@
 java110.mappingPath=classpath:mapper/*/*.xml
 
-

service-fee/src/main/resources/java110.properties

@@ -1,3 +1,4 @@
 java110.mappingPath=classpath:mapper/*/*.xml
 
 
+

service-job/src/main/resources/java110.properties

@@ -1,3 +1,4 @@
 java110.mappingPath=classpath:mapper/*/*.xml
 
 
+