From 8f8e796c777577dcef888b94603ed93bebcc1ee6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 06 十二月 2021 14:36:38 +0800
Subject: [PATCH] update tlog 1.3.4 => 1.3.5 启用 tlog 自动配置

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java |   33 ++++-----------------------------
 1 files changed, 4 insertions(+), 29 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 c1665d9..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,13 +1,8 @@
 package com.ruoyi.framework.config;
 
-import com.yomahub.tlog.core.aop.AspectLogAop;
-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 妗嗘灦閰嶇疆
@@ -15,29 +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();
-    }
 
 }

--
Gitblit v1.9.3