From 9f7ce8b187e0de576a1f519938b9152790fccc68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=81=E5=8C=A0=E5=90=9B?= Date: Sun, 26 May 2024 15:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20feat:=20v3.3.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `Spring Boot` 已升级至 3.3.0 - `Spring Authorization Server` 已升级至 1.3.0 - 全面采用 Java 21，默认开启虚拟线程，以改善阻塞操作的处理降低系统资源的消耗 - 支持传统的 `阻塞式` 微服务与基于 `Reactor` 和 `WebFlux` 的 `响应式` 微服务同时运行在一套系统之中 - 不强制使用 `响应式` 方式开发，可根据自身项目对资源吞吐量、资源消耗、特殊功能性能保障的需求，灵活的选择是采用 `响应式` 还是 `阻塞式` 来开发对应的服务。 - 在保持 Dante Cloud 原有 `Spring Authorization Server` 深度扩展的各种特性的前提下，实现 `响应式` 服务的动态鉴权与现有体系的完全融合（无需在代码中使用 `@PreAuthorize` 写死权限，全部通过后台动态管理） - 向“响应式编程”转变，基于 `Reactor` 重构大量核心代码，进一步提升本系统代码质量和运行效能 - 重新架构所有核心组件模块，进一步降低各模块的耦合性，减少第三方组件依赖深度，简化各模块使用的复杂度，使用更贴近 Spring Boot 生态官方写法，提升模块组件的可插拔性以及 `响应式` 和 `阻塞式` 不同环境下自动配置的适配能力 - 实现 `响应式` 和 `阻塞式` 不同类型服务，Session 共享体系以及自定义 Session 体系的完美融合（谁说微服务就一定用不到 Session ：））。 - 新增 `GRPC` 服务间调用和通信方式，系统核心服务间调用支持 `OpenFeign` 和 `GRPC` 两种方式，可通过修改配置实现两种方式的切换。 - 基于 `RSocket` 全面重写 `WebSocket` 消息系统，实现 `WebSocket` 的 `响应式` 改造以及 `RSocket` 与 Spring Security 体系的全面集成。支持多实例、跨服务的私信和广播 - 新增 OAuth2 独立客户端，可用于客户端动态注册以及授权码模式 - 新增基于 `Loki + Grafana` 生态的轻量级日志中心和链路追踪解决方案，使用 OSS 作为数据存储，极大地降低资源需求，可作为原有 Skywalking 和 ELK 重量级体系的备选方案，根据实际需要切换。 - 开放纯手写动态表单功能。可实现BPMN、动态表单、Camunda 流程引擎的串联，实现工作流程运转（目前仅支持简单工作流） - 开放包含自定义属性面板的 BPMN 在线设计器功能。 - 开放物联网设备认证和管理模块，支持基于 Emqx 的物联网设备通信和管理。 - 开放阿里云内容审核、百度 OCR、环信、Emqx、天眼查、Nacos、PolarisMash等第三方 OpenApi 封装模块 - 前端工程支持 Docker 运行，相关参数可通过配置环境变量修改。已上传至 Docker Hub，可以直接下载运行。 --- README.md | 6 +- oss-bom/pom.xml | 40 ++++++------ oss-core/pom.xml | 4 +- oss-dialect/dialect-autoconfigure/pom.xml | 14 ++--- .../OssDialectAutoConfiguration.java | 2 +- oss-dialect/dialect-core-minio/pom.xml | 6 +- oss-dialect/dialect-core-s3/pom.xml | 6 +- oss-dialect/dialect-core/pom.xml | 6 +- oss-dialect/dialect-module-aliyun/pom.xml | 6 +- .../OssDialectAliyunConfiguration.java | 2 +- .../AliyunClientConfiguration.java | 62 ------------------- .../dialect-module-minio-reactive/pom.xml | 6 +- oss-dialect/dialect-module-minio/pom.xml | 6 +- .../dialect-module-s3-reactive/pom.xml | 6 +- oss-dialect/dialect-module-s3/pom.xml | 6 +- oss-dialect/pom.xml | 4 +- oss-rest/pom.xml | 4 +- oss-rest/rest-module-minio-reactive/pom.xml | 6 +- oss-rest/rest-module-minio/pom.xml | 6 +- oss-rest/rest-sdk-specification/pom.xml | 6 +- oss-solution/pom.xml | 6 +- .../oss-aliyun-spring-boot-starter/pom.xml | 6 +- .../OssAliyunAutoConfiguration.java | 3 +- .../oss-minio-spring-boot-starter/pom.xml | 8 +-- .../oss-s3-spring-boot-starter/pom.xml | 6 +- oss-starter/oss-spring-boot-starter/pom.xml | 10 +-- oss-starter/pom.xml | 4 +- pom.xml | 4 +- 28 files changed, 95 insertions(+), 156 deletions(-) rename oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/{configuration => config}/OssDialectAliyunConfiguration.java (98%) delete mode 100644 oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/configuration/AliyunClientConfiguration.java diff --git a/README.md b/README.md index e1579f62..595c32cb 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ ---

