!61 v3.2.1.3

Merge pull request !61 from 码匠君/develop
herodotus-ecosystem · Jan 3, 2024 · fe6ffec · fe6ffec
2 parents 113b943 + 6061515
commit fe6ffec
Show file tree

Hide file tree

Showing 139 changed files with 171 additions and 171 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 <p align="center">
     <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-3.2.1-blue.svg?logo=spring" alt="Spring Boot 3.2.1"></a>
-    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-3.2.1.2-red.svg?logo=spring" alt="Version 3.2.1.2"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-3.2.1.3-red.svg?logo=spring" alt="Version 3.2.1.3"></a>
     <a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green.svg?logo=openjdk" alt="Java 17"></a>
     <a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
     <a href="https://www.herodotus.cn"><img src="https://visitor-badge.laobi.icu/badge?page_id=dante-cloud&title=Total%20Visits" alt="Total Visits"></a>

diff --git a/oss-bom/pom.xml b/oss-bom/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>cn.herodotus.engine</groupId>
         <artifactId>dependencies</artifactId>
-        <version>3.2.1.2</version>
+        <version>3.2.1.3</version>
         <relativePath/>
     </parent>
 

diff --git a/oss-dialect/dialect-autoconfigure/pom.xml b/oss-dialect/dialect-autoconfigure/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>cn.herodotus.oss</groupId>
         <artifactId>oss-dialect</artifactId>
-        <version>3.2.1.2</version>
+        <version>3.2.1.3</version>
     </parent>
 
     <artifactId>dialect-autoconfigure</artifactId>

diff --git a/...ure/src/main/java/cn/herodotus/oss/dialect/autoconfigure/OssDialectAutoConfiguration.java b/...ure/src/main/java/cn/herodotus/oss/dialect/autoconfigure/OssDialectAutoConfiguration.java
@@ -25,7 +25,7 @@
 
 package cn.herodotus.oss.dialect.autoconfigure;
 
-import cn.herodotus.engine.assistant.core.function.ErrorCodeMapperBuilderCustomizer;
+import cn.herodotus.engine.assistant.definition.function.ErrorCodeMapperBuilderCustomizer;
 import cn.herodotus.oss.dialect.aliyun.configuration.OssDialectAliyunConfiguration;
 import cn.herodotus.oss.dialect.autoconfigure.annotation.ConditionalOnUseAliyunDialect;
 import cn.herodotus.oss.dialect.autoconfigure.annotation.ConditionalOnUseMinioDialect;

diff --git a/...n/herodotus/oss/dialect/autoconfigure/customizer/OssErrorCodeMapperBuilderCustomizer.java b/...n/herodotus/oss/dialect/autoconfigure/customizer/OssErrorCodeMapperBuilderCustomizer.java
@@ -25,9 +25,9 @@
 
 package cn.herodotus.oss.dialect.autoconfigure.customizer;
 
-import cn.herodotus.engine.assistant.core.constants.ErrorCodeMapperBuilderOrdered;
-import cn.herodotus.engine.assistant.core.exception.ErrorCodeMapperBuilder;
-import cn.herodotus.engine.assistant.core.function.ErrorCodeMapperBuilderCustomizer;
+import cn.herodotus.engine.assistant.definition.constants.ErrorCodeMapperBuilderOrdered;
+import cn.herodotus.engine.assistant.definition.function.ErrorCodeMapperBuilderCustomizer;
+import cn.herodotus.engine.assistant.definition.support.ErrorCodeMapperBuilder;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 import org.springframework.core.Ordered;
 

diff --git a/oss-dialect/dialect-core/pom.xml b/oss-dialect/dialect-core/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>cn.herodotus.oss</groupId>
         <artifactId>oss-dialect</artifactId>
-        <version>3.2.1.2</version>
+        <version>3.2.1.3</version>
     </parent>
 
     <artifactId>dialect-core</artifactId>

diff --git a/...lect/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/constants/OssConstants.java b/...lect/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/constants/OssConstants.java
@@ -25,7 +25,7 @@
 
 package cn.herodotus.oss.dialect.core.constants;
 
