FrozenWatermelon před 3 roky
rodič
revize
2dfeee1036

+ 1 - 1
db/yami_shop.sql

@@ -6167,7 +6167,7 @@ CREATE TABLE `tz_user` (
   `nick_name` varchar(50) DEFAULT NULL COMMENT '用户昵称',
   `real_name` varchar(50) DEFAULT NULL COMMENT '真实姓名',
   `user_mail` varchar(100) DEFAULT NULL COMMENT '用户邮箱',
-  `login_password` varchar(50) DEFAULT NULL COMMENT '登录密码',
+  `login_password` varchar(255) DEFAULT NULL COMMENT '登录密码',
   `pay_password` varchar(50) DEFAULT NULL COMMENT '支付密码',
   `user_mobile` varchar(50) DEFAULT NULL COMMENT '手机号码',
   `modify_time` datetime NOT NULL COMMENT '修改时间',

+ 0 - 8
pom.xml

@@ -158,10 +158,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-tomcat</artifactId>
@@ -172,10 +168,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

+ 2 - 2
yami-shop-admin/src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ spring:
       idle-timeout: 10000
       auto-commit: true
       connection-test-query: SELECT 1
-  cache: 
+  cache:
     type: redis
     redis:
       cache-null-values: true
@@ -21,4 +21,4 @@ spring:
     redisson:
       config: classpath:redisson.yml
 logging:
-  config: classpath:log4j2_dev.xml
+  config: classpath:logback-dev.xml

+ 1 - 1
yami-shop-admin/src/main/resources/application-docker.yml

@@ -17,4 +17,4 @@ spring:
     redisson:
       config: classpath:redisson-docker.yml
 logging:
-  config: classpath:log4j2_prod.xml
+  config: classpath:logback-prod.xml

+ 1 - 1
yami-shop-admin/src/main/resources/application-prod.yml

@@ -17,4 +17,4 @@ spring:
     redisson:
       config: classpath:redisson.yml
 logging:
-  config: classpath:log4j2_prod.xml
+  config: classpath:logback-prod.xml

+ 11 - 11
yami-shop-admin/src/main/resources/banner.txt

@@ -1,11 +1,11 @@
- .----------------.  .----------------.  .----------------.  .----------------.
-| .--------------. || .--------------. || .--------------. || .--------------. |
-| |  ____  ____  | || |      __      | || | ____    ____ | || |     _____    | |
-| | |_  _||_  _| | || |     /  \     | || ||_   \  /   _|| || |    |_   _|   | |
-| |   \ \  / /   | || |    / /\ \    | || |  |   \/   |  | || |      | |     | |
-| |    \ \/ /    | || |   / ____ \   | || |  | |\  /| |  | || |      | |     | |
-| |    _|  |_    | || | _/ /    \ \_ | || | _| |_\/_| |_ | || |     _| |_    | |
-| |   |______|   | || ||____|  |____|| || ||_____||_____|| || |    |_____|   | |
-| |              | || |              | || |              | || |              | |
-| '--------------' || '--------------' || '--------------' || '--------------' |
- '----------------'  '----------------'  '----------------'  '----------------'
+ .----------------.  .----------------.  .----------------.  .----------------.  .----------------.  .----------------.
+| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. |
+| | ____    ____ | || |      __      | || |   _____      | || |   _____      | || |   _    _     | || |     _____    | |
+| ||_   \  /   _|| || |     /  \     | || |  |_   _|     | || |  |_   _|     | || |  | |  | |    | || |    |_   _|   | |
+| |  |   \/   |  | || |    / /\ \    | || |    | |       | || |    | |       | || |  | |__| |_   | || |      | |     | |
+| |  | |\  /| |  | || |   / ____ \   | || |    | |   _   | || |    | |   _   | || |  |____   _|  | || |   _  | |     | |
+| | _| |_\/_| |_ | || | _/ /    \ \_ | || |   _| |__/ |  | || |   _| |__/ |  | || |      _| |_   | || |  | |_' |     | |
+| ||_____||_____|| || ||____|  |____|| || |  |________|  | || |  |________|  | || |     |_____|  | || |  `.___.'     | |
+| |              | || |              | || |              | || |              | || |              | || |              | |
+| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' |
+ '----------------'  '----------------'  '----------------'  '----------------'  '----------------'  '----------------'

+ 0 - 39
yami-shop-admin/src/main/resources/log4j2_dev.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--monitorInterval:Log4j能够自动检测修改配置 文件和重新配置本身,设置间隔秒数-->
-<configuration status="WARN" monitorInterval="60">
-    <Properties>
-        <Property name="PID">????</Property>
-        <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-        <Property name="LOG_LEVEL_PATTERN">%5p</Property>
-        <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-        <!-- 控制台日志格式化,包含颜色-->
-        <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-    </Properties>
-
-    <!--定义appender -->
-    <Appenders>
-        <!-- 默认的控制台日志输出,一般生产环境都是后台启动,这个没太大作用 -->
-        <Console name="Console" target="SYSTEM_OUT" follow="false">
-            <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-        </Console>
-    </Appenders>
-
-    <Loggers>
-        <Logger name="org.mybatis" level="debug"/>
-        <Logger name="com.yami.shop" level="debug"/>
-        <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-        <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-        <Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-        <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-        <!--关闭swagger的类型转换异常的日志 https://github.com/springfox/springfox/issues/2528-->
-        <Logger name="springfox.documentation.swagger2" level="off"/>
-        <Logger name="io.swagger.models.parameters" level="off"/>
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</configuration>

+ 0 - 73
yami-shop-admin/src/main/resources/log4j2_prod.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--monitorInterval:Log4j能够自动检测修改配置 文件和重新配置本身,设置间隔秒数-->
-<configuration status="WARN" monitorInterval="60">
-    <Properties>
-        <Property name="PID">????</Property>
-        <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-        <Property name="LOG_LEVEL_PATTERN">%5p</Property>
-        <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-        <!-- 控制台日志格式化,包含颜色-->
-        <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-        <!-- 日志文件默认输出格式,不带行号输出(行号显示会影响日志输出性能);%C:大写,类名;%M:方法名;%m:错误信息;%n:换行 -->
-        <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-        <!-- 日志默认同类型日志,同一文件夹下可以存放的数量,不设置此属性则默认为7个 -->
-        <Property name="FILE_MAX_HISTORY">50</Property>
-        <Property name="FILE_MAX_SIZE">50MB</Property>
-        <Property name="PROJECT_PATH">/opt/projects/mall4j</Property>
-    </Properties>
-
-    <!--定义appender -->
-    <Appenders>
-        <!-- 默认的控制台日志输出,一般生产环境都是后台启动,这个没太大作用 -->
-        <Console name="Console" target="SYSTEM_OUT" follow="false">
-            <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-        </Console>
-
-        <!--fileName 文件名称-->
-        <!--filePattern 文件路径-->
-        <RollingFile name="DefaultFile" fileName="${PROJECT_PATH}/log/admin.log" filePattern="${PROJECT_PATH}/log/$${date:yyyy-MM}/admin-%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout>
-                <Pattern>${sys:FILE_LOG_PATTERN}</Pattern>
-            </PatternLayout>
-            <DefaultRolloverStrategy max="${FILE_MAX_HISTORY}"/>
-            <Policies>
-                <!--TimeBasedTriggeringPolicy 与 filePattern 结合使用,目前表示每间隔1天保存一遍日志-->
-                <TimeBasedTriggeringPolicy interval="1"/>
-                <SizeBasedTriggeringPolicy size="${FILE_MAX_SIZE}" />
-            </Policies>
-        </RollingFile>
-
-        <RollingFile name="ScheduleFile" fileName="${PROJECT_PATH}/log/schedule.log" filePattern="${PROJECT_PATH}/log/$${date:yyyy-MM}/schedule-%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout>
-                <Pattern>${sys:FILE_LOG_PATTERN}</Pattern>
-            </PatternLayout>
-            <DefaultRolloverStrategy max="${FILE_MAX_HISTORY}"/>
-            <Policies>
-                <TimeBasedTriggeringPolicy interval="1"/>
-                <SizeBasedTriggeringPolicy size="${FILE_MAX_SIZE}" />
-            </Policies>
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <Logger name="org.mybatis" level="debug"/>
-        <Logger name="com.yami.shop" level="debug"/>
-        <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-        <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-        <Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-        <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-        <!--addtivity:用来描述是否向上级logger传递打印信息。默认是true。 -->
-        <!--指定定时任务在特定的log -->
-        <Logger name="com.yami.shop.sys.schedule" level="info" additivity="false">
-            <AppenderRef ref="ScheduleFile"/>
-        </Logger>
-        <!---->
-        <Root level="info">
-            <AppenderRef ref="DefaultFile" />
-        </Root>
-    </Loggers>
-</configuration>

+ 14 - 0
yami-shop-admin/src/main/resources/logback-dev.xml

@@ -0,0 +1,14 @@
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
+    </root>
+
+    <logger name="com.yami.shop" level="debug"/>
+    <logger name="springfox.documentation.swagger2" level="off"/>
+    <logger name="io.swagger.models.parameters" level="off"/>
+    <logger name="springfox.documentation.spring.web.readers.operation" level="off"/>
+</configuration>

+ 38 - 0
yami-shop-admin/src/main/resources/logback-prod.xml

@@ -0,0 +1,38 @@
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <property name="PROJECT_PATH" value="/opt/projects/yami-b2b2c"/>
+    <property name="LOG_FILE_MAX_HISTORY" value="30"/>
+    <property name="LOG_FILE_MAX_SIZE" value="50MB"/>
+
+
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
+    <appender name="DefaultFile"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <append>true</append>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <file>${PROJECT_PATH}/log/api.log</file>
+
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${logging.level}</level>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
+            <maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
+            <maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <root level="info">
+        <!--<appender-ref ref="CONSOLE" />-->
+        <appender-ref ref="DefaultFile" />
+    </root>
+
+    <logger name="com.yami.shop" level="debug"/>
+    <logger name="springfox.documentation.swagger2" level="off"/>
+    <logger name="io.swagger.models.parameters" level="off"/>
+    <logger name="springfox.documentation.spring.web.readers.operation" level="off"/>
+</configuration>

+ 1 - 1
yami-shop-api/src/main/resources/application-dev.yml

@@ -16,5 +16,5 @@ spring:
     redisson:
       config: classpath:redisson.yml
 logging:
-  config: classpath:log4j2_dev.xml
+  config: classpath:logback-dev.xml
 

+ 1 - 1
yami-shop-api/src/main/resources/application-docker.yml

@@ -18,4 +18,4 @@ spring:
     redisson:
       config: classpath:redisson-docker.yml
 logging:
-  config: classpath:log4j2_prod.xml
+  config: classpath:logback-prod.xml

+ 1 - 1
yami-shop-api/src/main/resources/application-prod.yml

@@ -18,4 +18,4 @@ spring:
     redisson:
       config: classpath:redisson.yml
 logging:
-  config: classpath:log4j2_prod.xml
+  config: classpath:logback-prod.xml

+ 11 - 11
yami-shop-api/src/main/resources/banner.txt

@@ -1,11 +1,11 @@
- .----------------.  .----------------.  .----------------.  .----------------.
-| .--------------. || .--------------. || .--------------. || .--------------. |
-| |  ____  ____  | || |      __      | || | ____    ____ | || |     _____    | |
-| | |_  _||_  _| | || |     /  \     | || ||_   \  /   _|| || |    |_   _|   | |
-| |   \ \  / /   | || |    / /\ \    | || |  |   \/   |  | || |      | |     | |
-| |    \ \/ /    | || |   / ____ \   | || |  | |\  /| |  | || |      | |     | |
-| |    _|  |_    | || | _/ /    \ \_ | || | _| |_\/_| |_ | || |     _| |_    | |
-| |   |______|   | || ||____|  |____|| || ||_____||_____|| || |    |_____|   | |
-| |              | || |              | || |              | || |              | |
-| '--------------' || '--------------' || '--------------' || '--------------' |
- '----------------'  '----------------'  '----------------'  '----------------'
+ .----------------.  .----------------.  .----------------.  .----------------.  .----------------.  .----------------.
+| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. |
+| | ____    ____ | || |      __      | || |   _____      | || |   _____      | || |   _    _     | || |     _____    | |
+| ||_   \  /   _|| || |     /  \     | || |  |_   _|     | || |  |_   _|     | || |  | |  | |    | || |    |_   _|   | |
+| |  |   \/   |  | || |    / /\ \    | || |    | |       | || |    | |       | || |  | |__| |_   | || |      | |     | |
+| |  | |\  /| |  | || |   / ____ \   | || |    | |   _   | || |    | |   _   | || |  |____   _|  | || |   _  | |     | |
+| | _| |_\/_| |_ | || | _/ /    \ \_ | || |   _| |__/ |  | || |   _| |__/ |  | || |      _| |_   | || |  | |_' |     | |
+| ||_____||_____|| || ||____|  |____|| || |  |________|  | || |  |________|  | || |     |_____|  | || |  `.___.'     | |
+| |              | || |              | || |              | || |              | || |              | || |              | |
+| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' |
+ '----------------'  '----------------'  '----------------'  '----------------'  '----------------'  '----------------'

+ 0 - 39
yami-shop-api/src/main/resources/log4j2_dev.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--monitorInterval:Log4j能够自动检测修改配置 文件和重新配置本身,设置间隔秒数-->
-<configuration status="WARN" monitorInterval="60">
-    <Properties>
-        <Property name="PID">????</Property>
-        <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-        <Property name="LOG_LEVEL_PATTERN">%5p</Property>
-        <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-        <!-- 控制台日志格式化,包含颜色-->
-        <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-    </Properties>
-
-    <!--定义appender -->
-    <Appenders>
-        <!-- 默认的控制台日志输出,一般生产环境都是后台启动,这个没太大作用 -->
-        <Console name="Console" target="SYSTEM_OUT" follow="false">
-            <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-        </Console>
-    </Appenders>
-
-    <Loggers>
-        <Logger name="org.mybatis" level="debug"/>
-        <Logger name="com.yami.shop" level="debug"/>
-        <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-        <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-        <Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-        <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-        <!--关闭swagger的类型转换异常的日志 https://github.com/springfox/springfox/issues/2528-->
-        <Logger name="springfox.documentation.swagger2" level="off"/>
-        <Logger name="io.swagger.models.parameters" level="off"/>
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-        </Root>
-    </Loggers>
-</configuration>

+ 0 - 59
yami-shop-api/src/main/resources/log4j2_prod.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--monitorInterval:Log4j能够自动检测修改配置 文件和重新配置本身,设置间隔秒数-->
-<configuration status="WARN" monitorInterval="60">
-    <Properties>
-        <Property name="PID">????</Property>
-        <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
-        <Property name="LOG_LEVEL_PATTERN">%5p</Property>
-        <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
-        <!-- 控制台日志格式化,包含颜色-->
-        <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-        <!-- 日志文件默认输出格式,不带行号输出(行号显示会影响日志输出性能);%C:大写,类名;%M:方法名;%m:错误信息;%n:换行 -->
-        <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
-        <!-- 日志默认同类型日志,同一文件夹下可以存放的数量,不设置此属性则默认为7个 -->
-        <Property name="FILE_MAX_HISTORY">50</Property>
-        <Property name="FILE_MAX_SIZE">50MB</Property>
-        <Property name="PROJECT_PATH">/opt/projects/mall4j</Property>
-    </Properties>
-
-    <!--定义appender -->
-    <Appenders>
-        <!-- 默认的控制台日志输出,一般生产环境都是后台启动,这个没太大作用 -->
-        <Console name="Console" target="SYSTEM_OUT" follow="false">
-            <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
-        </Console>
-
-        <!--fileName 文件名称-->
-        <!--filePattern 文件路径-->
-        <RollingFile name="DefaultFile" fileName="${PROJECT_PATH}/log/api.log" filePattern="${PROJECT_PATH}/log/$${date:yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout>
-                <Pattern>${sys:FILE_LOG_PATTERN}</Pattern>
-            </PatternLayout>
-            <DefaultRolloverStrategy max="${FILE_MAX_HISTORY}"/>
-            <Policies>
-                <!--TimeBasedTriggeringPolicy 与 filePattern 结合使用,目前表示每间隔1天保存一遍日志-->
-                <TimeBasedTriggeringPolicy interval="1"/>
-                <SizeBasedTriggeringPolicy size="${FILE_MAX_SIZE}" />
-            </Policies>
-        </RollingFile>
-    </Appenders>
-
-    <Loggers>
-        <Logger name="org.mybatis" level="debug"/>
-        <Logger name="com.yami.shop" level="debug"/>
-        <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
-        <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
-        <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
-        <Logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
-        <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
-        <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
-        <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
-        <Logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
-        <Logger name="org.mybatis" level="debug"/>
-        <Logger name="com.yami.shop" level="debug"/>
-        <!---->
-        <Root level="info">
-            <AppenderRef ref="DefaultFile" />
-        </Root>
-    </Loggers>
-</configuration>

+ 14 - 0
yami-shop-api/src/main/resources/logback-dev.xml

@@ -0,0 +1,14 @@
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
+    </root>
+
+    <logger name="com.yami.shop" level="debug"/>
+    <logger name="springfox.documentation.swagger2" level="off"/>
+    <logger name="io.swagger.models.parameters" level="off"/>
+    <logger name="springfox.documentation.spring.web.readers.operation" level="off"/>
+</configuration>

+ 38 - 0
yami-shop-api/src/main/resources/logback-prod.xml

@@ -0,0 +1,38 @@
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <property name="PROJECT_PATH" value="/opt/projects/yami-b2b2c"/>
+    <property name="LOG_FILE_MAX_HISTORY" value="30"/>
+    <property name="LOG_FILE_MAX_SIZE" value="50MB"/>
+
+
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+
+    <appender name="DefaultFile"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <append>true</append>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <file>${PROJECT_PATH}/log/api.log</file>
+
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${logging.level}</level>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
+            <maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
+            <maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <root level="info">
+        <!--<appender-ref ref="CONSOLE" />-->
+        <appender-ref ref="DefaultFile" />
+    </root>
+
+    <logger name="com.yami.shop" level="debug"/>
+    <logger name="springfox.documentation.swagger2" level="off"/>
+    <logger name="io.swagger.models.parameters" level="off"/>
+    <logger name="springfox.documentation.spring.web.readers.operation" level="off"/>
+</configuration>