move DesensitizedConverter to package common

Author: 317787106

…on/logsfilter/DesensitizedConverter.java …on/log/layout/DesensitizedConverter.javaframework/src/main/java/org/tron/common/logsfilter/DesensitizedConverter.java renamed to common/src/main/java/org/tron/common/log/layout/DesensitizedConverter.java framework/src/main/java/org/tron/common/logsfilter/DesensitizedConverter.java renamed to common/src/main/java/org/tron/common/log/layout/DesensitizedConverter.java

@@ -1,4 +1,4 @@
-package org.tron.common.logsfilter;
+package org.tron.common.log.layout;
 
 import ch.qos.logback.classic.pattern.ClassicConverter;
 import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -7,7 +7,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
-import org.tron.core.config.args.Args;
+import org.tron.common.parameter.CommonParameter;
 
 @Slf4j(topic = "Parser")
 public class DesensitizedConverter extends ClassicConverter {
@@ -44,6 +44,6 @@ private String desensitization(String content) {
   @Override
   public String convert(ILoggingEvent iLoggingEvent) {
     String source = iLoggingEvent.getFormattedMessage();
-    return Args.getInstance().isFastForward() ? desensitization(source) : source;
+    return CommonParameter.getInstance().isFastForward() ? desensitization(source) : source;
   }
 }

framework/src/main/java/org/tron/core/net/service/relay/RelayService.java

@@ -18,7 +18,7 @@
 import org.tron.common.crypto.SignInterface;
 import org.tron.common.crypto.SignUtils;
 import org.tron.common.es.ExecutorServiceManager;
-import org.tron.common.logsfilter.DesensitizedConverter;
+import org.tron.common.log.layout.DesensitizedConverter;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.ByteUtil;

framework/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
   <!-- Be sure to flush latest logs on exit -->
   <shutdownHook class="org.tron.core.config.TronLogShutdownHook"/>
   <conversionRule conversionWord="m"
-    converterClass="org.tron.common.logsfilter.DesensitizedConverter"/>
+    converterClass="org.tron.common.log.layout.DesensitizedConverter"/>
 
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>

framework/src/test/java/org/tron/common/logsfilter/DesensitizedConverterTest.java

@@ -4,6 +4,7 @@
 import java.lang.reflect.Method;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tron.common.log.layout.DesensitizedConverter;
 
 public class DesensitizedConverterTest {