From ff45fe485800b187f69c384a0538823c0c5f074f Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Thu, 3 Dec 2020 15:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=80=A7=E8=83=BD=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=EF=BC=88=E8=AF=B7=E6=B1=82=E8=BF=BD=E8=B8=AA=E3=80=81?=
 =?UTF-8?q?tomcat=E4=BF=A1=E6=81=AF=EF=BC=89=E8=8F=9C=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/monitor/TomcatInfo.vue          | 11 ++++++-----
 .../java/org/jeecg/config/WebMvcConfiguration.java    |  9 +++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/modules/monitor/TomcatInfo.vue b/ant-design-vue-jeecg/src/views/modules/monitor/TomcatInfo.vue
index 5885be9..0b6344f 100644
--- a/ant-design-vue-jeecg/src/views/modules/monitor/TomcatInfo.vue
+++ b/ant-design-vue-jeecg/src/views/modules/monitor/TomcatInfo.vue
@@ -110,14 +110,15 @@
           getAction('actuator/metrics/tomcat.sessions.active.current'),
           getAction('actuator/metrics/tomcat.sessions.active.max'),
           getAction('actuator/metrics/tomcat.sessions.rejected'),
-          getAction('actuator/metrics/tomcat.global.sent'),
-          getAction('actuator/metrics/tomcat.global.request.max'),
-          getAction('actuator/metrics/tomcat.global.request'),
+          // 2.3.5.RELEASE 无此API
+          // getAction('actuator/metrics/tomcat.global.sent'),
+          // getAction('actuator/metrics/tomcat.global.request.max'),
+          // getAction('actuator/metrics/tomcat.global.request'),
+          // getAction('actuator/metrics/tomcat.threads.current'),
+          // getAction('actuator/metrics/tomcat.threads.config.max')
           // 2.1.3.RELEASE 无此API
           //getAction('actuator/metrics/tomcat.servlet.request'),
           // getAction('actuator/metrics/tomcat.servlet.request.max'),
-          getAction('actuator/metrics/tomcat.threads.current'),
-          getAction('actuator/metrics/tomcat.threads.config.max')
         ]).then((res) => {
           let tomcatInfo = []
           res.forEach((value, id) => {
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
index d57f35e..f30ba74 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
@@ -1,6 +1,7 @@
 package org.jeecg.config;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -63,4 +64,12 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
         return new CorsFilter(urlBasedCorsConfigurationSource);
     }
 
+    /**
+     * SpringBootAdmin的Httptrace不见了
+     * https://blog.csdn.net/u013810234/article/details/110097201
+     */
+    @Bean
+    public InMemoryHttpTraceRepository getInMemoryHttpTrace(){
+        return new InMemoryHttpTraceRepository();
+    }
 }
-- 
GitLab