From 69c5e781acd9126868758a5e31d3b9794097a34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 5 Jul 2023 16:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=205.1.0-BETA=20=E5=85=AC?= =?UTF-8?q?=E6=B5=8B=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/ruoyi-monitor-admin.run.xml | 4 ++-- .run/ruoyi-powerjob-server.run.xml | 4 ++-- .run/ruoyi-server.run.xml | 4 ++-- README.md | 2 +- pom.xml | 2 +- ruoyi-common/ruoyi-common-bom/pom.xml | 2 +- script/docker/docker-compose.yml | 8 ++++---- script/docker/nginx/conf/nginx.conf | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml index 11513a6f..726d8786 100644 --- a/.run/ruoyi-monitor-admin.run.xml +++ b/.run/ruoyi-monitor-admin.run.xml @@ -1,8 +1,8 @@ - + - diff --git a/.run/ruoyi-powerjob-server.run.xml b/.run/ruoyi-powerjob-server.run.xml index 7c42630c..0bd8c658 100644 --- a/.run/ruoyi-powerjob-server.run.xml +++ b/.run/ruoyi-powerjob-server.run.xml @@ -1,8 +1,8 @@ - + - diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml index f648cf99..55f688ec 100644 --- a/.run/ruoyi-server.run.xml +++ b/.run/ruoyi-server.run.xml @@ -1,8 +1,8 @@ - + - diff --git a/README.md b/README.md index 64789600..78e00099 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.0.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus) +[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-5.1.0-success.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.0-blue.svg)]() [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]() [![JDK-19](https://img.shields.io/badge/JDK-19-green.svg)]() diff --git a/pom.xml b/pom.xml index 33fa3bd7..6f1e6f3d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ RuoYi-Vue-Plus多租户管理系统 - 5.1.0-SNAPSHOT + 5.1.0-BETA 3.0.8 UTF-8 UTF-8 diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index cac678c2..93d11897 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -14,7 +14,7 @@ - 5.1.0-SNAPSHOT + 5.1.0-BETA diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index a404b864..d87ed5f7 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -100,7 +100,7 @@ services: network_mode: "host" ruoyi-server1: - image: ruoyi/ruoyi-server:5.0.0 + image: ruoyi/ruoyi-server:5.1.0 container_name: ruoyi-server1 environment: # 时区上海 @@ -115,7 +115,7 @@ services: network_mode: "host" ruoyi-server2: - image: ruoyi/ruoyi-server:5.0.0 + image: ruoyi/ruoyi-server:5.1.0 container_name: ruoyi-server2 environment: # 时区上海 @@ -130,7 +130,7 @@ services: network_mode: "host" ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:5.0.0 + image: ruoyi/ruoyi-monitor-admin:5.1.0 container_name: ruoyi-monitor-admin environment: # 时区上海 @@ -142,7 +142,7 @@ services: network_mode: "host" ruoyi-powerjob-server: - image: ruoyi/ruoyi-powerjob-server:5.0.0 + image: ruoyi/ruoyi-powerjob-server:5.1.0 container_name: ruoyi-powerjob-server environment: # 时区上海 diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf index 27d1e827..38c422a9 100644 --- a/script/docker/nginx/conf/nginx.conf +++ b/script/docker/nginx/conf/nginx.conf @@ -31,7 +31,7 @@ http { server 127.0.0.1:9090; } - upstream powerjob { + upstream powerjob-server { server 127.0.0.1:7700; } @@ -100,7 +100,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://powerjob/; + proxy_pass http://powerjob-server/; } error_page 500 502 503 504 /50x.html;