From 43486f2f415be304d741c5f1fc72b45209947c66 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 09 七月 2021 17:15:09 +0800
Subject: [PATCH] update 配置 monitor-admin docker编排
---
ruoyi-extend/ruoyi-monitor-admin/pom.xml | 40 ++++++++++++++++++++
docker/docker-compose.yml | 10 +++++
docker/nginx/nginx.conf | 6 ++
ruoyi-ui/.env.production | 3 +
ruoyi-ui/.env.staging | 3 +
ruoyi-admin/pom.xml | 2
ruoyi-extend/ruoyi-monitor-admin/Dockerfile | 13 ++++++
docker/deploy.sh | 10 ++++
ruoyi-ui/.env.development | 3 +
ruoyi-ui/src/views/monitor/admin/index.vue | 20 ++-------
pom.xml | 2
11 files changed, 93 insertions(+), 19 deletions(-)
diff --git a/docker/deploy.sh b/docker/deploy.sh
index 7fc79fd..3b6e696 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
}
@@ -25,6 +25,11 @@
#鍚姩鍩虹妯″潡
base(){
docker-compose up -d mysql nginx-web redis
+}
+
+#鍚姩鍩虹妯″潡
+monitor(){
+ docker-compose up -d ruoyi-monitor-admin
}
#鍚姩绋嬪簭妯″潡
@@ -63,6 +68,9 @@
"base")
base
;;
+"monitor")
+ monitor
+;;
"start")
start
;;
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4a720b6..0aba0a4 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -101,6 +101,16 @@
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 097d72f..66ac29e 100644
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@@ -26,6 +26,10 @@
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 @@
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 34be51b..46ecef0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
<datasource.version>3.4.0</datasource.version>
<!-- docker 閰嶇疆 -->
- <docker.registry.url>localhost</docker.registry.url>
+ <docker.registry.url>192.168.31.240</docker.registry.url>
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
<docker.namespace>ruoyi</docker.namespace>
<docker.plugin.version>1.2.0</docker.plugin.version>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 1855b61..5dc36b1 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -88,7 +88,7 @@
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.plugin.version}</version>
<configuration>
- <imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
+ <imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName>
<dockerDirectory>${project.basedir}</dockerDirectory>
<dockerHost>${docker.registry.host}</dockerHost>
<registryUrl>${docker.registry.url}</registryUrl>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
new file mode 100644
index 0000000..ef551fe
--- /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 c6ef485..2aade59 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -30,4 +30,44 @@
</dependency>
</dependencies>
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
+ <configuration>
+ <fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>${docker.plugin.version}</version>
+ <configuration>
+ <imageName>${docker.namespace}/${project.artifactId}:${project.version}</imageName>
+ <dockerDirectory>${project.basedir}</dockerDirectory>
+ <dockerHost>${docker.registry.host}</dockerHost>
+ <registryUrl>${docker.registry.url}</registryUrl>
+ <serverId>${docker.registry.url}</serverId>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>${project.build.directory}</directory>
+ <include>${project.build.finalName}.jar</include>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index abb97d4..a1a508d 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -7,5 +7,8 @@
# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
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 7179b32..b6eec53 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -4,5 +4,8 @@
# 鐢熶骇鐜閰嶇疆
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 b5723d7..e74ce6c 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -6,5 +6,8 @@
# 娴嬭瘯鐜閰嶇疆
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 012d92c..ad35dc4 100644
--- a/ruoyi-ui/src/views/monitor/admin/index.vue
+++ b/ruoyi-ui/src/views/monitor/admin/index.vue
@@ -1,26 +1,16 @@
<template>
- <div v-loading="loading" :style="'height:'+ height">
- <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
- </div>
+ <i-frame :src="url" />
</template>
<script>
+import iFrame from "@/components/iFrame/index";
export default {
name: "Admin",
+ components: { iFrame },
data() {
+ console.log(process.env)
return {
- src: "http://localhost:9090/admin/login",
- height: document.documentElement.clientHeight - 94.5 + "px;",
- loading: true
+ url: process.env.VUE_APP_MONITRO_ADMIN
};
},
- mounted: function() {
- setTimeout(() => {
- this.loading = false;
- }, 230);
- const that = this;
- window.onresize = function temp() {
- that.height = document.documentElement.clientHeight - 94.5 + "px;";
- };
- }
};
</script>
--
Gitblit v1.9.3