From 69c5e781acd9126868758a5e31d3b9794097a34d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 05 七月 2023 16:37:06 +0800
Subject: [PATCH] 发布 5.1.0-BETA 公测版本
---
.run/ruoyi-powerjob-server.run.xml | 4 ++--
.run/ruoyi-server.run.xml | 4 ++--
script/docker/docker-compose.yml | 8 ++++----
ruoyi-common/ruoyi-common-bom/pom.xml | 2 +-
.run/ruoyi-monitor-admin.run.xml | 4 ++--
pom.xml | 2 +-
script/docker/nginx/conf/nginx.conf | 4 ++--
README.md | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml
index 11513a6..726d878 100644
--- a/.run/ruoyi-monitor-admin.run.xml
+++ b/.run/ruoyi-monitor-admin.run.xml
@@ -1,8 +1,8 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+ <configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="婕旂ず鏈�">
<deployment type="dockerfile">
<settings>
- <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.0.0" />
+ <option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.1.0" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
</settings>
diff --git a/.run/ruoyi-powerjob-server.run.xml b/.run/ruoyi-powerjob-server.run.xml
index 7c42630..0bd8c65 100644
--- a/.run/ruoyi-powerjob-server.run.xml
+++ b/.run/ruoyi-powerjob-server.run.xml
@@ -1,8 +1,8 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+ <configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="婕旂ず鏈�">
<deployment type="dockerfile">
<settings>
- <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:5.0.0" />
+ <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:5.1.0" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-powerjob-server/Dockerfile" />
</settings>
diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml
index f648cf9..55f688e 100644
--- a/.run/ruoyi-server.run.xml
+++ b/.run/ruoyi-server.run.xml
@@ -1,8 +1,8 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+ <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="婕旂ず鏈�">
<deployment type="dockerfile">
<settings>
- <option name="imageTag" value="ruoyi/ruoyi-server:5.0.0" />
+ <option name="imageTag" value="ruoyi/ruoyi-server:5.1.0" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
</settings>
diff --git a/README.md b/README.md
index 6478960..78e0009 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
[](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/master/LICENSE)
[
<br>
-[](https://gitee.com/dromara/RuoYi-Vue-Plus)
+[](https://gitee.com/dromara/RuoYi-Vue-Plus)
[]()
[]()
[]()
diff --git a/pom.xml b/pom.xml
index 33fa3bd..6f1e6f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<description>RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
<properties>
- <revision>5.1.0-SNAPSHOT</revision>
+ <revision>5.1.0-BETA</revision>
<spring-boot.version>3.0.8</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index cac678c..93d1189 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -14,7 +14,7 @@
</description>
<properties>
- <revision>5.1.0-SNAPSHOT</revision>
+ <revision>5.1.0-BETA</revision>
</properties>
<dependencyManagement>
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index a404b86..d87ed5f 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -100,7 +100,7 @@
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 @@
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 @@
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 @@
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 27d1e82..38c422a 100644
--- a/script/docker/nginx/conf/nginx.conf
+++ b/script/docker/nginx/conf/nginx.conf
@@ -31,7 +31,7 @@
server 127.0.0.1:9090;
}
- upstream powerjob {
+ upstream powerjob-server {
server 127.0.0.1:7700;
}
@@ -100,7 +100,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://powerjob/;
+ proxy_pass http://powerjob-server/;
}
error_page 500 502 503 504 /50x.html;
--
Gitblit v1.9.3