From 718a010c0fc0343ba71ee7b58b71a1a522f15a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 7 Feb 2025 13:07:53 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix=20=E4=BF=AE=E5=A4=8D=20monitor=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20context-path=20=E5=AF=BC=E8=87=B4=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95404=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d194b39e57e3d6caf5d76749ab1618e524f479a9.
---
 ruoyi-admin/src/main/resources/application-dev.yml             | 2 +-
 ruoyi-admin/src/main/resources/application-prod.yml            | 2 +-
 .../ruoyi-monitor-admin/src/main/resources/application.yml     | 3 ++-
 .../src/main/resources/application-dev.yml                     | 2 +-
 .../src/main/resources/application-prod.yml                    | 2 +-
 script/docker/nginx/conf/nginx.conf                            | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 63b76e951..5465921cb 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -2,7 +2,7 @@
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090
+  url: http://localhost:9090/admin
   instance:
     service-host-type: IP
     metadata:
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 3e41f84c0..80c1f969c 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@ spring.servlet.multipart.location: /ruoyi/server/temp
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090
+  url: http://localhost:9090/admin
   instance:
     service-host-type: IP
     metadata:
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index b9720cba8..622c93d3c 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -19,6 +19,7 @@ spring:
     admin:
       ui:
         title: RuoYi-Vue-Plus服务监控中心
+      context-path: /admin
 
 --- # Actuator 监控端点的配置项
 management:
@@ -37,7 +38,7 @@ spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
   # 设置 Spring Boot Admin Server 地址
-  url: http://localhost:9090
+  url: http://localhost:9090/admin
   instance:
     service-host-type: IP
     metadata:
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
index 44f298aba..32a2cc4e3 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
@@ -43,7 +43,7 @@ snail-job:
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090
+  url: http://localhost:9090/admin
   instance:
     service-host-type: IP
     metadata:
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
index 44f298aba..32a2cc4e3 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
@@ -43,7 +43,7 @@ snail-job:
 spring.boot.admin.client:
   # 增加客户端开关
   enabled: true
-  url: http://localhost:9090
+  url: http://localhost:9090/admin
   instance:
     service-host-type: IP
     metadata:
diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf
index 3df4a722c..3c79d97f6 100644
--- a/script/docker/nginx/conf/nginx.conf
+++ b/script/docker/nginx/conf/nginx.conf
@@ -96,7 +96,7 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header REMOTE-HOST $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_pass http://monitor-admin/;
+            proxy_pass http://monitor-admin/admin/;
         }
 
         location /snail-job/ {