-import cn.herodotus.engine.assistant.core.constants.BaseConstants;
+import cn.herodotus.engine.assistant.definition.constants.BaseConstants;
 
 /**
  * <p>Description: 对象存储统一常量 </p>

diff --git a/...ect/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/constants/OssErrorCodes.java b/...ect/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/constants/OssErrorCodes.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.constants;
 
-import cn.herodotus.engine.assistant.core.exception.feedback.InternalServerErrorFeedback;
-import cn.herodotus.engine.assistant.core.exception.feedback.ServiceUnavailableFeedback;
+import cn.herodotus.engine.assistant.definition.feedback.InternalServerErrorFeedback;
+import cn.herodotus.engine.assistant.definition.feedback.ServiceUnavailableFeedback;
 
 /**
  * <p>Description: 对象存储错误代码 </p>

diff --git a/...c/main/java/cn/herodotus/oss/dialect/core/exception/OssBucketPolicyTooLargeException.java b/...c/main/java/cn/herodotus/oss/dialect/core/exception/OssBucketPolicyTooLargeException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2023/6/7 21:36
  */
-public class OssBucketPolicyTooLargeException extends PlatformException {
+public class OssBucketPolicyTooLargeException extends PlatformRuntimeException {
 
     public OssBucketPolicyTooLargeException() {
         super();

diff --git a/...alect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssConnectException.java b/...alect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssConnectException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2023/6/6 12:47
  */
-public class OssConnectException extends PlatformException {
+public class OssConnectException extends PlatformRuntimeException {
 
     public OssConnectException() {
         super();

diff --git a/...core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssErrorResponseException.java b/...core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssErrorResponseException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:30
  */
-public class OssErrorResponseException extends PlatformException {
+public class OssErrorResponseException extends PlatformRuntimeException {
 
     public OssErrorResponseException() {
         super();

diff --git a/...ect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssExecutionException.java b/...ect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssExecutionException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2022/7/4 11:08
  */
-public class OssExecutionException extends PlatformException {
+public class OssExecutionException extends PlatformRuntimeException {
 
     public OssExecutionException() {
         super();

diff --git a/...ct/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssIOException.java b/...ct/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssIOException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:35
  */
-public class OssIOException extends PlatformException {
+public class OssIOException extends PlatformRuntimeException {
 
     public OssIOException() {
         super();

diff --git a/...e/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInsufficientDataException.java b/...e/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInsufficientDataException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:32
  */
-public class OssInsufficientDataException extends PlatformException {
+public class OssInsufficientDataException extends PlatformRuntimeException {
 
     public OssInsufficientDataException() {
         super();

diff --git a/...lect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInternalException.java b/...lect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInternalException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:32
  */
-public class OssInternalException extends PlatformException {
+public class OssInternalException extends PlatformRuntimeException {
 
     public OssInternalException() {
         super();

diff --git a/...t-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInterruptedException.java b/...t-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInterruptedException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2022/7/4 11:09
  */
-public class OssInterruptedException extends PlatformException {
+public class OssInterruptedException extends PlatformRuntimeException {
 
     public OssInterruptedException() {
         super();

diff --git a/.../src/main/java/cn/herodotus/oss/dialect/core/exception/OssInvalidCipherTextException.java b/.../src/main/java/cn/herodotus/oss/dialect/core/exception/OssInvalidCipherTextException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2023/6/25 11:02
  */
-public class OssInvalidCipherTextException extends PlatformException {
+public class OssInvalidCipherTextException extends PlatformRuntimeException {
 
     public OssInvalidCipherTextException() {
         super();

diff --git a/...ct-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInvalidKeyException.java b/...ct-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInvalidKeyException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:32
  */
-public class OssInvalidKeyException extends PlatformException {
+public class OssInvalidKeyException extends PlatformRuntimeException {
 
     public OssInvalidKeyException() {
         super();

diff --git a/...re/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInvalidResponseException.java b/...re/src/main/java/cn/herodotus/oss/dialect/core/exception/OssInvalidResponseException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:35
  */
-public class OssInvalidResponseException extends PlatformException {
+public class OssInvalidResponseException extends PlatformRuntimeException {
 
     public OssInvalidResponseException() {
         super();

diff --git a/...re/src/main/java/cn/herodotus/oss/dialect/core/exception/OssNoSuchAlgorithmException.java b/...re/src/main/java/cn/herodotus/oss/dialect/core/exception/OssNoSuchAlgorithmException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:36
  */
-public class OssNoSuchAlgorithmException extends PlatformException {
+public class OssNoSuchAlgorithmException extends PlatformRuntimeException {
 
     public OssNoSuchAlgorithmException() {
         super();

diff --git a/...ialect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssServerException.java b/...ialect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssServerException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:36
  */
-public class OssServerException extends PlatformException {
+public class OssServerException extends PlatformRuntimeException {
     public OssServerException() {
         super();
     }

diff --git a/...ect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssXmlParserException.java b/...ect-core/src/main/java/cn/herodotus/oss/dialect/core/exception/OssXmlParserException.java
@@ -25,8 +25,8 @@
 
 package cn.herodotus.oss.dialect.core.exception;
 
-import cn.herodotus.engine.assistant.core.domain.Feedback;
-import cn.herodotus.engine.assistant.core.exception.PlatformException;
+import cn.herodotus.engine.assistant.definition.domain.Feedback;
+import cn.herodotus.engine.assistant.definition.exception.PlatformRuntimeException;
 import cn.herodotus.oss.dialect.core.constants.OssErrorCodes;
 
 /**
@@ -35,7 +35,7 @@
  * @author : gengwei.zheng
  * @date : 2021/11/8 14:36
  */
-public class OssXmlParserException extends PlatformException {
+public class OssXmlParserException extends PlatformRuntimeException {
 
     public OssXmlParserException() {
         super();

diff --git a/...lect/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/service/BaseOssService.java b/...lect/dialect-core/src/main/java/cn/herodotus/oss/dialect/core/service/BaseOssService.java
@@ -25,7 +25,7 @@
 
 package cn.herodotus.oss.dialect.core.service;
 
-import cn.herodotus.engine.assistant.core.definition.AbstractObjectPool;
+import cn.herodotus.engine.assistant.core.support.AbstractObjectPool;
 
 /**
  * <p>Description: 对象存储 Service 抽象定义 </p>

diff --git a/oss-dialect/dialect-sdk-aliyun/pom.xml b/oss-dialect/dialect-sdk-aliyun/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>cn.herodotus.oss</groupId>
         <artifactId>dante-oss</artifactId>
-        <version>3.2.1.2</version>
+        <version>3.2.1.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...src/main/java/cn/herodotus/oss/dialect/aliyun/definition/pool/AliyunClientObjectPool.java b/...src/main/java/cn/herodotus/oss/dialect/aliyun/definition/pool/AliyunClientObjectPool.java
@@ -25,7 +25,7 @@
 
 package cn.herodotus.oss.dialect.aliyun.definition.pool;
 
-import cn.herodotus.engine.assistant.core.definition.AbstractObjectPool;
+import cn.herodotus.engine.assistant.core.support.AbstractObjectPool;
 import cn.herodotus.oss.dialect.core.client.AbstractOssClientPooledObjectFactory;
 import com.aliyun.oss.OSS;
 

diff --git a/...n/src/main/java/cn/herodotus/oss/dialect/aliyun/definition/service/BaseAliyunService.java b/...n/src/main/java/cn/herodotus/oss/dialect/aliyun/definition/service/BaseAliyunService.java
@@ -25,7 +25,7 @@
 
 package cn.herodotus.oss.dialect.aliyun.definition.service;
 
-import cn.herodotus.engine.assistant.core.definition.AbstractObjectPool;
+import cn.herodotus.engine.assistant.core.support.AbstractObjectPool;
 import cn.herodotus.oss.dialect.core.service.BaseOssService;
 import com.aliyun.oss.OSS;