From 20289f524c2386728f47ffa36b1d4c95523dff0f 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: Thu, 4 Jan 2024 10:50:21 +0800 Subject: [PATCH] update revision 2.2.0-SNAPSHOT --- .run/ruoyi-auth.run.xml | 2 +- .run/ruoyi-gateway.run.xml | 2 +- .run/ruoyi-gen.run.xml | 2 +- .run/ruoyi-job.run.xml | 2 +- .run/ruoyi-monitor.run.xml | 2 +- .run/ruoyi-nacos.run.xml | 2 +- .run/ruoyi-powerjob-server.run.xml | 2 +- .run/ruoyi-resource.run.xml | 2 +- .run/ruoyi-seata-server.run.xml | 2 +- .run/ruoyi-sentinel-dashboard.run.xml | 2 +- .run/ruoyi-system.run.xml | 2 +- README.md | 2 +- docker/docker-compose.yml | 22 +++++++++---------- pom.xml | 2 +- ruoyi-api/ruoyi-api-bom/pom.xml | 2 +- ruoyi-common/ruoyi-common-alibaba-bom/pom.xml | 2 +- ruoyi-common/ruoyi-common-bom/pom.xml | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.run/ruoyi-auth.run.xml b/.run/ruoyi-auth.run.xml index 87d912cc..0b69031f 100644 --- a/.run/ruoyi-auth.run.xml +++ b/.run/ruoyi-auth.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-auth" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-auth:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-auth:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-auth/Dockerfile" /> </settings> diff --git a/.run/ruoyi-gateway.run.xml b/.run/ruoyi-gateway.run.xml index 953a838f..d399a727 100644 --- a/.run/ruoyi-gateway.run.xml +++ b/.run/ruoyi-gateway.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-gateway" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-gateway:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-gateway:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-gateway/Dockerfile" /> </settings> diff --git a/.run/ruoyi-gen.run.xml b/.run/ruoyi-gen.run.xml index ce6d4651..d0dc0e67 100644 --- a/.run/ruoyi-gen.run.xml +++ b/.run/ruoyi-gen.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-gen" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-gen:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-gen:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-modules/ruoyi-gen/Dockerfile" /> </settings> diff --git a/.run/ruoyi-job.run.xml b/.run/ruoyi-job.run.xml index e9377d8a..4fa17309 100644 --- a/.run/ruoyi-job.run.xml +++ b/.run/ruoyi-job.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-job" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-job:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-job:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-modules/ruoyi-job/Dockerfile" /> </settings> diff --git a/.run/ruoyi-monitor.run.xml b/.run/ruoyi-monitor.run.xml index d340665b..05292ec7 100644 --- a/.run/ruoyi-monitor.run.xml +++ b/.run/ruoyi-monitor.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-monitor" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-monitor:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-monitor:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-visual/ruoyi-monitor/Dockerfile" /> </settings> diff --git a/.run/ruoyi-nacos.run.xml b/.run/ruoyi-nacos.run.xml index 148f9e50..3d8030ca 100644 --- a/.run/ruoyi-nacos.run.xml +++ b/.run/ruoyi-nacos.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-nacos" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-nacos:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-nacos:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-visual/ruoyi-nacos/Dockerfile" /> </settings> diff --git a/.run/ruoyi-powerjob-server.run.xml b/.run/ruoyi-powerjob-server.run.xml index 3517aea3..39acc278 100644 --- a/.run/ruoyi-powerjob-server.run.xml +++ b/.run/ruoyi-powerjob-server.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-powerjob-server:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-visual/ruoyi-powerjob-server/Dockerfile" /> </settings> diff --git a/.run/ruoyi-resource.run.xml b/.run/ruoyi-resource.run.xml index 2254b74f..5092e31a 100644 --- a/.run/ruoyi-resource.run.xml +++ b/.run/ruoyi-resource.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-resource" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-resource:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-resource:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-modules/ruoyi-resource/Dockerfile" /> </settings> diff --git a/.run/ruoyi-seata-server.run.xml b/.run/ruoyi-seata-server.run.xml index f8618d23..9765f397 100644 --- a/.run/ruoyi-seata-server.run.xml +++ b/.run/ruoyi-seata-server.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-seata-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-seata-server:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-seata-server:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-visual/ruoyi-seata-server/Dockerfile" /> </settings> diff --git a/.run/ruoyi-sentinel-dashboard.run.xml b/.run/ruoyi-sentinel-dashboard.run.xml index eda30c01..fd0ca162 100644 --- a/.run/ruoyi-sentinel-dashboard.run.xml +++ b/.run/ruoyi-sentinel-dashboard.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-sentinel-dashboard" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile" /> </settings> diff --git a/.run/ruoyi-system.run.xml b/.run/ruoyi-system.run.xml index 1d91da35..a657faef 100644 --- a/.run/ruoyi-system.run.xml +++ b/.run/ruoyi-system.run.xml @@ -2,7 +2,7 @@ <configuration default="false" name="ruoyi-system" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <deployment type="dockerfile"> <settings> - <option name="imageTag" value="ruoyi/ruoyi-system:2.1.2" /> + <option name="imageTag" value="ruoyi/ruoyi-system:2.2.0" /> <option name="buildOnly" value="true" /> <option name="sourceFilePath" value="ruoyi-modules/ruoyi-system/Dockerfile" /> </settings> diff --git a/README.md b/README.md index d42eeb87..accadb21 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [](https://gitee.com/dromara/RuoYi-Cloud-Plus/blob/master/LICENSE) [](https://www.jetbrains.com/?from=RuoYi-Cloud-Plus) <br> -[](https://gitee.com/dromara/RuoYi-Cloud-Plus) +[](https://gitee.com/dromara/RuoYi-Cloud-Plus) []() []() []() diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 386bd5e8..6cb1538f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -29,7 +29,7 @@ services: network_mode: "host" nacos: - image: ruoyi/ruoyi-nacos:2.1.2 + image: ruoyi/ruoyi-nacos:2.2.0 container_name: nacos ports: - "8848:8848" @@ -96,7 +96,7 @@ services: network_mode: "host" seata-server: - image: ruoyi/ruoyi-seata-server:2.1.2 + image: ruoyi/ruoyi-seata-server:2.2.0 container_name: seata-server ports: - "7091:7091" @@ -135,7 +135,7 @@ services: network_mode: "host" sentinel: - image: ruoyi/ruoyi-sentinel-dashboard:2.1.2 + image: ruoyi/ruoyi-sentinel-dashboard:2.2.0 container_name: sentinel environment: TZ: Asia/Shanghai @@ -150,7 +150,7 @@ services: network_mode: "host" ruoyi-monitor: - image: ruoyi/ruoyi-monitor:2.1.2 + image: ruoyi/ruoyi-monitor:2.2.0 container_name: ruoyi-monitor environment: # 时区上海 @@ -166,7 +166,7 @@ services: network_mode: "host" ruoyi-powerjob-server: - image: ruoyi/ruoyi-powerjob-server:2.1.2 + image: ruoyi/ruoyi-powerjob-server:2.2.0 container_name: ruoyi-powerjob-server environment: # 时区上海 @@ -181,7 +181,7 @@ services: network_mode: "host" ruoyi-gateway: - image: ruoyi/ruoyi-gateway:2.1.2 + image: ruoyi/ruoyi-gateway:2.2.0 container_name: ruoyi-gateway environment: # 时区上海 @@ -197,7 +197,7 @@ services: network_mode: "host" ruoyi-auth: - image: ruoyi/ruoyi-auth:2.1.2 + image: ruoyi/ruoyi-auth:2.2.0 container_name: ruoyi-auth environment: # 时区上海 @@ -213,7 +213,7 @@ services: network_mode: "host" ruoyi-system: - image: ruoyi/ruoyi-system:2.1.2 + image: ruoyi/ruoyi-system:2.2.0 container_name: ruoyi-system environment: # 时区上海 @@ -229,7 +229,7 @@ services: network_mode: "host" ruoyi-gen: - image: ruoyi/ruoyi-gen:2.1.2 + image: ruoyi/ruoyi-gen:2.2.0 container_name: ruoyi-gen environment: # 时区上海 @@ -245,7 +245,7 @@ services: network_mode: "host" ruoyi-job: - image: ruoyi/ruoyi-job:2.1.2 + image: ruoyi/ruoyi-job:2.2.0 container_name: ruoyi-job environment: # 时区上海 @@ -261,7 +261,7 @@ services: network_mode: "host" ruoyi-resource: - image: ruoyi/ruoyi-resource:2.1.2 + image: ruoyi/ruoyi-resource:2.2.0 container_name: ruoyi-resource environment: # 时区上海 diff --git a/pom.xml b/pom.xml index 39094e9e..db45c43b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ <description>RuoYi-Cloud-Plus微服务系统</description> <properties> - <revision>2.1.2</revision> + <revision>2.2.0-SNAPSHOT</revision> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>17</java.version> diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml index 46b61345..b0e99d37 100644 --- a/ruoyi-api/ruoyi-api-bom/pom.xml +++ b/ruoyi-api/ruoyi-api-bom/pom.xml @@ -15,7 +15,7 @@ </description> <properties> - <revision>2.1.2</revision> + <revision>2.2.0-SNAPSHOT</revision> </properties> <dependencyManagement> diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 4a7cb385..69b7247a 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -14,7 +14,7 @@ </description> <properties> - <revision>2.1.2</revision> + <revision>2.2.0-SNAPSHOT</revision> <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version> <sentinel.version>1.8.6</sentinel.version> <seata.version>1.7.1</seata.version> diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 043824eb..b67b4435 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -14,7 +14,7 @@ </description> <properties> - <revision>2.1.2</revision> + <revision>2.2.0-SNAPSHOT</revision> </properties> <dependencyManagement>