From 43486f2f415be304d741c5f1fc72b45209947c66 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, 9 Jul 2021 17:15:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=85=8D=E7=BD=AE=20monitor-admin=20d?=
=?UTF-8?q?ocker=E7=BC=96=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docker/deploy.sh | 10 +++++-
docker/docker-compose.yml | 10 ++++++
docker/nginx/nginx.conf | 6 +++-
pom.xml | 2 +-
ruoyi-admin/pom.xml | 2 +-
ruoyi-extend/ruoyi-monitor-admin/Dockerfile | 13 +++++++
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 40 +++++++++++++++++++++
ruoyi-ui/.env.development | 3 ++
ruoyi-ui/.env.production | 3 ++
ruoyi-ui/.env.staging | 3 ++
ruoyi-ui/src/views/monitor/admin/index.vue | 20 +++--------
11 files changed, 93 insertions(+), 19 deletions(-)
create mode 100644 ruoyi-extend/ruoyi-monitor-admin/Dockerfile
diff --git a/docker/deploy.sh b/docker/deploy.sh
index 7fc79fdc..3b6e6965 100644
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@@ -2,7 +2,7 @@
#使用说明,用来提示输入参数
usage() {
- echo "Usage: sh 执行脚本.sh [port|mount|base|start|stop|stopall|rm|rmiNoneTag]"
+ echo "Usage: sh 执行脚本.sh [port|mount|monitor|base|start|stop|stopall|rm|rmiNoneTag]"
exit 1
}
@@ -27,6 +27,11 @@ base(){
docker-compose up -d mysql nginx-web redis
}
+#启动基础模块
+monitor(){
+ docker-compose up -d ruoyi-monitor-admin
+}
+
#启动程序模块
start(){
docker-compose up -d ruoyi-server1 ruoyi-server2
@@ -63,6 +68,9 @@ case "$1" in
"base")
base
;;
+"monitor")
+ monitor
+;;
"start")
start
;;
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4a720b6d..0aba0a4a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -101,6 +101,16 @@ services:
ruoyi_net:
ipv4_address: 172.30.0.61
+ ruoyi-monitor-admin:
+ image: "ruoyi/ruoyi-monitor-admin:2.4.0"
+ environment:
+ - TZ=Asia/Shanghai
+ privileged: true
+ restart: always
+ networks:
+ ruoyi_net:
+ ipv4_address: 172.30.0.90
+
networks:
ruoyi_net:
driver: bridge
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
index 097d72f6..66ac29e3 100644
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@@ -26,6 +26,10 @@ http {
server 172.30.0.61:8080;
}
+ upstream monitor-admin {
+ server 172.30.0.90:9090;
+ }
+
server {
listen 80;
server_name localhost;
@@ -62,7 +66,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://server/admin/;
+ proxy_pass http://monitor-admin/admin/;
}
error_page 500 502 503 504 /50x.html;
diff --git a/pom.xml b/pom.xml
index 34be51b0..46ecef03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
3.4.0
- localhost
+ 192.168.31.240
http://${docker.registry.url}:2375
ruoyi
1.2.0
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 1855b610..5dc36b15 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -88,7 +88,7 @@
docker-maven-plugin
${docker.plugin.version}
- ${docker.namespace}/${project.artifactId}:${project.version}
+ ${docker.namespace}/ruoyi-server:${project.version}
${project.basedir}
${docker.registry.host}
${docker.registry.url}
diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
new file mode 100644
index 00000000..ef551fec
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
@@ -0,0 +1,13 @@
+FROM anapsix/alpine-java:8_server-jre_unlimited
+
+MAINTAINER Lion Li
+
+RUN mkdir -p /ruoyi/monitor
+
+WORKDIR /ruoyi/monitor
+
+EXPOSE 9090
+
+ADD ./target/ruoyi-monitor-admin.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index c6ef4850..2aade59b 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -30,4 +30,44 @@
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ ${spring-boot.version}
+
+ true
+
+
+
+
+ repackage
+
+
+
+
+
+ com.spotify
+ docker-maven-plugin
+ ${docker.plugin.version}
+
+ ${docker.namespace}/${project.artifactId}:${project.version}
+ ${project.basedir}
+ ${docker.registry.host}
+ ${docker.registry.url}
+ ${docker.registry.url}
+
+
+ /
+ ${project.build.directory}
+ ${project.build.finalName}.jar
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index abb97d46..a1a508de 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -7,5 +7,8 @@ ENV = 'development'
# 若依管理系统/开发环境
VUE_APP_BASE_API = '/dev-api'
+# 监控地址
+VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login'
+
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index 7179b329..b6eec53c 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -4,5 +4,8 @@ VUE_APP_TITLE = RuoYi-Vue-Plus后台管理系统
# 生产环境配置
ENV = 'production'
+# 监控地址
+VUE_APP_MONITRO_ADMIN = '/admin/login'
+
# 若依管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index b5723d7b..e74ce6ce 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -6,5 +6,8 @@ NODE_ENV = production
# 测试环境配置
ENV = 'staging'
+# 监控地址
+VUE_APP_MONITRO_ADMIN = '/admin/login'
+
# 若依管理系统/测试环境
VUE_APP_BASE_API = '/stage-api'
diff --git a/ruoyi-ui/src/views/monitor/admin/index.vue b/ruoyi-ui/src/views/monitor/admin/index.vue
index 012d92c5..ad35dc46 100644
--- a/ruoyi-ui/src/views/monitor/admin/index.vue
+++ b/ruoyi-ui/src/views/monitor/admin/index.vue
@@ -1,26 +1,16 @@
-
-
-
+