diff --git a/oss-client/pom.xml b/oss-client/pom.xml
index 619ba24..8d0eb40 100644
--- a/oss-client/pom.xml
+++ b/oss-client/pom.xml
@@ -51,6 +51,10 @@
com.xuxueli
xxl-job-core
+
+ cn.axzo.framework
+ axzo-logger-spring-boot-starter
+
diff --git a/oss-client/src/main/resources/logback-spring.xml b/oss-client/src/main/resources/logback-spring.xml
index 4466957..922ff24 100644
--- a/oss-client/src/main/resources/logback-spring.xml
+++ b/oss-client/src/main/resources/logback-spring.xml
@@ -1,241 +1,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${PROJECT_NAME}
-
-
- ${LOG_PATH}/error/error.log
-
- ${LOG_PATH}/error/error-%d{yyyy-MM-dd}.%i.log
-
- 30MB
-
- ${MAX_HISTORY}
-
- 1GB
-
- true
-
-
- true
-
-
- ${FILE_LOG_PATTERN}
- utf-8
-
-
-
- error
- ACCEPT
- DENY
-
-
-
-
-
- ${LOG_PATH}/warn/warn.log
-
- ${LOG_PATH}/warn/warn-%d{yyyy-MM-dd}.%i.log
-
- 30MB
-
- ${MAX_HISTORY}
-
- 1GB
-
- true
-
-
- true
-
-
- ${FILE_LOG_PATTERN}
- utf-8
-
-
-
- warn
- ACCEPT
- DENY
-
-
-
-
-
- ${LOG_PATH}/info/info.log
-
- ${LOG_PATH}/info/info-%d{yyyy-MM-dd}.%i.log
-
- 30MB
-
- ${MAX_HISTORY}
-
- 1GB
-
- true
-
-
- true
-
-
- ${FILE_LOG_PATTERN}
- utf-8
-
-
-
-
- info
- ACCEPT
- DENY
-
-
-
-
-
- ${LOG_PATH}/debug/debug.log
-
- ${LOG_PATH}/debug/debug-%d{yyyy-MM-dd}.%i.log
-
- 30MB
-
- ${MAX_HISTORY}
-
- 1GB
-
- true
-
-
- true
-
-
- ${FILE_LOG_PATTERN}
- utf-8
-
-
-
-
- debug
- ACCEPT
- DENY
-
-
-
-
-
-
- ${LOG_PATTERN}
- utf-8
-
-
-
- info
-
-
-
-
-
-
-
-
-
- @timestamp
- yyyy-MM-dd'T'HH:mm:ss.SSSx
- GMT+8
-
-
-
- {
- "app":"${appName}",
- "level":"%level",
- "traceId":"%X{ctxLogId}",
- "thread":"%thread",
- "class":"%logger{40}",
- "message":"%message",
- "m":"#asJson{%message}",
- "error_level":"%X{errorLevel}",
- "error_type":"%X{errorType}",
- "stack_trace":"%exception{20}"
- }
-
-
-
-
-
-
-
-
-
-
- ${LOG_PATTERN}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/oss-common/pom.xml b/oss-common/pom.xml
index 9107374..c3f0c5a 100644
--- a/oss-common/pom.xml
+++ b/oss-common/pom.xml
@@ -16,18 +16,6 @@
cn.axzo.framework
axzo-common
-
- org.apache.skywalking
- apm-toolkit-trace
-
-
- org.apache.skywalking
- apm-toolkit-logback-1.x
-
-
- net.logstash.logback
- logstash-logback-encoder
-
org.springframework.boot
spring-boot-starter-aop
diff --git a/pom.xml b/pom.xml
index be2df58..9bd7619 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
cn.axzo.infra
axzo-parent
- 2.4.13
+ 2.4.13.1
cn.axzo.oss
@@ -18,6 +18,7 @@
2.0.0-SNAPSHOT
2.0.0-SNAPSHOT
+ 2.0.0-SNAPSHOT
3.10.2
@@ -42,7 +43,13 @@
pom
import
-
+
+ cn.axzo.infra
+ axzo-dependencies
+ ${axzo-dependencies.version}
+ pom
+ import
+
cn.axzo.oss
oss-service