- Spring Boot 3.2.5 - Version 3.3.0.0-RC5 + Spring Boot 3.3.0 + Version 3.3.0.0 Java 17 License Apache 2.0 Total Visits @@ -109,7 +109,7 @@ dante-oss ```xml - cn.herodotus.oss + cn.herodotus.artemis oss-spring-boot-starter 最新版本 diff --git a/oss-bom/pom.xml b/oss-bom/pom.xml index 162b32d2..4466461c 100644 --- a/oss-bom/pom.xml +++ b/oss-bom/pom.xml @@ -32,11 +32,11 @@ cn.herodotus.stirrup dependencies - 3.3.0.0-RC5 + 3.3.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-bom pom @@ -74,92 +74,92 @@ - cn.herodotus.oss + cn.herodotus.artemis oss-core ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-core ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-core-minio ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-core-s3 ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-module-s3-reactive ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-module-minio-reactive ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-module-aliyun ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-module-minio ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-module-s3 ${project.version} - cn.herodotus.oss + cn.herodotus.artemis dialect-autoconfigure ${project.version} - cn.herodotus.oss + cn.herodotus.artemis oss-solution ${project.version} - cn.herodotus.oss + cn.herodotus.artemis rest-module-minio ${project.version} - cn.herodotus.oss + cn.herodotus.artemis rest-module-minio-reactive ${project.version} - cn.herodotus.oss + cn.herodotus.artemis rest-sdk-specification ${project.version} - cn.herodotus.oss + cn.herodotus.artemis oss-minio-spring-boot-starter ${project.version} - cn.herodotus.oss + cn.herodotus.artemis oss-aliyun-spring-boot-starter ${project.version} - cn.herodotus.oss + cn.herodotus.artemis oss-s3-spring-boot-starter ${project.version} - cn.herodotus.oss + cn.herodotus.artemis oss-spring-boot-starter ${project.version} diff --git a/oss-core/pom.xml b/oss-core/pom.xml index eb39499b..6ad99c5c 100644 --- a/oss-core/pom.xml +++ b/oss-core/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis dante-oss - 3.3.0.0-RC5 + 3.3.0.0 oss-core diff --git a/oss-dialect/dialect-autoconfigure/pom.xml b/oss-dialect/dialect-autoconfigure/pom.xml index 9c22f78f..f27d0121 100644 --- a/oss-dialect/dialect-autoconfigure/pom.xml +++ b/oss-dialect/dialect-autoconfigure/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-autoconfigure @@ -39,23 +39,23 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-module-aliyun - cn.herodotus.oss + cn.herodotus.artemis dialect-module-minio - cn.herodotus.oss + cn.herodotus.artemis dialect-module-minio-reactive - cn.herodotus.oss + cn.herodotus.artemis dialect-module-s3 - cn.herodotus.oss + cn.herodotus.artemis dialect-module-s3-reactive diff --git a/oss-dialect/dialect-autoconfigure/src/main/java/cn/herodotus/oss/dialect/autoconfigure/OssDialectAutoConfiguration.java b/oss-dialect/dialect-autoconfigure/src/main/java/cn/herodotus/oss/dialect/autoconfigure/OssDialectAutoConfiguration.java index 6622733d..c18eee99 100644 --- a/oss-dialect/dialect-autoconfigure/src/main/java/cn/herodotus/oss/dialect/autoconfigure/OssDialectAutoConfiguration.java +++ b/oss-dialect/dialect-autoconfigure/src/main/java/cn/herodotus/oss/dialect/autoconfigure/OssDialectAutoConfiguration.java @@ -25,7 +25,7 @@ package cn.herodotus.oss.dialect.autoconfigure; -import cn.herodotus.oss.dialect.aliyun.configuration.OssDialectAliyunConfiguration; +import cn.herodotus.oss.dialect.aliyun.config.OssDialectAliyunConfiguration; import cn.herodotus.oss.dialect.autoconfigure.annotation.ConditionalOnUseAliyunDialect; import cn.herodotus.oss.dialect.autoconfigure.annotation.ConditionalOnUseMinioDialect; import cn.herodotus.oss.dialect.autoconfigure.annotation.ConditionalOnUseS3Dialect; diff --git a/oss-dialect/dialect-core-minio/pom.xml b/oss-dialect/dialect-core-minio/pom.xml index 82136b6a..fecca240 100644 --- a/oss-dialect/dialect-core-minio/pom.xml +++ b/oss-dialect/dialect-core-minio/pom.xml @@ -29,16 +29,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-core-minio - cn.herodotus.oss + cn.herodotus.artemis dialect-core diff --git a/oss-dialect/dialect-core-s3/pom.xml b/oss-dialect/dialect-core-s3/pom.xml index ece040be..6f8ec34c 100644 --- a/oss-dialect/dialect-core-s3/pom.xml +++ b/oss-dialect/dialect-core-s3/pom.xml @@ -29,16 +29,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-core-s3 - cn.herodotus.oss + cn.herodotus.artemis dialect-core diff --git a/oss-dialect/dialect-core/pom.xml b/oss-dialect/dialect-core/pom.xml index f66e4b0e..0466b6dc 100644 --- a/oss-dialect/dialect-core/pom.xml +++ b/oss-dialect/dialect-core/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-core @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis oss-core diff --git a/oss-dialect/dialect-module-aliyun/pom.xml b/oss-dialect/dialect-module-aliyun/pom.xml index c9c6fd2b..bf9efd3c 100644 --- a/oss-dialect/dialect-module-aliyun/pom.xml +++ b/oss-dialect/dialect-module-aliyun/pom.xml @@ -30,9 +30,9 @@ 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-module-aliyun @@ -40,7 +40,7 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-core diff --git a/oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/configuration/OssDialectAliyunConfiguration.java b/oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/config/OssDialectAliyunConfiguration.java similarity index 98% rename from oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/configuration/OssDialectAliyunConfiguration.java rename to oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/config/OssDialectAliyunConfiguration.java index e78eccb3..55bbc269 100644 --- a/oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/configuration/OssDialectAliyunConfiguration.java +++ b/oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/config/OssDialectAliyunConfiguration.java @@ -23,7 +23,7 @@ * 6.若您的项目无法满足以上几点，可申请商业授权 */ -package cn.herodotus.oss.dialect.aliyun.configuration; +package cn.herodotus.oss.dialect.aliyun.config; import cn.herodotus.oss.dialect.aliyun.definition.pool.AliyunClientObjectPool; import cn.herodotus.oss.dialect.aliyun.definition.pool.AliyunClientPooledObjectFactory; diff --git a/oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/configuration/AliyunClientConfiguration.java b/oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/configuration/AliyunClientConfiguration.java deleted file mode 100644 index 841e6457..00000000 --- a/oss-dialect/dialect-module-aliyun/src/main/java/cn/herodotus/oss/dialect/aliyun/configuration/AliyunClientConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2020-2030 码匠君 - * - * Dante Cloud licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Dante OSS 采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改 Dante Cloud 源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ - -package cn.herodotus.oss.dialect.aliyun.configuration; - -import cn.herodotus.oss.dialect.aliyun.definition.pool.AliyunClientObjectPool; -import cn.herodotus.oss.dialect.aliyun.definition.pool.AliyunClientPooledObjectFactory; -import cn.herodotus.oss.dialect.aliyun.properties.AliyunProperties; -import jakarta.annotation.PostConstruct; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - *

Description: Aliyun OSS Client 配置

- * - * @author : gengwei.zheng - * @date : 2023/7/23 11:45 - */ -@Configuration(proxyBeanMethods = false) -public class AliyunClientConfiguration { - - private static final Logger log = LoggerFactory.getLogger(AliyunClientConfiguration.class); - - @PostConstruct - public void postConstruct() { - log.debug("[Herodotus] |- SDK [Aliyun Client] Configure."); - } - - @Bean - @ConditionalOnMissingBean - public AliyunClientObjectPool aliyunClientObjectPool(AliyunProperties aliyunProperties) { - AliyunClientPooledObjectFactory factory = new AliyunClientPooledObjectFactory(aliyunProperties); - AliyunClientObjectPool pool = new AliyunClientObjectPool(factory); - log.trace("[Herodotus] |- Bean [Aliyun Client Pool] Configure."); - return pool; - } -} diff --git a/oss-dialect/dialect-module-minio-reactive/pom.xml b/oss-dialect/dialect-module-minio-reactive/pom.xml index fba821de..6d630220 100644 --- a/oss-dialect/dialect-module-minio-reactive/pom.xml +++ b/oss-dialect/dialect-module-minio-reactive/pom.xml @@ -29,16 +29,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-module-minio-reactive - cn.herodotus.oss + cn.herodotus.artemis dialect-core-minio diff --git a/oss-dialect/dialect-module-minio/pom.xml b/oss-dialect/dialect-module-minio/pom.xml index a016c209..13f4878c 100644 --- a/oss-dialect/dialect-module-minio/pom.xml +++ b/oss-dialect/dialect-module-minio/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-module-minio @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-core-minio diff --git a/oss-dialect/dialect-module-s3-reactive/pom.xml b/oss-dialect/dialect-module-s3-reactive/pom.xml index 369e7efb..1411b140 100644 --- a/oss-dialect/dialect-module-s3-reactive/pom.xml +++ b/oss-dialect/dialect-module-s3-reactive/pom.xml @@ -29,16 +29,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-module-s3-reactive - cn.herodotus.oss + cn.herodotus.artemis dialect-core-s3 diff --git a/oss-dialect/dialect-module-s3/pom.xml b/oss-dialect/dialect-module-s3/pom.xml index 35abff74..ae61a650 100644 --- a/oss-dialect/dialect-module-s3/pom.xml +++ b/oss-dialect/dialect-module-s3/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-dialect - 3.3.0.0-RC5 + 3.3.0.0 dialect-module-s3 @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-core-s3 diff --git a/oss-dialect/pom.xml b/oss-dialect/pom.xml index 5c035804..3bf488ad 100644 --- a/oss-dialect/pom.xml +++ b/oss-dialect/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis dante-oss - 3.3.0.0-RC5 + 3.3.0.0 oss-dialect diff --git a/oss-rest/pom.xml b/oss-rest/pom.xml index c0f01c34..7d072eb7 100644 --- a/oss-rest/pom.xml +++ b/oss-rest/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis dante-oss - 3.3.0.0-RC5 + 3.3.0.0 oss-rest diff --git a/oss-rest/rest-module-minio-reactive/pom.xml b/oss-rest/rest-module-minio-reactive/pom.xml index 70183110..de322ed9 100644 --- a/oss-rest/rest-module-minio-reactive/pom.xml +++ b/oss-rest/rest-module-minio-reactive/pom.xml @@ -29,16 +29,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-rest - 3.3.0.0-RC5 + 3.3.0.0 rest-module-minio-reactive - cn.herodotus.oss + cn.herodotus.artemis dialect-module-minio-reactive diff --git a/oss-rest/rest-module-minio/pom.xml b/oss-rest/rest-module-minio/pom.xml index 663e2422..4eb5656b 100644 --- a/oss-rest/rest-module-minio/pom.xml +++ b/oss-rest/rest-module-minio/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-rest - 3.3.0.0-RC5 + 3.3.0.0 rest-module-minio @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-module-minio diff --git a/oss-rest/rest-sdk-specification/pom.xml b/oss-rest/rest-sdk-specification/pom.xml index c0c5ed38..12a83732 100644 --- a/oss-rest/rest-sdk-specification/pom.xml +++ b/oss-rest/rest-sdk-specification/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-rest - 3.3.0.0-RC5 + 3.3.0.0 rest-sdk-specification @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis oss-solution diff --git a/oss-solution/pom.xml b/oss-solution/pom.xml index 3f28d03e..5b143935 100644 --- a/oss-solution/pom.xml +++ b/oss-solution/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis dante-oss - 3.3.0.0-RC5 + 3.3.0.0 oss-solution @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-autoconfigure diff --git a/oss-starter/oss-aliyun-spring-boot-starter/pom.xml b/oss-starter/oss-aliyun-spring-boot-starter/pom.xml index d1d5793b..366665f4 100644 --- a/oss-starter/oss-aliyun-spring-boot-starter/pom.xml +++ b/oss-starter/oss-aliyun-spring-boot-starter/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-starter - 3.3.0.0-RC5 + 3.3.0.0 oss-aliyun-spring-boot-starter @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-module-aliyun diff --git a/oss-starter/oss-aliyun-spring-boot-starter/src/main/java/cn/herodotus/oss/aliyun/autoconfigure/OssAliyunAutoConfiguration.java b/oss-starter/oss-aliyun-spring-boot-starter/src/main/java/cn/herodotus/oss/aliyun/autoconfigure/OssAliyunAutoConfiguration.java index 7ce34e7c..40af62da 100644 --- a/oss-starter/oss-aliyun-spring-boot-starter/src/main/java/cn/herodotus/oss/aliyun/autoconfigure/OssAliyunAutoConfiguration.java +++ b/oss-starter/oss-aliyun-spring-boot-starter/src/main/java/cn/herodotus/oss/aliyun/autoconfigure/OssAliyunAutoConfiguration.java @@ -25,6 +25,7 @@ package cn.herodotus.oss.aliyun.autoconfigure; +import cn.herodotus.oss.dialect.aliyun.config.OssDialectAliyunConfiguration; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +40,7 @@ */ @Configuration(proxyBeanMethods = false) @Import({ - OssAliyunAutoConfiguration.class + OssDialectAliyunConfiguration.class }) public class OssAliyunAutoConfiguration { diff --git a/oss-starter/oss-minio-spring-boot-starter/pom.xml b/oss-starter/oss-minio-spring-boot-starter/pom.xml index 2da5bd39..6ab34aaa 100644 --- a/oss-starter/oss-minio-spring-boot-starter/pom.xml +++ b/oss-starter/oss-minio-spring-boot-starter/pom.xml @@ -29,20 +29,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-starter - 3.3.0.0-RC5 + 3.3.0.0 oss-minio-spring-boot-starter - cn.herodotus.oss + cn.herodotus.artemis rest-module-minio - cn.herodotus.oss + cn.herodotus.artemis rest-module-minio-reactive diff --git a/oss-starter/oss-s3-spring-boot-starter/pom.xml b/oss-starter/oss-s3-spring-boot-starter/pom.xml index 874a1079..d311304c 100644 --- a/oss-starter/oss-s3-spring-boot-starter/pom.xml +++ b/oss-starter/oss-s3-spring-boot-starter/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-starter - 3.3.0.0-RC5 + 3.3.0.0 oss-s3-spring-boot-starter @@ -39,7 +39,7 @@ - cn.herodotus.oss + cn.herodotus.artemis dialect-module-s3 diff --git a/oss-starter/oss-spring-boot-starter/pom.xml b/oss-starter/oss-spring-boot-starter/pom.xml index 7c592d26..233733c6 100644 --- a/oss-starter/oss-spring-boot-starter/pom.xml +++ b/oss-starter/oss-spring-boot-starter/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-starter - 3.3.0.0-RC5 + 3.3.0.0 oss-spring-boot-starter @@ -39,15 +39,15 @@ - cn.herodotus.oss + cn.herodotus.artemis rest-module-minio - cn.herodotus.oss + cn.herodotus.artemis rest-module-minio-reactive - cn.herodotus.oss + cn.herodotus.artemis rest-sdk-specification diff --git a/oss-starter/pom.xml b/oss-starter/pom.xml index 787c2415..25e42941 100644 --- a/oss-starter/pom.xml +++ b/oss-starter/pom.xml @@ -29,9 +29,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis dante-oss - 3.3.0.0-RC5 + 3.3.0.0 oss-starter diff --git a/pom.xml b/pom.xml index ca90cf36..fa9a5ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -30,9 +30,9 @@ 4.0.0 - cn.herodotus.oss + cn.herodotus.artemis oss-bom - 3.3.0.0-RC5 + 3.3.0.0 oss-bom/pom.xml