From d194b39e57e3d6caf5d76749ab1618e524f479a9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 22 十一月 2024 17:54:16 +0800
Subject: [PATCH] fix 修复 monitor 设置 context-path 导致退出重新登录404问题
---
ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml | 2 +-
ruoyi-admin/src/main/resources/application-prod.yml | 2 +-
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml | 3 +--
script/docker/nginx/conf/nginx.conf | 2 +-
ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml | 2 +-
ruoyi-admin/src/main/resources/application-dev.yml | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 4410ab5..283cdad 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/admin
+ url: http://localhost:9090
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 d261118..2002e9e 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@
spring.boot.admin.client:
# 澧炲姞瀹㈡埛绔紑鍏�
enabled: true
- url: http://localhost:9090/admin
+ url: http://localhost:9090
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 622c93d..b9720cb 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -19,7 +19,6 @@
admin:
ui:
title: RuoYi-Vue-Plus鏈嶅姟鐩戞帶涓績
- context-path: /admin
--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
management:
@@ -38,7 +37,7 @@
# 澧炲姞瀹㈡埛绔紑鍏�
enabled: true
# 璁剧疆 Spring Boot Admin Server 鍦板潃
- url: http://localhost:9090/admin
+ url: http://localhost:9090
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 3ed797c..579f376 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
@@ -40,7 +40,7 @@
spring.boot.admin.client:
# 澧炲姞瀹㈡埛绔紑鍏�
enabled: true
- url: http://localhost:9090/admin
+ url: http://localhost:9090
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 1d830db..dffe057 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
@@ -40,7 +40,7 @@
spring.boot.admin.client:
# 澧炲姞瀹㈡埛绔紑鍏�
enabled: true
- url: http://localhost:9090/admin
+ url: http://localhost:9090
instance:
service-host-type: IP
metadata:
diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf
index 3c79d97..3df4a72 100644
--- a/script/docker/nginx/conf/nginx.conf
+++ b/script/docker/nginx/conf/nginx.conf
@@ -96,7 +96,7 @@
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/admin/;
+ proxy_pass http://monitor-admin/;
}
location /snail-job/ {
--
Gitblit v1.9.3