dromara/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2025-10-15 22:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 格式化代码 统一间隔符

Browse Source 
update 格式化代码 统一间隔符
This commit is contained in:
疯狂的狮子li
2022-01-13 09:49:26 +08:00
parent 857dec38d1
commit a0bed51d96
71 changed files with 4279 additions and 4245 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

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