diff --git a/.gitignore b/.gitignore
index a9d9eac1bb681fd2b0fe6c6c2e589ebd3cf0c30a..ab0a4fe9e6b6d2c0a619bfe09ad6ff95bd059bbe 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@
 .idea
 .flattened-pom.xml
 logs/
-.DS_Store
\ No newline at end of file
+.DS_Store
+/config2/
\ No newline at end of file
diff --git a/config/logback.xml b/config/logback.xml
index 95e3357b38822767f6230040840ebefe021fab24..94a2966fc683938770f603a9ab30534b23e4a7f5 100644
--- a/config/logback.xml
+++ b/config/logback.xml
@@ -1,307 +1,4 @@
 <!-- Logback configuration. See http://logback.qos.ch/manual/index.html -->
 <configuration scan="true" scanPeriod="10 seconds" debug="false">
-    <conversionRule conversionWord="tenant" converterClass="neatlogic.framework.logback.converter.TenantConverter"/>
-    <conversionRule conversionWord="requestUrl"
-                    converterClass="neatlogic.framework.logback.converter.RequestUrlConverter"/>
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
-
-    <appender name="debugAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/debug.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/debug.log.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>DEBUG</level>
-            <onMatch>NEUTRAL</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="neatlogic.framework.logback.boolex.PathFilterEvaluator">
-                <whitelist>neatlogic.**</whitelist>
-                <blacklist>neatlogic.**.dao.mapper.**</blacklist>
-            </evaluator>
-            <OnMatch>NEUTRAL</OnMatch>
-            <OnMismatch>DENY</OnMismatch>
-        </filter>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-    <appender name="DEBUG" class="ch.qos.logback.classic.AsyncAppender">
-        <discardingThreshold>0</discardingThreshold>
-        <queueSize>50</queueSize>
-        <appender-ref ref="debugAppender"/>
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-    <appender name="infoAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/info.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/info.log.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>NEUTRAL</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="neatlogic.framework.logback.boolex.PathFilterEvaluator">
-                <whitelist>neatlogic.**</whitelist>
-                <blacklist>neatlogic.**.dao.mapper.**</blacklist>
-            </evaluator>
-            <OnMatch>NEUTRAL</OnMatch>
-            <OnMismatch>DENY</OnMismatch>
-        </filter>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-    <appender name="INFO" class="ch.qos.logback.classic.AsyncAppender">
-        <discardingThreshold>0</discardingThreshold>
-        <queueSize>50</queueSize>
-        <appender-ref ref="infoAppender"/>
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-    <appender name="warnAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/warn.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/warn.log.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>WARN</level>
-            <onMatch>NEUTRAL</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-    <appender name="WARN" class="ch.qos.logback.classic.AsyncAppender">
-        <discardingThreshold>0</discardingThreshold>
-        <queueSize>50</queueSize>
-        <appender-ref ref="warnAppender"/>
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-    <appender name="errorAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/error.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/error.log.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>NEUTRAL</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <!--异步输出 -->
-    <appender name="ERROR" class="ch.qos.logback.classic.AsyncAppender">
-        <discardingThreshold>0</discardingThreshold>
-        <queueSize>50</queueSize>
-        <appender-ref ref="errorAppender"/>
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n
-            </Pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-            <outputPatternAsPresentationHeader>false</outputPatternAsPresentationHeader>
-        </encoder>
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="neatlogic.framework.logback.boolex.ConsoleFilterEvaluator">
-                <infoWhitelist>neatlogic.**</infoWhitelist>
-                <debugWhitelist>neatlogic.**</debugWhitelist>
-                <debugBlacklist>neatlogic.**.dao.mapper.**</debugBlacklist>
-                <traceWhitelist>neatlogic.**</traceWhitelist>
-                <traceBlacklist>neatlogic.**.dao.mapper.**</traceBlacklist>
-            </evaluator>
-            <OnMatch>NEUTRAL</OnMatch>
-            <OnMismatch>DENY</OnMismatch>
-        </filter>
-    </appender>
-
-    <!--tagent心跳日志-->
-    <appender name="tagentRegisterAndNettyAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/tagentRegisterAndNetty.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/tagentRegisterAndNetty.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <!--方法执行时间日志-->
-    <appender name="MethodTimingAspectAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/methodTimingAspect.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/methodTimingAspect.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %requestUrl - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <appender name="notifyAuditAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/notifyAudit.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/notifyAudit.log.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <triggeringPolicy
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <appender name="deadlockAuditAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/deadlock.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/deadlock.log.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <triggeringPolicy
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <appender name="sqlTimeoutAuditAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <File>${log4j.home}/sqlTimeout.log</File>
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <FileNamePattern>${log4j.home}/sqlTimeout.log.%i</FileNamePattern>
-            <MinIndex>1</MinIndex>
-            <MaxIndex>5</MaxIndex>
-        </rollingPolicy>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-        <triggeringPolicy
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>100MB</MaxFileSize>
-        </triggeringPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>[%-5level]%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36}[%line] [%tenant] %requestUrl- %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <root level="${log4j.priority}">
-        <appender-ref ref="DEBUG"/>
-        <appender-ref ref="INFO"/>
-        <appender-ref ref="WARN"/>
-        <appender-ref ref="ERROR"/>
-    </root>
-
-    <logger name="org.mybatis" level="INFO" additivity="false"/>
-    <logger name="ch.qos.logback" level="OFF" additivity="false"/>
-    <logger name="java.sql.Connection" level="WARN" additivity="false"/>
-    <logger name="java.sql.Statement" level="INFO" additivity="false"/>
-    <logger name="java.sql.PreparedStatement" level="WARN" additivity="false"/>
-    <logger name="jdbc.connection" level="INFO" additivity="false"/>
-
-    <!-- 通知审计 -->
-    <logger name="notifyAudit" level="INFO" additivity="false">
-        <appender-ref ref="notifyAuditAppender"/>
-    </logger>
-    <!-- mysql死锁日志 -->
-    <logger name="deadlockAudit" level="ERROR" additivity="false">
-        <appender-ref ref="deadlockAuditAppender"/>
-    </logger>
-    <!-- mysql事务超时日志 -->
-    <logger name="sqlTimeoutAudit" level="ERROR" additivity="false">
-        <appender-ref ref="sqlTimeoutAuditAppender"/>
-    </logger>
-    <!--tagent注册、心跳日志-->
-    <logger name="neatlogic.module.tagent.api.TagentRegisterApi" level="ERROR" additivity="false">
-        <appender-ref ref="tagentRegisterAndNettyAppender"/>
-    </logger>
-    <logger name="neatlogic.module.tagent.api.TagentInfoUpdateApi" level="ERROR" additivity="false">
-        <appender-ref ref="tagentRegisterAndNettyAppender"/>
-    </logger>
-    <logger name="neatlogic.module.tagent.api.TagentStatusUpdateApi" level="ERROR" additivity="false">
-        <appender-ref ref="tagentRegisterAndNettyAppender"/>
-    </logger>
-    <logger name="neatlogic.module.process.aop.MethodTimingAspect" level="ERROR" additivity="false">
-        <appender-ref ref="MethodTimingAspectAppender"/>
-    </logger>
+    <include resource="neatlogic/framework/logback/logback-base.xml"/>
 </configuration>