From 09dfcf51121aab5d64da30ab4874224675badc4d Mon Sep 17 00:00:00 2001 From: "tao.chen1" Date: Thu, 16 Feb 2023 10:32:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8Dspring=20boot=203.0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/META-INF/spring.factories | 3 ++- ...mework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 3 ++- ...mework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 3 ++- ...mework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../boot/starter}/annotation/RootRepository.java | 2 +- .../spring/boot/starter}/api/CriterionAppender.java | 2 +- .../boot/starter}/config/EnvironmentProcessor.java | 2 +- .../boot/starter}/config/MybatisPlusConfiguration.java | 2 +- .../spring/boot/starter}/entity/ArgSegment.java | 2 +- .../spring/boot/starter}/entity/JoinSegment.java | 2 +- .../spring/boot/starter}/entity/Metadata.java | 2 +- .../spring/boot/starter}/entity/SqlSegment.java | 2 +- .../spring/boot/starter}/impl/AppenderContext.java | 4 ++-- .../spring/boot/starter}/impl/EntityIndexResult.java | 4 ++-- .../spring/boot/starter}/impl/SQLExampleBuilder.java | 10 +++++----- .../boot/starter}/repository/MybatisPlusExecutor.java | 10 +++++----- .../starter}/repository/MybatisPlusRepository.java | 4 ++-- .../spring/boot/starter}/util/NumberUtils.java | 2 +- .../src/main/resources/META-INF/spring.factories | 6 ++++-- ...mework.boot.autoconfigure.AutoConfiguration.imports | 1 + 22 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 dorive-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 dorive-event/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 dorive-injection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/annotation/RootRepository.java (96%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/api/CriterionAppender.java (95%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/config/EnvironmentProcessor.java (97%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/config/MybatisPlusConfiguration.java (93%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/entity/ArgSegment.java (89%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/entity/JoinSegment.java (95%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/entity/Metadata.java (94%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/entity/SqlSegment.java (96%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/impl/AppenderContext.java (96%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/impl/EntityIndexResult.java (95%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/impl/SQLExampleBuilder.java (97%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/repository/MybatisPlusExecutor.java (97%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/repository/MybatisPlusRepository.java (96%) rename dorive-spring-boot-starter/src/main/java/com/gitee/{spring/boot/starter/dorive => dorive/spring/boot/starter}/util/NumberUtils.java (95%) create mode 100644 dorive-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/dorive-core/src/main/resources/META-INF/spring.factories b/dorive-core/src/main/resources/META-INF/spring.factories index 54e414f0..9c664283 100644 --- a/dorive-core/src/main/resources/META-INF/spring.factories +++ b/dorive-core/src/main/resources/META-INF/spring.factories @@ -1 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.gitee.dorive.core.config.DomainCoreConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.gitee.dorive.core.config.DomainCoreConfiguration \ No newline at end of file diff --git a/dorive-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dorive-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..228f55d9 --- /dev/null +++ b/dorive-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.gitee.dorive.core.config.DomainCoreConfiguration \ No newline at end of file diff --git a/dorive-event/src/main/resources/META-INF/spring.factories b/dorive-event/src/main/resources/META-INF/spring.factories index 0ae90702..3a928a15 100644 --- a/dorive-event/src/main/resources/META-INF/spring.factories +++ b/dorive-event/src/main/resources/META-INF/spring.factories @@ -1 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.gitee.dorive.event.config.DomainEventConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.gitee.dorive.event.config.DomainEventConfiguration \ No newline at end of file diff --git a/dorive-event/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dorive-event/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..53ed7a77 --- /dev/null +++ b/dorive-event/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.gitee.dorive.event.config.DomainEventConfiguration \ No newline at end of file diff --git a/dorive-injection/src/main/resources/META-INF/spring.factories b/dorive-injection/src/main/resources/META-INF/spring.factories index f95c7848..68fef244 100644 --- a/dorive-injection/src/main/resources/META-INF/spring.factories +++ b/dorive-injection/src/main/resources/META-INF/spring.factories @@ -1 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.gitee.dorive.injection.config.DomainInjectionConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.gitee.dorive.injection.config.DomainInjectionConfiguration \ No newline at end of file diff --git a/dorive-injection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dorive-injection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..43593849 --- /dev/null +++ b/dorive-injection/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.gitee.dorive.injection.config.DomainInjectionConfiguration \ No newline at end of file diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/annotation/RootRepository.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/annotation/RootRepository.java similarity index 96% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/annotation/RootRepository.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/annotation/RootRepository.java index 55f9e0b1..2b96183a 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/annotation/RootRepository.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/annotation/RootRepository.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.annotation; +package com.gitee.dorive.spring.boot.starter.annotation; import com.gitee.dorive.core.annotation.Repository; import com.gitee.dorive.injection.annotation.Root; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/api/CriterionAppender.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/api/CriterionAppender.java similarity index 95% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/api/CriterionAppender.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/api/CriterionAppender.java index 584164fc..8b31b3f6 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/api/CriterionAppender.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/api/CriterionAppender.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.api; +package com.gitee.dorive.spring.boot.starter.api; import com.baomidou.mybatisplus.core.conditions.AbstractWrapper; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/config/EnvironmentProcessor.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/config/EnvironmentProcessor.java similarity index 97% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/config/EnvironmentProcessor.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/config/EnvironmentProcessor.java index ded21233..3a3947f7 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/config/EnvironmentProcessor.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/config/EnvironmentProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.gitee.spring.boot.starter.dorive.config; +package com.gitee.dorive.spring.boot.starter.config; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/config/MybatisPlusConfiguration.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/config/MybatisPlusConfiguration.java similarity index 93% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/config/MybatisPlusConfiguration.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/config/MybatisPlusConfiguration.java index 088a39de..0a698800 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/config/MybatisPlusConfiguration.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/config/MybatisPlusConfiguration.java @@ -1,4 +1,4 @@ -package com.gitee.spring.boot.starter.dorive.config; +package com.gitee.dorive.spring.boot.starter.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/ArgSegment.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/ArgSegment.java similarity index 89% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/ArgSegment.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/ArgSegment.java index f91dc920..77531d51 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/ArgSegment.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/ArgSegment.java @@ -1,4 +1,4 @@ -package com.gitee.spring.boot.starter.dorive.entity; +package com.gitee.dorive.spring.boot.starter.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/JoinSegment.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/JoinSegment.java similarity index 95% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/JoinSegment.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/JoinSegment.java index 72ec6f6f..c5ecdb7d 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/JoinSegment.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/JoinSegment.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.entity; +package com.gitee.dorive.spring.boot.starter.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/Metadata.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/Metadata.java similarity index 94% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/Metadata.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/Metadata.java index eec19668..daa789c8 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/Metadata.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/Metadata.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.entity; +package com.gitee.dorive.spring.boot.starter.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/SqlSegment.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/SqlSegment.java similarity index 96% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/SqlSegment.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/SqlSegment.java index 6bf65468..7632a52d 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/entity/SqlSegment.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/entity/SqlSegment.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.entity; +package com.gitee.dorive.spring.boot.starter.entity; import com.gitee.dorive.core.entity.executor.Example; import lombok.AllArgsConstructor; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/AppenderContext.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/AppenderContext.java similarity index 96% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/AppenderContext.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/AppenderContext.java index a4fd3ecc..04c76807 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/AppenderContext.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/AppenderContext.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.impl; +package com.gitee.dorive.spring.boot.starter.impl; import com.baomidou.mybatisplus.core.conditions.interfaces.Compare; -import com.gitee.spring.boot.starter.dorive.api.CriterionAppender; +import com.gitee.dorive.spring.boot.starter.api.CriterionAppender; import com.gitee.dorive.core.api.constant.Operator; import com.gitee.dorive.core.util.SqlUtils; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/EntityIndexResult.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/EntityIndexResult.java similarity index 95% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/EntityIndexResult.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/EntityIndexResult.java index 7af267ce..0a1fa295 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/EntityIndexResult.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/EntityIndexResult.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.impl; +package com.gitee.dorive.spring.boot.starter.impl; import com.gitee.dorive.core.api.EntityIndex; import com.gitee.dorive.core.entity.executor.Result; import com.gitee.dorive.core.entity.executor.UnionExample; -import com.gitee.spring.boot.starter.dorive.util.NumberUtils; +import com.gitee.dorive.spring.boot.starter.util.NumberUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/SQLExampleBuilder.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/SQLExampleBuilder.java similarity index 97% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/SQLExampleBuilder.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/SQLExampleBuilder.java index 19c4ada2..bbe6f9eb 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/impl/SQLExampleBuilder.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/impl/SQLExampleBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.impl; +package com.gitee.dorive.spring.boot.starter.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; @@ -42,10 +42,10 @@ import com.gitee.dorive.core.impl.resolver.BinderResolver; import com.gitee.dorive.core.repository.ConfiguredRepository; import com.gitee.dorive.core.util.CriterionUtils; import com.gitee.dorive.core.util.SqlUtils; -import com.gitee.spring.boot.starter.dorive.entity.ArgSegment; -import com.gitee.spring.boot.starter.dorive.entity.JoinSegment; -import com.gitee.spring.boot.starter.dorive.entity.Metadata; -import com.gitee.spring.boot.starter.dorive.entity.SqlSegment; +import com.gitee.dorive.spring.boot.starter.entity.ArgSegment; +import com.gitee.dorive.spring.boot.starter.entity.JoinSegment; +import com.gitee.dorive.spring.boot.starter.entity.Metadata; +import com.gitee.dorive.spring.boot.starter.entity.SqlSegment; import java.util.ArrayList; import java.util.Collections; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/repository/MybatisPlusExecutor.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/repository/MybatisPlusExecutor.java similarity index 97% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/repository/MybatisPlusExecutor.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/repository/MybatisPlusExecutor.java index 0852c093..dc35ea66 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/repository/MybatisPlusExecutor.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/repository/MybatisPlusExecutor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.repository; +package com.gitee.dorive.spring.boot.starter.repository; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; @@ -45,9 +45,9 @@ import com.gitee.dorive.core.entity.operation.Operation; import com.gitee.dorive.core.entity.operation.Query; import com.gitee.dorive.core.entity.operation.Update; import com.gitee.dorive.core.impl.executor.AbstractExecutor; -import com.gitee.spring.boot.starter.dorive.api.CriterionAppender; -import com.gitee.spring.boot.starter.dorive.entity.Metadata; -import com.gitee.spring.boot.starter.dorive.impl.EntityIndexResult; +import com.gitee.dorive.spring.boot.starter.api.CriterionAppender; +import com.gitee.dorive.spring.boot.starter.entity.Metadata; +import com.gitee.dorive.spring.boot.starter.impl.EntityIndexResult; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -59,7 +59,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.gitee.spring.boot.starter.dorive.impl.AppenderContext.OPERATOR_CRITERION_APPENDER_MAP; +import static com.gitee.dorive.spring.boot.starter.impl.AppenderContext.OPERATOR_CRITERION_APPENDER_MAP; @Getter @Setter diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/repository/MybatisPlusRepository.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/repository/MybatisPlusRepository.java similarity index 96% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/repository/MybatisPlusRepository.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/repository/MybatisPlusRepository.java index 0a433acb..3575d0a6 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/repository/MybatisPlusRepository.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/repository/MybatisPlusRepository.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.repository; +package com.gitee.dorive.spring.boot.starter.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gitee.spring.boot.starter.dorive.impl.SQLExampleBuilder; +import com.gitee.dorive.spring.boot.starter.impl.SQLExampleBuilder; import com.gitee.dorive.coating.repository.AbstractCoatingRepository; import com.gitee.dorive.core.api.EntityFactory; import com.gitee.dorive.core.api.Executor; diff --git a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/util/NumberUtils.java b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/util/NumberUtils.java similarity index 95% rename from dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/util/NumberUtils.java rename to dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/util/NumberUtils.java index e2121c48..b5e90ceb 100644 --- a/dorive-spring-boot-starter/src/main/java/com/gitee/spring/boot/starter/dorive/util/NumberUtils.java +++ b/dorive-spring-boot-starter/src/main/java/com/gitee/dorive/spring/boot/starter/util/NumberUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gitee.spring.boot.starter.dorive.util; +package com.gitee.dorive.spring.boot.starter.util; public class NumberUtils { diff --git a/dorive-spring-boot-starter/src/main/resources/META-INF/spring.factories b/dorive-spring-boot-starter/src/main/resources/META-INF/spring.factories index be65b4e5..853f9182 100644 --- a/dorive-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/dorive-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,4 @@ -org.springframework.boot.env.EnvironmentPostProcessor=com.gitee.spring.boot.starter.dorive.config.EnvironmentProcessor -org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.gitee.spring.boot.starter.dorive.config.MybatisPlusConfiguration +org.springframework.boot.env.EnvironmentPostProcessor=\ + com.gitee.dorive.spring.boot.starter.config.EnvironmentProcessor +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.gitee.dorive.spring.boot.starter.config.MybatisPlusConfiguration diff --git a/dorive-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dorive-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..071b7b70 --- /dev/null +++ b/dorive-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.gitee.dorive.spring.boot.starter.config.MybatisPlusConfiguration \ No newline at end of file -- Gitee From 3eaced08d3dfc2f48ab133dcde6044f4cb0b8d4e Mon Sep 17 00:00:00 2001 From: "tao.chen1" Date: Thu, 16 Feb 2023 10:33:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8Dspring=20boot=203.0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorive-coating/pom.xml | 2 +- dorive-core/pom.xml | 2 +- dorive-event/pom.xml | 2 +- dorive-generator/pom.xml | 2 +- dorive-injection/pom.xml | 2 +- dorive-proxy/pom.xml | 2 +- dorive-service/pom.xml | 2 +- dorive-spring-boot-starter/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dorive-coating/pom.xml b/dorive-coating/pom.xml index 8f44fa96..ac516786 100644 --- a/dorive-coating/pom.xml +++ b/dorive-coating/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-coating diff --git a/dorive-core/pom.xml b/dorive-core/pom.xml index 05b5076a..a484fcf8 100644 --- a/dorive-core/pom.xml +++ b/dorive-core/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-core diff --git a/dorive-event/pom.xml b/dorive-event/pom.xml index 9b3d0b4d..0d513490 100644 --- a/dorive-event/pom.xml +++ b/dorive-event/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-event diff --git a/dorive-generator/pom.xml b/dorive-generator/pom.xml index bbacc50b..cf4b62ac 100644 --- a/dorive-generator/pom.xml +++ b/dorive-generator/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-generator diff --git a/dorive-injection/pom.xml b/dorive-injection/pom.xml index 44487943..6991fd5e 100644 --- a/dorive-injection/pom.xml +++ b/dorive-injection/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-injection diff --git a/dorive-proxy/pom.xml b/dorive-proxy/pom.xml index 63e91d0f..0b244551 100644 --- a/dorive-proxy/pom.xml +++ b/dorive-proxy/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-proxy diff --git a/dorive-service/pom.xml b/dorive-service/pom.xml index cb9d188a..4e81b2c0 100644 --- a/dorive-service/pom.xml +++ b/dorive-service/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-service diff --git a/dorive-spring-boot-starter/pom.xml b/dorive-spring-boot-starter/pom.xml index 277773cd..f4fa2f12 100644 --- a/dorive-spring-boot-starter/pom.xml +++ b/dorive-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 dorive-spring-boot-starter diff --git a/pom.xml b/pom.xml index 45d11bcc..99c2bb7d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.digital-engine dorive - 3.1.6 + 3.1.7 pom -- Gitee