diff --git a/crmeb-admin/src/main/resources/logback-spring.xml b/crmeb-admin/src/main/resources/logback-spring.xml
index 7e8d5a1..2767223 100644
--- a/crmeb-admin/src/main/resources/logback-spring.xml
+++ b/crmeb-admin/src/main/resources/logback-spring.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!-- 根据需要自行配置 -->
+    <springProperty scope="context" name="LOG_PORT" source="server.port"/>
     <property name="APP_NAME" value="Crmeb"/>
-    <property name="log.path" value="crmeb_admin_log"></property>
+    <!--<property name="log.path" value="/www/wwwroot/crmeb_front_log/${LOG_PORT}}"></property>-->
+    <property name="log.path" value="../crmeb_front_log/${LOG_PORT}}"></property>
 
     <!--"@timestamp": "2019-06-27T09:59:41.897+08:00",-->
     <!--"@version": "1",-->
@@ -31,16 +33,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -60,16 +64,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -81,7 +87,7 @@
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录debug级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -101,16 +107,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -122,7 +130,7 @@
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录info级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -142,16 +150,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -183,16 +193,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -203,7 +215,7 @@
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录ERROR级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -213,12 +225,47 @@
         </filter>
     </appender>
 
+    <!--<appender name="LOGSTASH" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+    <!--<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
+
+    <!--<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+    <!--<fileNamePattern>${LOG_HOME}/${APP_NAME}-%d{yyyy-MM-dd}.log</fileNamePattern>-->
+    <!--</rollingPolicy>-->
+
+    <!--</appender>-->
+
+
+    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${log.path}/log_all.log</file>
+        <!-- 日志文件输出格式 -->
+        <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>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/all/log-all-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!-- 日志文件保留天数 -->
+            <maxHistory>3</maxHistory>
+        </rollingPolicy>
+        <!-- 设置此 appender 的最低日志级别 -->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+    </appender>
+
     <!-- 日志输出级别 -->
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="DEBUG_FILE" />
-<!--        <appender-ref ref="INFO_FILE" />-->
-<!--        <appender-ref ref="WARN_FILE" />-->
+        <appender-ref ref="ALL_FILE" />
+        <appender-ref ref="INFO_FILE" />
+        <!--        <appender-ref ref="WARN_FILE" />-->
         <appender-ref ref="ERROR_FILE" />
+        <!--<appender-ref ref="LOGSTASH"/>-->
     </root>
 </configuration>
diff --git a/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java b/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java
index ae08d78..79c37b0 100644
--- a/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java
+++ b/crmeb-common/src/main/java/com/zbkj/common/acpect/ControllerAspect.java
@@ -29,7 +29,7 @@ public class ControllerAspect {
 
     Logger logger = LoggerFactory.getLogger(ControllerAspect.class);
 
-    @Pointcut("execution(* com.zbkj.crmeb.system.controller.*.*(..))")
+    @Pointcut("execution(* com.zbkj.*.controller.*.*(..))")
     private void pointCutMethodController() {
 
     }
diff --git a/crmeb-front/src/main/resources/logback-spring.xml b/crmeb-front/src/main/resources/logback-spring.xml
index 42efa5d..2767223 100644
--- a/crmeb-front/src/main/resources/logback-spring.xml
+++ b/crmeb-front/src/main/resources/logback-spring.xml
@@ -4,7 +4,7 @@
     <springProperty scope="context" name="LOG_PORT" source="server.port"/>
     <property name="APP_NAME" value="Crmeb"/>
     <!--<property name="log.path" value="/www/wwwroot/crmeb_front_log/${LOG_PORT}}"></property>-->
-    <property name="log.path" value="crmeb_front_log/${LOG_PORT}}"></property>
+    <property name="log.path" value="../crmeb_front_log/${LOG_PORT}}"></property>
 
     <!--"@timestamp": "2019-06-27T09:59:41.897+08:00",-->
     <!--"@version": "1",-->
@@ -33,16 +33,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -62,16 +64,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -83,7 +87,7 @@
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录debug级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -103,16 +107,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -124,7 +130,7 @@
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录info级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -144,16 +150,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -185,16 +193,18 @@
             <!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
             <pattern>
 
-                <pattern>
-                    {
-                    "app": "${APP_NAME}",
-                    "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                    "level": "%level",
-                    "thread": "%thread",
-                    "class": "%logger{40}",
-                    "message": "%msg" }
-                    %n
-                </pattern>
+                <!-- <pattern>
+                     {
+                     "app": "${APP_NAME}",
+                     "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
+                     "level": "%level",
+                     "thread": "%thread",
+                     "class": "%logger{40}",
+                     "message": "%msg" }
+                     %n
+                 </pattern>-->
+                <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</pattern>
+
             </pattern>
             <charset>utf-8</charset>
         </encoder>
@@ -205,7 +215,7 @@
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
             <!--日志文件保留天数-->
-            <maxHistory>30</maxHistory>
+            <maxHistory>3</maxHistory>
         </rollingPolicy>
         <!-- 此日志文件只记录ERROR级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -216,19 +226,45 @@
     </appender>
 
     <!--<appender name="LOGSTASH" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
-        <!--<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
+    <!--<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
 
-        <!--<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
-            <!--<fileNamePattern>${LOG_HOME}/${APP_NAME}-%d{yyyy-MM-dd}.log</fileNamePattern>-->
-        <!--</rollingPolicy>-->
+    <!--<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+    <!--<fileNamePattern>${LOG_HOME}/${APP_NAME}-%d{yyyy-MM-dd}.log</fileNamePattern>-->
+    <!--</rollingPolicy>-->
 
     <!--</appender>-->
+
+
+    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${log.path}/log_all.log</file>
+        <!-- 日志文件输出格式 -->
+        <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>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/all/log-all-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!-- 日志文件保留天数 -->
+            <maxHistory>3</maxHistory>
+        </rollingPolicy>
+        <!-- 设置此 appender 的最低日志级别 -->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+    </appender>
+
     <!-- 日志输出级别 -->
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="DEBUG_FILE" />
-<!--        <appender-ref ref="INFO_FILE" />-->
-<!--        <appender-ref ref="WARN_FILE" />-->
+        <appender-ref ref="ALL_FILE" />
+        <appender-ref ref="INFO_FILE" />
+        <!--        <appender-ref ref="WARN_FILE" />-->
         <appender-ref ref="ERROR_FILE" />
         <!--<appender-ref ref="LOGSTASH"/>-->
     </root>