diff --git a/.run/ruoyi-auth.run.xml b/.run/ruoyi-auth.run.xml index f91ca44cd..abeeb774c 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 5da31147a..ff85d4e04 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 b7ea91864..6c509c119 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 e0b874cc5..13a2f21ed 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 e9b3c3480..a4b4213a3 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 d7155dc14..90d065f5e 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 565745927..fe1f9d96d 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 996abd227..f72e085a7 100644 --- a/.run/ruoyi-seata-server.run.xml +++ b/.run/ruoyi-seata-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-snailjob-server.run.xml b/.run/ruoyi-snailjob-server.run.xml index eee45c99f..228d9a006 100644 --- a/.run/ruoyi-snailjob-server.run.xml +++ b/.run/ruoyi-snailjob-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-system.run.xml b/.run/ruoyi-system.run.xml index 0fdc7fb62..82f4435a6 100644 --- a/.run/ruoyi-system.run.xml +++ b/.run/ruoyi-system.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-workflow.run.xml b/.run/ruoyi-workflow.run.xml index 2c973253e..0ed84f62a 100644 --- a/.run/ruoyi-workflow.run.xml +++ b/.run/ruoyi-workflow.run.xml @@ -2,7 +2,7 @@ - diff --git a/README.md b/README.md index cd444e986..8e95a6984 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Star](https://gitcode.com/dromara/RuoYi-Cloud-Plus/star/badge.svg)](https://gitcode.com/dromara/RuoYi-Cloud-Plus) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus/blob/2.X/LICENSE)
-[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-2.5.3-success.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus) +[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-2.6.0-success.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.5-blue.svg)]() [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]() [![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]() diff --git a/pom.xml b/pom.xml index 99d743b50..dd7befa8e 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ Dromara RuoYi-Cloud-Plus微服务系统 - 2.5.3 + 2.6.0 UTF-8 UTF-8 17 diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml index fd0126da3..8f465ca5f 100644 --- a/ruoyi-api/ruoyi-api-bom/pom.xml +++ b/ruoyi-api/ruoyi-api-bom/pom.xml @@ -15,7 +15,7 @@ - 2.5.3 + 2.6.0 diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index ec1f0bba6..096cfbde5 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -14,7 +14,7 @@ - 2.5.3 + 2.6.0 2025.0.0.0 2.5.0 2.5.1 diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 32f648be1..151b39725 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -14,7 +14,7 @@ - 2.5.3 + 2.6.0 diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 669969b64..ebfc2ab76 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -27,7 +27,7 @@ services: network_mode: "host" nacos: - image: ruoyi/ruoyi-nacos:2.5.3 + image: ruoyi/ruoyi-nacos:2.6.0 container_name: nacos ports: - "8848:8848" @@ -95,7 +95,7 @@ services: network_mode: "host" seata-server: - image: ruoyi/ruoyi-seata-server:2.5.3 + image: ruoyi/ruoyi-seata-server:2.6.0 container_name: seata-server ports: - "7091:7091" @@ -134,7 +134,7 @@ services: network_mode: "host" ruoyi-monitor: - image: ruoyi/ruoyi-monitor:2.5.3 + image: ruoyi/ruoyi-monitor:2.6.0 container_name: ruoyi-monitor environment: # 时区上海 @@ -150,7 +150,7 @@ services: network_mode: "host" ruoyi-snailjob-server: - image: ruoyi/ruoyi-snailjob-server:2.5.3 + image: ruoyi/ruoyi-snailjob-server:2.6.0 container_name: ruoyi-snailjob-server environment: # 时区上海 @@ -164,7 +164,7 @@ services: network_mode: "host" ruoyi-gateway: - image: ruoyi/ruoyi-gateway:2.5.3 + image: ruoyi/ruoyi-gateway:2.6.0 container_name: ruoyi-gateway environment: # 时区上海 @@ -180,7 +180,7 @@ services: network_mode: "host" ruoyi-auth: - image: ruoyi/ruoyi-auth:2.5.3 + image: ruoyi/ruoyi-auth:2.6.0 container_name: ruoyi-auth environment: # 时区上海 @@ -196,7 +196,7 @@ services: network_mode: "host" ruoyi-system: - image: ruoyi/ruoyi-system:2.5.3 + image: ruoyi/ruoyi-system:2.6.0 container_name: ruoyi-system environment: # 时区上海 @@ -212,7 +212,7 @@ services: network_mode: "host" ruoyi-gen: - image: ruoyi/ruoyi-gen:2.5.3 + image: ruoyi/ruoyi-gen:2.6.0 container_name: ruoyi-gen environment: # 时区上海 @@ -228,7 +228,7 @@ services: network_mode: "host" ruoyi-job: - image: ruoyi/ruoyi-job:2.5.3 + image: ruoyi/ruoyi-job:2.6.0 container_name: ruoyi-job environment: # 时区上海 @@ -246,7 +246,7 @@ services: network_mode: "host" ruoyi-resource: - image: ruoyi/ruoyi-resource:2.5.3 + image: ruoyi/ruoyi-resource:2.6.0 container_name: ruoyi-resource environment: # 时区上海 @@ -262,7 +262,7 @@ services: network_mode: "host" ruoyi-workflow: - image: ruoyi/ruoyi-workflow:2.5.3 + image: ruoyi/ruoyi-workflow:2.6.0 container_name: ruoyi-workflow environment: # 时区上海