xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 16:23:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 修复 xxl-job-admin 部署问题

Browse Source
This commit is contained in:
疯狂的狮子li
2021-11-01 13:49:11 +08:00
parent 2c6e1f0db7
commit a2c8b0d13e
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
View File

@@ -80,6 +80,7 @@
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

2
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
View File

@@ -3,7 +3,7 @@ spring:
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:

10
script/docker/deploy.sh
View File

@@ -16,6 +16,10 @@ port(){
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 @@ base(){
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
}
#关闭所有模块

4
script/docker/nginx/nginx.conf
View File

@@ -31,7 +31,7 @@ http {
server 172.30.0.90:9090;
}
upstream xxl-job-admin {
upstream xxljob-admin {
server 172.30.0.92:9100;
}
@@ -79,7 +79,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://xxl-job-admin/xxl-job-admin/;
proxy_pass http://xxljob-admin/xxl-job-admin/;
}
error_page 500 502 503 504 /50x.html;