From 559383d6153e65cbc977973e836476de83dae15a 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, 19 Jul 2023 14:24:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=202.1.0-SNAPSHOT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .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-resource.run.xml | 2 +- .run/ruoyi-seata-server.run.xml | 2 +- .run/ruoyi-sentinel-dashboard.run.xml | 2 +- .run/ruoyi-system.run.xml | 2 +- .run/ruoyi-xxl-job-admin.run.xml | 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 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.run/ruoyi-auth.run.xml b/.run/ruoyi-auth.run.xml index 602e84f3f..015e7256b 100644 --- a/.run/ruoyi-auth.run.xml +++ b/.run/ruoyi-auth.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-gateway.run.xml b/.run/ruoyi-gateway.run.xml index c58de3c76..2bd20322f 100644 --- a/.run/ruoyi-gateway.run.xml +++ b/.run/ruoyi-gateway.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-gen.run.xml b/.run/ruoyi-gen.run.xml index d7169ac80..00d2e166d 100644 --- a/.run/ruoyi-gen.run.xml +++ b/.run/ruoyi-gen.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-job.run.xml b/.run/ruoyi-job.run.xml index ed3eabd2c..0a43dc00a 100644 --- a/.run/ruoyi-job.run.xml +++ b/.run/ruoyi-job.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-monitor.run.xml b/.run/ruoyi-monitor.run.xml index 2536cd4ab..f624e4231 100644 --- a/.run/ruoyi-monitor.run.xml +++ b/.run/ruoyi-monitor.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-nacos.run.xml b/.run/ruoyi-nacos.run.xml index 4d7b6f437..c7394ccaf 100644 --- a/.run/ruoyi-nacos.run.xml +++ b/.run/ruoyi-nacos.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-resource.run.xml b/.run/ruoyi-resource.run.xml index 1718d3fc0..5cd9b9d2e 100644 --- a/.run/ruoyi-resource.run.xml +++ b/.run/ruoyi-resource.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-seata-server.run.xml b/.run/ruoyi-seata-server.run.xml index 330efb28f..33b6fc7af 100644 --- a/.run/ruoyi-seata-server.run.xml +++ b/.run/ruoyi-seata-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-sentinel-dashboard.run.xml b/.run/ruoyi-sentinel-dashboard.run.xml index 8e5c71577..a819f180c 100644 --- a/.run/ruoyi-sentinel-dashboard.run.xml +++ b/.run/ruoyi-sentinel-dashboard.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-system.run.xml b/.run/ruoyi-system.run.xml index ad31d27ef..f083161bb 100644 --- a/.run/ruoyi-system.run.xml +++ b/.run/ruoyi-system.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-xxl-job-admin.run.xml b/.run/ruoyi-xxl-job-admin.run.xml index fcc16cb8b..e110f32d7 100644 --- a/.run/ruoyi-xxl-job-admin.run.xml +++ b/.run/ruoyi-xxl-job-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0e9dc8cab..ef9f1435a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -29,7 +29,7 @@ services: network_mode: "host" nacos: - image: ruoyi/ruoyi-nacos:1.6.0 + image: ruoyi/ruoyi-nacos:2.1.0 container_name: nacos ports: - "8848:8848" @@ -96,7 +96,7 @@ services: network_mode: "host" seata-server: - image: ruoyi/ruoyi-seata-server:1.6.0 + image: ruoyi/ruoyi-seata-server:2.1.0 container_name: seata-server ports: - "7091:7091" @@ -135,7 +135,7 @@ services: network_mode: "host" sentinel: - image: ruoyi/ruoyi-sentinel-dashboard:1.6.0 + image: ruoyi/ruoyi-sentinel-dashboard:2.1.0 container_name: sentinel environment: TZ: Asia/Shanghai @@ -150,7 +150,7 @@ services: network_mode: "host" ruoyi-monitor: - image: ruoyi/ruoyi-monitor:1.6.0 + image: ruoyi/ruoyi-monitor:2.1.0 container_name: ruoyi-monitor environment: # 时区上海 @@ -166,7 +166,7 @@ services: network_mode: "host" ruoyi-xxl-job-admin: - image: ruoyi/ruoyi-xxl-job-admin:1.6.0 + image: ruoyi/ruoyi-xxl-job-admin:2.1.0 container_name: ruoyi-xxl-job-admin environment: # 时区上海 @@ -182,7 +182,7 @@ services: network_mode: "host" ruoyi-gateway: - image: ruoyi/ruoyi-gateway:1.6.0 + image: ruoyi/ruoyi-gateway:2.1.0 container_name: ruoyi-gateway environment: # 时区上海 @@ -198,7 +198,7 @@ services: network_mode: "host" ruoyi-auth: - image: ruoyi/ruoyi-auth:1.6.0 + image: ruoyi/ruoyi-auth:2.1.0 container_name: ruoyi-auth environment: # 时区上海 @@ -214,7 +214,7 @@ services: network_mode: "host" ruoyi-system: - image: ruoyi/ruoyi-system:1.6.0 + image: ruoyi/ruoyi-system:2.1.0 container_name: ruoyi-system environment: # 时区上海 @@ -230,7 +230,7 @@ services: network_mode: "host" ruoyi-gen: - image: ruoyi/ruoyi-gen:1.6.0 + image: ruoyi/ruoyi-gen:2.1.0 container_name: ruoyi-gen environment: # 时区上海 @@ -246,7 +246,7 @@ services: network_mode: "host" ruoyi-job: - image: ruoyi/ruoyi-job:1.6.0 + image: ruoyi/ruoyi-job:2.1.0 container_name: ruoyi-job environment: # 时区上海 @@ -262,7 +262,7 @@ services: network_mode: "host" ruoyi-resource: - image: ruoyi/ruoyi-resource:1.6.0 + image: ruoyi/ruoyi-resource:2.1.0 container_name: ruoyi-resource environment: # 时区上海 diff --git a/pom.xml b/pom.xml index b63aa2c23..f94ae48bf 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ RuoYi-Cloud-Plus微服务系统 - 2.0.0-BETA + 2.1.0-SNAPSHOT UTF-8 UTF-8 17 diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml index 79e90f969..448fc6b0f 100644 --- a/ruoyi-api/ruoyi-api-bom/pom.xml +++ b/ruoyi-api/ruoyi-api-bom/pom.xml @@ -15,7 +15,7 @@ - 2.0.0-BETA + 2.1.0-SNAPSHOT diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index d5fb6336c..94dc52c2c 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -14,7 +14,7 @@ - 2.0.0-BETA + 2.1.0-SNAPSHOT 2022.0.0.0-RC2 1.8.6 1.6.1 diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 4c94690bd..9b7c12efa 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -14,7 +14,7 @@ - 2.0.0-BETA + 2.1.0-SNAPSHOT