jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

发布 4.0.0

Browse Source
This commit is contained in:
疯狂的狮子li
2022-02-18 11:37:21 +08:00
parent dafb7477f6
commit 400ecdf0ab
348 changed files with 10651 additions and 10508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
script/docker/deploy.sh
View File

@ -2,107 +2,107 @@
#使用说明，用来提示输入参数
usage() {
echo "Usage: sh 执行脚本.sh [port|mount|monitor|base|start|stop|stopall|rm|rmiNoneTag]"
exit 1
echo "Usage: sh 执行脚本.sh [port|mount|monitor|base|start|stop|stopall|rm|rmiNoneTag]"
exit 1
}
#开启所需端口(生产环境不推荐开启)
port(){
# mysql 端口
firewall-cmd --add-port=3306/tcp --permanent
# redis 端口
firewall-cmd --add-port=6379/tcp --permanent
# minio api 端口
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
firewall-cmd --add-port=3306/tcp --permanent
# redis 端口
firewall-cmd --add-port=6379/tcp --permanent
# minio api 端口
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
}
##放置挂载文件
mount(){
#挂载 nginx 配置文件
if test ! -f "/docker/nginx/conf/nginx.conf" ;then
mkdir -p /docker/nginx/conf
cp nginx/nginx.conf /docker/nginx/conf/nginx.conf
fi
#挂载 redis 配置文件
if test ! -f "/docker/redis/conf/redis.conf" ;then
mkdir -p /docker/redis/conf
cp redis/redis.conf /docker/redis/conf/redis.conf
fi
#挂载 nginx 配置文件
if test ! -f "/docker/nginx/conf/nginx.conf" ;then
mkdir -p /docker/nginx/conf
cp nginx/nginx.conf /docker/nginx/conf/nginx.conf
fi
#挂载 redis 配置文件
if test ! -f "/docker/redis/conf/redis.conf" ;then
mkdir -p /docker/redis/conf
cp redis/redis.conf /docker/redis/conf/redis.conf
fi
}
#启动基础模块
base(){
docker-compose up -d mysql nginx-web redis minio
docker-compose up -d mysql nginx-web redis minio
}
#启动监控模块
monitor(){
docker-compose up -d ruoyi-monitor-admin
docker-compose up -d ruoyi-monitor-admin
}
#启动程序模块
start(){
docker-compose up -d ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
docker-compose up -d ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
}
#停止程序模块
stop(){
docker-compose stop ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
docker-compose stop ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
}
#关闭所有模块
stopall(){
docker-compose stop
docker-compose stop
}
#删除所有模块
rm(){
docker-compose rm
docker-compose rm
}
#删除Tag为空的镜像
rmiNoneTag(){
docker images|grep none|awk '{print $3}'|xargs docker rmi -f
docker images|grep none|awk '{print $3}'|xargs docker rmi -f
}
#根据输入参数，选择执行对应方法，不输入则执行使用说明
case "$1" in
"port")
port
port
;;
"mount")
mount
mount
;;
"base")
base
base
;;
"monitor")
monitor
monitor
;;
"start")
start
start
;;
"stop")
stop
stop
;;
"stopall")
stopall
stopall
;;
"rm")
rm
rm
;;
"rmiNoneTag")
rmiNoneTag
rmiNoneTag
;;
*)
usage
usage
;;
esac

20
script/docker/docker-compose.yml
View File

@ -12,7 +12,7 @@ services:
# 初始化数据库(后续的初始化sql会在这个库执行)
MYSQL_DATABASE: ry-vue
ports:
- 3306:3306
- "3306:3306"
volumes:
# 数据挂载
- /docker/mysql/data/:/var/lib/mysql/
@ -38,8 +38,8 @@ services:
# 时区上海
TZ: Asia/Shanghai
ports:
- 80:80
- 443:443
- "80:80"
- "443:443"
volumes:
# 证书映射
- /docker/nginx/cert:/etc/nginx/cert
@ -58,7 +58,7 @@ services:
image: redis:6.2.6
container_name: redis
ports:
- 6379:6379
- "6379:6379"
environment:
# 时区上海
TZ: Asia/Shanghai
@ -79,9 +79,9 @@ services:
container_name: minio
ports:
# api 端口
- 9000:9000
- "9000:9000"
# 控制台端口
- 9001:9001
- "9001:9001"
environment:
# 时区上海
TZ: Asia/Shanghai
@ -102,7 +102,7 @@ services:
ipv4_address: 172.30.0.54
ruoyi-server1:
image: "ruoyi/ruoyi-server:3.5.0"
image: ruoyi/ruoyi-server:4.0.0
container_name: ruoyi-server1
environment:
# 时区上海
@ -117,7 +117,7 @@ services:
ipv4_address: 172.30.0.60
ruoyi-server2:
image: "ruoyi/ruoyi-server:3.5.0"
image: "ruoyi/ruoyi-server:4.0.0"
container_name: ruoyi-server2
environment:
# 时区上海
@ -132,7 +132,7 @@ services:
ipv4_address: 172.30.0.61
ruoyi-monitor-admin:
image: "ruoyi/ruoyi-monitor-admin:3.5.0"
image: ruoyi/ruoyi-monitor-admin:4.0.0
container_name: ruoyi-monitor-admin
environment:
# 时区上海
@ -147,7 +147,7 @@ services:
ipv4_address: 172.30.0.90
ruoyi-xxl-job-admin:
image: "ruoyi/ruoyi-xxl-job-admin:3.5.0"
image: ruoyi/ruoyi-xxl-job-admin:4.0.0
container_name: ruoyi-xxl-job-admin
environment:
# 时区上海

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

@ -21,11 +21,11 @@ http {
access_log /var/log/nginx/access.log main;
upstream server {
ip_hash;
server 172.30.0.60:8080;
server 172.30.0.61:8080;
}
upstream server {
ip_hash;
server 172.30.0.60:8080;
server 172.30.0.61:8080;
}
upstream monitor-admin {
server 172.30.0.90:9090;
@ -62,30 +62,30 @@ http {
# return 200 '{"msg":"演示模式，不允许操作","code":500}';
# }
location / {
location / {
root /usr/share/nginx/html;
try_files $uri $uri/ /index.html;
try_files $uri $uri/ /index.html;
index index.html index.htm;
}
location /prod-api/ {
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://server/;
}
location /prod-api/ {
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://server/;
}
# https 会拦截内链所有的 http 请求 造成功能无法使用
# 解决方案1 将 admin 服务 也配置成 https
# 解决方案2 将菜单配置为外链访问 走独立页面 http 访问
location /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://monitor-admin/admin/;
}
location /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://monitor-admin/admin/;
}
# https 会拦截内链所有的 http 请求 造成功能无法使用
# 解决方案1 将 xxljob 服务 也配置成 https