From 619a80228f7a26ce6e478770fb5884733b28f13c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 22 十二月 2021 10:22:00 +0800
Subject: [PATCH] update springboot 2.5.7 => 2.5.8 升级预防 log4j2 问题 update springboot-admin 2.5.4 => 2.5.5 update hutool 5.7.16 => 5.7.17
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java | 39 ++++-----------------------------------
1 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java
index 68bc425..5ae55ad 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java
@@ -1,14 +1,8 @@
package com.ruoyi.framework.config;
-import com.yomahub.tlog.core.aop.AspectLogAop;
-import com.yomahub.tlog.feign.filter.TLogFeignFilter;
-import com.yomahub.tlog.spring.TLogPropertyInit;
-import com.yomahub.tlog.spring.TLogSpringAware;
-import com.yomahub.tlog.springboot.property.TLogProperty;
-import org.springframework.context.annotation.Bean;
+import com.yomahub.tlog.springboot.TLogWebAutoConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.annotation.Order;
/**
* 鏁村悎 TLog 妗嗘灦閰嶇疆
@@ -16,34 +10,9 @@
* @author Lion Li
* @since 3.3.0
*/
-@Order(-999)
@Configuration
-@Import(TLogProperty.class)
+// 鎺掗櫎 web 鑷姩閰嶇疆 鑷畾涔夊疄鐜�
+@EnableAutoConfiguration(exclude = TLogWebAutoConfiguration.class)
public class TLogConfig {
-
- @Bean
- public TLogPropertyInit tLogPropertyInit(TLogProperty tLogProperty) {
- TLogPropertyInit tLogPropertyInit = new TLogPropertyInit();
- tLogPropertyInit.setPattern(tLogProperty.getPattern());
- tLogPropertyInit.setEnableInvokeTimePrint(tLogProperty.enableInvokeTimePrint());
- tLogPropertyInit.setIdGenerator(tLogProperty.getIdGenerator());
- tLogPropertyInit.setMdcEnable(tLogProperty.getMdcEnable());
- return tLogPropertyInit;
- }
-
- @Bean
- public TLogSpringAware tLogSpringAware(){
- return new TLogSpringAware();
- }
-
- @Bean
- public AspectLogAop aspectLogAop() {
- return new AspectLogAop();
- }
-
- @Bean
- public TLogFeignFilter tLogFeignFilter() {
- return new TLogFeignFilter();
- }
}
--
Gitblit v1.9.3