From ca69c00cf4ee2be3bcea15821d86fdf1fc9d47b9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 十一月 2022 19:47:36 +0800
Subject: [PATCH] remove 移除 tlog(不支持UI界面 使用的人太少) 建议使用 skywalking
---
/dev/null | 18 ---------
ruoyi-framework/pom.xml | 10 ++--
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java | 4 --
ruoyi-admin/src/main/resources/logback.xml | 12 +++---
ruoyi-job/pom.xml | 5 --
ruoyi-ui/src/views/index.vue | 2
pom.xml | 28 ++------------
README.md | 2
8 files changed, 17 insertions(+), 64 deletions(-)
diff --git a/README.md b/README.md
index 5e15a60..9b7dfed 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@
| 鍒嗗竷寮忛槦鍒� | Redisson | [Redisson鏂囨。](https://github.com/redisson/redisson/wiki/%E7%9B%AE%E5%BD%95) | 鏅�氶槦鍒椼�佸欢杩熼槦鍒椼�佷紭鍏堥槦鍒� 绛� |
| 鍒嗗竷寮忛攣 | Lock4j | [Lock4j瀹樼綉](https://gitee.com/baomidou/lock4j) | 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱 |
| 鍒嗗竷寮忓箓绛� | Redisson | [Lock4j鏂囨。](https://gitee.com/baomidou/lock4j) | 鎷︽埅閲嶅鎻愪氦 |
-| 鍒嗗竷寮忔棩蹇� | TLog | [TLog鏂囨。](https://yomahub.com/tlog/docs) | 鏀寔璺熻釜閾捐矾鏃ュ織璁板綍銆佹�ц兘鍒嗘瀽銆侀摼璺帓鏌� |
+| 鍒嗗竷寮忛摼璺拷韪� | Apache SkyWalking | [Apache SkyWalking鏂囨。](https://skywalking.apache.org/docs/) | 閾捐矾杩借釜銆佺綉鏍煎垎鏋愩�佸害閲忚仛鍚堛�佸彲瑙嗗寲 |
| 鍒嗗竷寮忎换鍔¤皟搴� | Xxl-Job | [Xxl-Job瀹樼綉](https://www.xuxueli.com/xxl-job/) | 楂樻�ц兘 楂樺彲闈� 鏄撴墿灞� |
| 鏂囦欢瀛樺偍 | Minio | [Minio鏂囨。](https://docs.min.io/) | 鏈湴瀛樺偍 |
| 鏂囦欢瀛樺偍 | 涓冪墰銆侀樋閲屻�佽吘璁� | [OSS浣跨敤鏂囨。](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages?sort_id=4359146&doc_id=1469725) | 浜戝瓨鍌� |
diff --git a/pom.xml b/pom.xml
index e3b1ac5..ff23026 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<redisson.version>3.18.0</redisson.version>
<lock4j.version>2.2.2</lock4j.version>
<dynamic-ds.version>3.5.2</dynamic-ds.version>
- <tlog.version>1.5.0</tlog.version>
+ <alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<xxl-job.version>2.3.1</xxl-job.version>
<lombok.version>1.18.24</lombok.version>
@@ -216,29 +216,9 @@
</dependency>
<dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-web-spring-boot-starter</artifactId>
- <version>${tlog.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
- <version>${tlog.version}</version>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ <version>${alibaba-ttl.version}</version>
</dependency>
<!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index b78044b..6851b17 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
<!-- 鎺у埗鍙拌緭鍑� -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${console.log.pattern}</pattern>
<charset>utf-8</charset>
</encoder>
@@ -22,7 +22,7 @@
<!-- 鏃ュ織鏈�澶� 1澶� -->
<maxHistory>1</maxHistory>
</rollingPolicy>
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${log.pattern}</pattern>
<charset>utf-8</charset>
</encoder>
@@ -42,7 +42,7 @@
<!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
<maxHistory>60</maxHistory>
</rollingPolicy>
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -64,7 +64,7 @@
<!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
<maxHistory>60</maxHistory>
</rollingPolicy>
- <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+ <encoder>
<pattern>${log.pattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -78,7 +78,7 @@
</appender>
<!-- info寮傛杈撳嚭 -->
- <appender name="async_info" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+ <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
<!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
<discardingThreshold>0</discardingThreshold>
<!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
@@ -88,7 +88,7 @@
</appender>
<!-- error寮傛杈撳嚭 -->
- <appender name="async_error" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
+ <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
<!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
<discardingThreshold>0</discardingThreshold>
<!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 2113c4f..e40393c 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -56,15 +56,15 @@
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>transmittable-thread-local</artifactId>
+ </dependency>
+
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-web-spring-boot-starter</artifactId>
</dependency>
</dependencies>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
index 9ef6737..ea83338 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -1,10 +1,8 @@
package com.ruoyi.framework.config;
import com.ruoyi.framework.interceptor.PlusWebInvokeTimeInterceptor;
-import com.yomahub.tlog.web.interceptor.TLogWebInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.CacheControl;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
@@ -22,8 +20,6 @@
@Override
public void addInterceptors(InterceptorRegistry registry) {
- // 鍏ㄥ眬閾捐矾璺熻釜鎷︽埅鍣�
- registry.addInterceptor(new TLogWebInterceptor());
// 鍏ㄥ眬璁块棶鎬ц兘鎷︽埅
registry.addInterceptor(new PlusWebInvokeTimeInterceptor());
}
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
deleted file mode 100644
index 5ae55ad..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.framework.config;
-
-import com.yomahub.tlog.springboot.TLogWebAutoConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 鏁村悎 TLog 妗嗘灦閰嶇疆
- *
- * @author Lion Li
- * @since 3.3.0
- */
-@Configuration
-// 鎺掗櫎 web 鑷姩閰嶇疆 鑷畾涔夊疄鐜�
-@EnableAutoConfiguration(exclude = TLogWebAutoConfiguration.class)
-public class TLogConfig {
-
-}
diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml
index 0445066..629600c 100644
--- a/ruoyi-job/pom.xml
+++ b/ruoyi-job/pom.xml
@@ -29,11 +29,6 @@
<artifactId>xxl-job-core</artifactId>
</dependency>
- <dependency>
- <groupId>com.yomahub</groupId>
- <artifactId>tlog-xxljob-spring-boot-starter</artifactId>
- </dependency>
-
</dependencies>
</project>
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 5b056a3..98bbfbb 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -23,7 +23,7 @@
* 鍒嗗竷寮忛檺娴� Redisson 鍏ㄥ眬銆佽姹侷P銆侀泦缇D 澶氱闄愭祦<br/>
* 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱<br/>
* 鍒嗗竷寮忓箓绛� Redisson 鎷︽埅閲嶅鎻愪氦<br/>
- * 鍒嗗竷寮忔棩蹇� TLog 鏀寔璺熻釜閾捐矾鏃ュ織璁板綍銆佹�ц兘鍒嗘瀽銆侀摼璺帓鏌�<br/>
+ * 鍒嗗竷寮忛摼璺拷韪� SkyWalking 鏀寔閾捐矾杩借釜銆佺綉鏍煎垎鏋愩�佸害閲忚仛鍚堛�佸彲瑙嗗寲<br/>
* 鍒嗗竷寮忎换鍔¤皟搴� Xxl-Job 楂樻�ц兘 楂樺彲闈� 鏄撴墿灞�<br/>
* 鍒嗗竷寮忔枃浠跺瓨鍌� Minio 鏈湴瀛樺偍<br/>
* 鍒嗗竷寮忎簯瀛樺偍 涓冪墰銆侀樋閲屻�佽吘璁� 浜戝瓨鍌�<br/>
--
Gitblit v1.9.3