diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
index a511f351b..93a633e14 100644
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@@ -31,6 +31,10 @@ http {
server 172.30.0.90:9090;
}
+ upstream xxl-job-admin {
+ server 172.30.0.92:9100;
+ }
+
server {
listen 80;
server_name localhost;
@@ -70,6 +74,14 @@ http {
proxy_pass http://monitor-admin/admin/;
}
+ location /xxl-job-admin/ {
+ proxy_set_header Host $http_host;
+ 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://xxl-job-admin/xxl-job-admin/;
+ }
+
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index a1a508de4..3b003aa38 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -10,5 +10,8 @@ VUE_APP_BASE_API = '/dev-api'
# 监控地址
VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
+# xxl-job 控制台地址
+VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin'
+
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index b6eec53c6..2d0bb6184 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -7,5 +7,8 @@ ENV = 'production'
# 监控地址
VUE_APP_MONITRO_ADMIN = '/admin/login'
+# 监控地址
+VUE_APP_XXL_JOB_ADMIN = '/xxl-job-admin'
+
# 若依管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index e74ce6ce2..49ce55c95 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -9,5 +9,8 @@ ENV = 'staging'
# 监控地址
VUE_APP_MONITRO_ADMIN = '/admin/login'
+# 监控地址
+VUE_APP_XXL_JOB_ADMIN = '/xxl-job-admin'
+
# 若依管理系统/测试环境
VUE_APP_BASE_API = '/stage-api'
diff --git a/ruoyi-ui/src/views/monitor/xxljob/index.vue b/ruoyi-ui/src/views/monitor/xxljob/index.vue
new file mode 100644
index 000000000..7167b48b3
--- /dev/null
+++ b/ruoyi-ui/src/views/monitor/xxljob/index.vue
@@ -0,0 +1,15 @@
+
+
+
+