From 29d5edea9c4130b4bb253088f436aa9b1aee008a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Fri, 22 Mar 2024 12:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
nxhs-service/pom.xml | 23 +++
.../src/main/resources/application-dev.yml | 9 +
...plication-pro.yml => application-prod.yml} | 9 +
.../src/main/resources/application.yml | 12 +-
.../{logback-spring.xml => logback-dev.xml} | 33 +--
.../src/main/resources/logback-prod.xml | 194 ++++++++++++++++++
pom.xml | 22 ++
7 files changed, 269 insertions(+), 33 deletions(-)
rename nxhs-service/src/main/resources/{application-pro.yml => application-prod.yml} (67%)
rename nxhs-service/src/main/resources/{logback-spring.xml => logback-dev.xml} (92%)
create mode 100644 nxhs-service/src/main/resources/logback-prod.xml
diff --git a/nxhs-service/pom.xml b/nxhs-service/pom.xml
index 5642d0c..d3680d7 100644
--- a/nxhs-service/pom.xml
+++ b/nxhs-service/pom.xml
@@ -66,6 +66,29 @@
+
+
+
+ src/main/resources
+
+ application.yml
+ application-${environment}.yml
+ logback-${environment}.xml
+
+ true
+
+
+
+ src/main/resources
+
+ apiclient_cert.pem
+ apiclient_key.pem
+ wxpay_v3.properties
+ nxhs.jks
+
+ false
+
+
\ No newline at end of file
diff --git a/nxhs-service/src/main/resources/application-dev.yml b/nxhs-service/src/main/resources/application-dev.yml
index 24e8843..1125462 100644
--- a/nxhs-service/src/main/resources/application-dev.yml
+++ b/nxhs-service/src/main/resources/application-dev.yml
@@ -12,3 +12,12 @@ spring:
host: 222.71.165.188
port: 6379
password: qweasd,.123 # 密码为空时，请将本行注释
+
+logging:
+ config: classpath:logback-dev.xml
+ level:
+ cc.yunxi: debug
+ pattern:
+ dateformat: yyyy-MM-dd HH:mm:ss:SSS
+ file:
+ path: "${user.dir}/logs/${spring.application.name}"
diff --git a/nxhs-service/src/main/resources/application-pro.yml b/nxhs-service/src/main/resources/application-prod.yml
similarity index 67%
rename from nxhs-service/src/main/resources/application-pro.yml
rename to nxhs-service/src/main/resources/application-prod.yml
index 71eb02f..426488a 100644
--- a/nxhs-service/src/main/resources/application-pro.yml
+++ b/nxhs-service/src/main/resources/application-prod.yml
@@ -12,3 +12,12 @@ spring:
host: 127.0.0.1
port: 6379
password: yx0818 # 密码为空时，请将本行注释
+
+logging:
+ config: classpath:logback-prod.xml
+ level:
+ cc.yunxi: debug
+ pattern:
+ dateformat: yyyy-MM-dd HH:mm:ss:SSS
+ file:
+ path: "${user.dir}/logs/${spring.application.name}"
diff --git a/nxhs-service/src/main/resources/application.yml b/nxhs-service/src/main/resources/application.yml
index 35b897a..7b97625 100644
--- a/nxhs-service/src/main/resources/application.yml
+++ b/nxhs-service/src/main/resources/application.yml
@@ -4,13 +4,13 @@ server:
spring:
application:
name: nxhs-service
+ profiles:
+ active: '@environment@'
servlet:
multipart: #文件传输配置
max-file-size: 100MB #单个数据大小限制
max-request-size: 100MB #请求总数据大小限制
enabled: true #是否启用分段上传支持
- profiles:
- active: dev
datasource:
url: jdbc:mysql://127.0.0.1:3306/nxhs?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -39,14 +39,6 @@ mybatis-plus:
id-type: auto
type-aliases-package: cc.yunxi.domain.po # 指定实体对象扫描包, 简化xml中resultType路径
-logging:
- level:
- cc.yunxi: debug
- pattern:
- dateformat: yyyy-MM-dd HH:mm:ss:SSS
- file:
- path: "${user.dir}/logs/${spring.application.name}"
-
knife4j:
enable: true
openapi:
diff --git a/nxhs-service/src/main/resources/logback-spring.xml b/nxhs-service/src/main/resources/logback-dev.xml
similarity index 92%
rename from nxhs-service/src/main/resources/logback-spring.xml
rename to nxhs-service/src/main/resources/logback-dev.xml
index 568d2fc..a767c42 100644
--- a/nxhs-service/src/main/resources/logback-spring.xml
+++ b/nxhs-service/src/main/resources/logback-dev.xml
@@ -179,29 +179,16 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/nxhs-service/src/main/resources/logback-prod.xml b/nxhs-service/src/main/resources/logback-prod.xml
new file mode 100644
index 0000000..a767c42
--- /dev/null
+++ b/nxhs-service/src/main/resources/logback-prod.xml
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+ logback
+
+
+
+
+
+
+
+
+ debug
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+ UTF-8
+
+
+
+
+
+
+
+
+
+ ${log.path}/log_debug.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+
+
+
+ ${log.path}/debug/log-debug-%d{yyyy-MM-dd_HH-mm}.%i.log
+
+
+ 100MB
+
+ 30
+
+ 20GB
+
+
+
+ debug
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/log_info.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+
+
+ ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log
+
+
+ 100MB
+
+ 30
+
+ 20GB
+
+
+
+
+
+ info
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/log_warn.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+
+
+ ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log
+
+
+ 100MB
+
+ 30
+
+ 20GB
+
+
+
+ warn
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+ ${log.path}/log_error.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+
+
+ ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log
+
+
+ 100MB
+
+ 30
+
+ 20GB
+
+
+
+ ERROR
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 5f2f4ae..9ffd393 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,28 @@
+
+
+
+
+ dev
+
+
+ true
+
+
+ dev
+
+
+
+
+ prod
+
+ prod
+
+
+
+