From 37dc53046256bfbf718e9fc108957d033ae9a335 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sun, 10 Apr 2022 21:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E8=AF=B7=E6=B1=82=E8=B7=9F=E8=B8=AA=E5=92=8Ctomcat?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9B=91=E6=8E=A7=E7=9A=84=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=90=84=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E9=85=8D=E7=BD=AE=E5=AE=8C=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/config/WebMvcConfiguration.java     | 16 ++++++++--------
 .../src/main/resources/application-dev.yml       |  2 +-
 .../src/main/resources/application.yml           |  4 ++--
 .../src/main/resources/application.yml           |  4 ++++
 jero-web/public/api_address_config.js            |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java
index cdf507d0..eb773da6 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java
@@ -91,13 +91,13 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
         converters.add(jackson2HttpMessageConverter);
     }
 
-    /**
-     * SpringBootAdmin的Httptrace不见了
-     * https://blog.csdn.net/u013810234/article/details/110097201
-     */
-    @Bean
-    public InMemoryHttpTraceRepository getInMemoryHttpTrace(){
-        return new InMemoryHttpTraceRepository();
-    }
+//    /**
+//     * SpringBootAdmin的Httptrace不见了
+//     * https://blog.csdn.net/u013810234/article/details/110097201
+//     */
+//    @Bean
+//    public InMemoryHttpTraceRepository getInMemoryHttpTrace(){
+//        return new InMemoryHttpTraceRepository();
+//    }
 
 }
diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
index dfbe6e24..3bdb9f59 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /jero-boot
+    context-path: /
   compression:
     enabled: true
     min-response-size: 1024
diff --git a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml
index 45011588..bf427c9c 100644
--- a/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml
+++ b/jero-boot/jero-cloud-module/jero-cloud-gateway/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9999
+  port: 8080
 spring:
   application:
     name: jero-gateway
@@ -48,7 +48,7 @@ spring:
             statuses: BAD_GATEWAY,BAD_REQUEST
             #指定哪些方法的请求需要进行重试逻辑，默认值是 GET 方法
             methods: GET,POST
-# hystrix 信号量隔离，3秒后自动超时
+# hystrix 信号量隔离，10秒后自动超时
 hystrix:
   enabled: true
   shareSecurityContext: true
diff --git a/jero-boot/jero-cloud-module/jero-cloud-monitor/src/main/resources/application.yml b/jero-boot/jero-cloud-module/jero-cloud-monitor/src/main/resources/application.yml
index fbbec5a0..fea8e761 100644
--- a/jero-boot/jero-cloud-module/jero-cloud-monitor/src/main/resources/application.yml
+++ b/jero-boot/jero-cloud-module/jero-cloud-monitor/src/main/resources/application.yml
@@ -12,6 +12,10 @@ spring:
               environment: local
   security:
     user:
+
+
+
+
       name: "admin"
       password: "admin"
   application:
diff --git a/jero-web/public/api_address_config.js b/jero-web/public/api_address_config.js
index 46e28ba5..3f7793c1 100644
--- a/jero-web/public/api_address_config.js
+++ b/jero-web/public/api_address_config.js
@@ -3,7 +3,7 @@
  */
 window._CONFIG = {}
 window._CONFIG['domianURL'] = '/jero-boot' // 路由转发 devServer
-window._CONFIG['domianWebSocketURL'] = 'http://localhost:9999'
+window._CONFIG['domianWebSocketURL'] = 'http://localhost:8080'
 // 单点登录地址
 window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/download'
 window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe'