diff --git a/db/yami_shop.sql b/db/yami_shop.sql
index 7f3a4a3..6b8fdc2 100644
--- a/db/yami_shop.sql
+++ b/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 '修改时间',
diff --git a/pom.xml b/pom.xml
index 5884b5e..d343190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,10 +158,6 @@
org.springframework.boot
spring-boot-starter-web
-
- org.springframework.boot
- spring-boot-starter-logging
-
org.springframework.boot
spring-boot-starter-tomcat
@@ -172,10 +168,6 @@
org.springframework.boot
spring-boot-starter-undertow
-
- org.springframework.boot
- spring-boot-starter-log4j2
-
diff --git a/yami-shop-admin/src/main/resources/application-dev.yml b/yami-shop-admin/src/main/resources/application-dev.yml
index 9f5ed8c..bf3f59a 100644
--- a/yami-shop-admin/src/main/resources/application-dev.yml
+++ b/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
\ No newline at end of file
+ config: classpath:logback-dev.xml
diff --git a/yami-shop-admin/src/main/resources/application-docker.yml b/yami-shop-admin/src/main/resources/application-docker.yml
index fb45913..33acaf9 100644
--- a/yami-shop-admin/src/main/resources/application-docker.yml
+++ b/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
\ No newline at end of file
+ config: classpath:logback-prod.xml
diff --git a/yami-shop-admin/src/main/resources/application-prod.yml b/yami-shop-admin/src/main/resources/application-prod.yml
index b52534a..ebbc1ee 100644
--- a/yami-shop-admin/src/main/resources/application-prod.yml
+++ b/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
\ No newline at end of file
+ config: classpath:logback-prod.xml
diff --git a/yami-shop-admin/src/main/resources/banner.txt b/yami-shop-admin/src/main/resources/banner.txt
index d09c886..9fdec0d 100644
--- a/yami-shop-admin/src/main/resources/banner.txt
+++ b/yami-shop-admin/src/main/resources/banner.txt
@@ -1,11 +1,11 @@
- .----------------. .----------------. .----------------. .----------------.
-| .--------------. || .--------------. || .--------------. || .--------------. |
-| | ____ ____ | || | __ | || | ____ ____ | || | _____ | |
-| | |_ _||_ _| | || | / \ | || ||_ \ / _|| || | |_ _| | |
-| | \ \ / / | || | / /\ \ | || | | \/ | | || | | | | |
-| | \ \/ / | || | / ____ \ | || | | |\ /| | | || | | | | |
-| | _| |_ | || | _/ / \ \_ | || | _| |_\/_| |_ | || | _| |_ | |
-| | |______| | || ||____| |____|| || ||_____||_____|| || | |_____| | |
-| | | || | | || | | || | | |
-| '--------------' || '--------------' || '--------------' || '--------------' |
- '----------------' '----------------' '----------------' '----------------'
\ No newline at end of file
+ .----------------. .----------------. .----------------. .----------------. .----------------. .----------------.
+| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. |
+| | ____ ____ | || | __ | || | _____ | || | _____ | || | _ _ | || | _____ | |
+| ||_ \ / _|| || | / \ | || | |_ _| | || | |_ _| | || | | | | | | || | |_ _| | |
+| | | \/ | | || | / /\ \ | || | | | | || | | | | || | | |__| |_ | || | | | | |
+| | | |\ /| | | || | / ____ \ | || | | | _ | || | | | _ | || | |____ _| | || | _ | | | |
+| | _| |_\/_| |_ | || | _/ / \ \_ | || | _| |__/ | | || | _| |__/ | | || | _| |_ | || | | |_' | | |
+| ||_____||_____|| || ||____| |____|| || | |________| | || | |________| | || | |_____| | || | `.___.' | |
+| | | || | | || | | || | | || | | || | | |
+| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' |
+ '----------------' '----------------' '----------------' '----------------' '----------------' '----------------'
diff --git a/yami-shop-admin/src/main/resources/log4j2_dev.xml b/yami-shop-admin/src/main/resources/log4j2_dev.xml
deleted file mode 100644
index 355cb9b..0000000
--- a/yami-shop-admin/src/main/resources/log4j2_dev.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- ????
- %xwEx
- %5p
- yyyy-MM-dd HH:mm:ss.SSS
-
- %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}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/yami-shop-admin/src/main/resources/log4j2_prod.xml b/yami-shop-admin/src/main/resources/log4j2_prod.xml
deleted file mode 100644
index 15d24f3..0000000
--- a/yami-shop-admin/src/main/resources/log4j2_prod.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
- ????
- %xwEx
- %5p
- yyyy-MM-dd HH:mm:ss.SSS
-
- %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}
-
- %d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}
-
- 50
- 50MB
- /opt/projects/mall4j
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${sys:FILE_LOG_PATTERN}
-
-
-
-
-
-
-
-
-
-
-
- ${sys:FILE_LOG_PATTERN}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/yami-shop-admin/src/main/resources/logback-dev.xml b/yami-shop-admin/src/main/resources/logback-dev.xml
new file mode 100644
index 0000000..1143558
--- /dev/null
+++ b/yami-shop-admin/src/main/resources/logback-dev.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yami-shop-admin/src/main/resources/logback-prod.xml b/yami-shop-admin/src/main/resources/logback-prod.xml
new file mode 100644
index 0000000..1fd723b
--- /dev/null
+++ b/yami-shop-admin/src/main/resources/logback-prod.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+ true
+
+ ${FILE_LOG_PATTERN}
+ UTF-8
+
+ ${PROJECT_PATH}/log/api.log
+
+
+ ${logging.level}
+
+
+ ${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz
+ ${LOG_FILE_MAX_SIZE}
+ ${LOG_FILE_MAX_HISTORY}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yami-shop-api/src/main/resources/application-dev.yml b/yami-shop-api/src/main/resources/application-dev.yml
index ba54bd6..5d74e21 100644
--- a/yami-shop-api/src/main/resources/application-dev.yml
+++ b/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
diff --git a/yami-shop-api/src/main/resources/application-docker.yml b/yami-shop-api/src/main/resources/application-docker.yml
index 46e4866..bd2ea19 100644
--- a/yami-shop-api/src/main/resources/application-docker.yml
+++ b/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
\ No newline at end of file
+ config: classpath:logback-prod.xml
diff --git a/yami-shop-api/src/main/resources/application-prod.yml b/yami-shop-api/src/main/resources/application-prod.yml
index d0852c9..923143e 100644
--- a/yami-shop-api/src/main/resources/application-prod.yml
+++ b/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
\ No newline at end of file
+ config: classpath:logback-prod.xml
diff --git a/yami-shop-api/src/main/resources/banner.txt b/yami-shop-api/src/main/resources/banner.txt
index d09c886..9fdec0d 100644
--- a/yami-shop-api/src/main/resources/banner.txt
+++ b/yami-shop-api/src/main/resources/banner.txt
@@ -1,11 +1,11 @@
- .----------------. .----------------. .----------------. .----------------.
-| .--------------. || .--------------. || .--------------. || .--------------. |
-| | ____ ____ | || | __ | || | ____ ____ | || | _____ | |
-| | |_ _||_ _| | || | / \ | || ||_ \ / _|| || | |_ _| | |
-| | \ \ / / | || | / /\ \ | || | | \/ | | || | | | | |
-| | \ \/ / | || | / ____ \ | || | | |\ /| | | || | | | | |
-| | _| |_ | || | _/ / \ \_ | || | _| |_\/_| |_ | || | _| |_ | |
-| | |______| | || ||____| |____|| || ||_____||_____|| || | |_____| | |
-| | | || | | || | | || | | |
-| '--------------' || '--------------' || '--------------' || '--------------' |
- '----------------' '----------------' '----------------' '----------------'
\ No newline at end of file
+ .----------------. .----------------. .----------------. .----------------. .----------------. .----------------.
+| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. |
+| | ____ ____ | || | __ | || | _____ | || | _____ | || | _ _ | || | _____ | |
+| ||_ \ / _|| || | / \ | || | |_ _| | || | |_ _| | || | | | | | | || | |_ _| | |
+| | | \/ | | || | / /\ \ | || | | | | || | | | | || | | |__| |_ | || | | | | |
+| | | |\ /| | | || | / ____ \ | || | | | _ | || | | | _ | || | |____ _| | || | _ | | | |
+| | _| |_\/_| |_ | || | _/ / \ \_ | || | _| |__/ | | || | _| |__/ | | || | _| |_ | || | | |_' | | |
+| ||_____||_____|| || ||____| |____|| || | |________| | || | |________| | || | |_____| | || | `.___.' | |
+| | | || | | || | | || | | || | | || | | |
+| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' |
+ '----------------' '----------------' '----------------' '----------------' '----------------' '----------------'
diff --git a/yami-shop-api/src/main/resources/log4j2_dev.xml b/yami-shop-api/src/main/resources/log4j2_dev.xml
deleted file mode 100644
index 355cb9b..0000000
--- a/yami-shop-api/src/main/resources/log4j2_dev.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
- ????
- %xwEx
- %5p
- yyyy-MM-dd HH:mm:ss.SSS
-
- %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}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/yami-shop-api/src/main/resources/log4j2_prod.xml b/yami-shop-api/src/main/resources/log4j2_prod.xml
deleted file mode 100644
index 54b19e4..0000000
--- a/yami-shop-api/src/main/resources/log4j2_prod.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
- ????
- %xwEx
- %5p
- yyyy-MM-dd HH:mm:ss.SSS
-
- %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}
-
- %d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}
-
- 50
- 50MB
- /opt/projects/mall4j
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${sys:FILE_LOG_PATTERN}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/yami-shop-api/src/main/resources/logback-dev.xml b/yami-shop-api/src/main/resources/logback-dev.xml
new file mode 100644
index 0000000..1143558
--- /dev/null
+++ b/yami-shop-api/src/main/resources/logback-dev.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yami-shop-api/src/main/resources/logback-prod.xml b/yami-shop-api/src/main/resources/logback-prod.xml
new file mode 100644
index 0000000..1fd723b
--- /dev/null
+++ b/yami-shop-api/src/main/resources/logback-prod.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+ true
+
+ ${FILE_LOG_PATTERN}
+ UTF-8
+
+ ${PROJECT_PATH}/log/api.log
+
+
+ ${logging.level}
+
+
+ ${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz
+ ${LOG_FILE_MAX_SIZE}
+ ${LOG_FILE_MAX_HISTORY}
+
+
+
+
+
+
+
+
+
+
+
+
+