From c4e17ff8472fd9f8123e86b593b2968ad5936b15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 01 十一月 2021 13:49:11 +0800
Subject: [PATCH] fix 修复 xxl-job-admin 部署问题
---
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 1 +
script/docker/nginx/nginx.conf | 4 ++--
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml | 2 +-
script/docker/deploy.sh | 10 +++++++---
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index 1c1ba6f..a2b198f 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -80,6 +80,7 @@
</dependencies>
<build>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
index 774d7f8..2994909 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
@@ -3,7 +3,7 @@
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://172.30.0.92:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
username: root
password: root
hikari:
diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh
index 28822ec..1564002 100644
--- a/script/docker/deploy.sh
+++ b/script/docker/deploy.sh
@@ -16,6 +16,10 @@
firewall-cmd --add-port=9000/tcp --permanent
# minio 鎺у埗鍙扮鍙�
firewall-cmd --add-port=9001/tcp --permanent
+ # 鐩戞帶涓績绔彛
+ firewall-cmd --add-port=9090/tcp --permanent
+ # 浠诲姟璋冨害涓績绔彛
+ firewall-cmd --add-port=9100/tcp --permanent
# 閲嶅惎闃茬伀澧�
service firewalld restart
}
@@ -39,19 +43,19 @@
docker-compose up -d mysql nginx-web redis minio
}
-#鍚姩鍩虹妯″潡
+#鍚姩鐩戞帶妯″潡
monitor(){
docker-compose up -d ruoyi-monitor-admin
}
#鍚姩绋嬪簭妯″潡
start(){
- docker-compose up -d ruoyi-server1 ruoyi-server2
+ docker-compose up -d ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
}
#鍋滄绋嬪簭妯″潡
stop(){
- docker-compose stop ruoyi-server1 ruoyi-server2
+ docker-compose stop ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
}
#鍏抽棴鎵�鏈夋ā鍧�
diff --git a/script/docker/nginx/nginx.conf b/script/docker/nginx/nginx.conf
index 93a633e..b4ba031 100644
--- a/script/docker/nginx/nginx.conf
+++ b/script/docker/nginx/nginx.conf
@@ -31,7 +31,7 @@
server 172.30.0.90:9090;
}
- upstream xxl-job-admin {
+ upstream xxljob-admin {
server 172.30.0.92:9100;
}
@@ -79,7 +79,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://xxl-job-admin/xxl-job-admin/;
+ proxy_pass http://xxljob-admin/xxl-job-admin/;
}
error_page 500 502 503 504 /50x.html;
--
Gitblit v1.9.3