From 58bdc3276b76162837f825981d8dfe6483101889 Mon Sep 17 00:00:00 2001 From: wangyu <727842003@qq.com> Date: Thu, 4 Jul 2024 09:58:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=902.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=8C=E5=AE=8C=E7=BE=8E=E6=94=AF=E6=8C=81?= =?UTF-8?q?springboot3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auditor/callback/AuditorCallback.java | 6 +- .../callback/ReactiveAuditorCallback.java | 7 +- .../mongodb/config/MongoDataConfig.java | 2 +- .../MongoReactiveAuditorMongoCallback.java | 1 - .../test/mongo/MongoRepositoryTest.java | 2 +- .../r2dbc/config/R2dbcDataConfig.java | 2 +- .../data/r2dbc/query/FullUpdateMapper.java | 2 +- pom.xml | 79 ++++++++++++- settings.xml | 104 ------------------ 9 files changed, 88 insertions(+), 117 deletions(-) delete mode 100644 settings.xml diff --git a/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/AuditorCallback.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/AuditorCallback.java index 3110d7c..8d2af2d 100644 --- a/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/AuditorCallback.java +++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/AuditorCallback.java @@ -18,13 +18,13 @@ import static org.springframework.data.util.CastUtils.cast; */ public class AuditorCallback implements EntityCallback { - @Setter(onMethod_ = @Autowired) + @Autowired private ObjectProvider> commonAuditors; - @Setter(onMethod_ = @Autowired) + @Autowired private ObjectProvider> operationAuditors; - @Setter(onMethod_ = @Autowired) + @Autowired private ObjectProvider> authorizeAuditors; /** diff --git a/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java index 28c7623..0ffebe1 100644 --- a/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java +++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java @@ -4,7 +4,6 @@ import dev.flyfish.framework.auditor.ReactiveBeanAuditor; import dev.flyfish.framework.domain.authorized.AuthorizedDomain; import dev.flyfish.framework.domain.base.AuditDomain; import dev.flyfish.framework.domain.base.Domain; -import lombok.Setter; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mapping.callback.EntityCallback; @@ -19,13 +18,13 @@ import static org.springframework.data.util.CastUtils.cast; */ public abstract class ReactiveAuditorCallback implements EntityCallback { - @Setter(onMethod_ = @Autowired) + @Autowired private ObjectProvider> commonAuditors; - @Setter(onMethod_ = @Autowired) + @Autowired private ObjectProvider> operationAuditors; - @Setter(onMethod_ = @Autowired) + @Autowired private ObjectProvider> authorizeAuditors; /** diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/MongoDataConfig.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/MongoDataConfig.java index a325edb..e634c72 100644 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/MongoDataConfig.java +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/MongoDataConfig.java @@ -63,7 +63,7 @@ public class MongoDataConfig { } @Bean - public MongoReactiveAuditorMongoCallback auditorMongoCallback() { + public MongoReactiveAuditorMongoCallback reactiveAuditorMongoCallback() { return new MongoReactiveAuditorMongoCallback(); } } diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java index 18ad742..12e4541 100644 --- a/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java +++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java @@ -20,6 +20,5 @@ public class MongoReactiveAuditorMongoCallback extends ReactiveAuditorCallback i public Publisher onBeforeConvert(@NonNull Domain entity, @NonNull String collection) { // 执行auditor return audit(entity); - } } diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/MongoRepositoryTest.java b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/MongoRepositoryTest.java index 7fcf6dd..a346841 100644 --- a/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/MongoRepositoryTest.java +++ b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/MongoRepositoryTest.java @@ -33,7 +33,7 @@ public class MongoRepositoryTest { test.setCode("ttt"); test.setName("测试名称"); - System.out.println(testRepository.insert(test).block()); + System.out.println(testRepository.save(test).block()); System.out.println(testRepository.findAll(qo).collectList().block()); } } diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/R2dbcDataConfig.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/R2dbcDataConfig.java index 8dd2666..2a6444e 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/R2dbcDataConfig.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/R2dbcDataConfig.java @@ -114,7 +114,7 @@ public class R2dbcDataConfig { @Bean public R2dbcCustomConversions additionalConversions() { - List converters = new ArrayList(this.dialect.getConverters()); + List converters = new ArrayList<>(this.dialect.getConverters()); converters.addAll(R2dbcCustomConversions.STORE_CONVERTERS); converters.addAll(AdditionalConverters.ADDING_CONVERTERS); return new R2dbcCustomConversions(CustomConversions.StoreConversions.of(this.dialect.getSimpleTypeHolder(), converters), diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java index fc13907..096637a 100644 --- a/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java +++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java @@ -29,7 +29,7 @@ import java.util.*; * @author wangyu * 低级重写，后续官方支持后删除 */ -@SuppressWarnings({"rawtypes", "unchecked"}) +@SuppressWarnings({"rawtypes", "unchecked", "deprecation"}) public class FullUpdateMapper extends UpdateMapper { private final R2dbcDialect dialect; diff --git a/pom.xml b/pom.xml index f0ad18a..5f5d965 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ - 2.0.0-SNAPSHOT + 2.0.0 flyfish 0.27.2 UTF-8 @@ -37,6 +37,21 @@ + 飞鱼开源出品的快速开发框架 + https://flyfish.dev + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://git.flyfish.dev/flyfish-group/flyfish-framework.git + + flyfish-data @@ -134,6 +149,68 @@ + + + + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + + package + none + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.4 + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.central + central-publishing-maven-plugin + 0.5.0 + true + + central + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + + + diff --git a/settings.xml b/settings.xml deleted file mode 100644 index 4511466..0000000 --- a/settings.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - mirror - !rdc-releases,!rdc-snapshots - mirror - https://maven.aliyun.com/repository/public/ - - - - - - flyfish-releases - admin - YJXR19950501.. - - - flyfish-snapshots - admin - YJXR19950501.. - - - ossrh - wybaby168 - Yjxr19950501.. - - - rdc-releases - vsUeq1 - qATkD3fND4 - - - rdc-snapshots - vsUeq1 - qATkD3fND4 - - - - - nexus - - - rdc-releases - https://repo.rdc.aliyun.com/repository/118156-release-Sw8aZv/ - - true - - - false - - - - rdc-snapshots - https://repo.rdc.aliyun.com/repository/118156-snapshot-jRK1Jp/ - - false - - - true - - - - - - rdc-releases - https://repo.rdc.aliyun.com/repository/118156-release-Sw8aZv/ - - true - - - false - - - - rdc-snapshots - https://repo.rdc.aliyun.com/repository/118156-snapshot-jRK1Jp/ - - false - - - true - - - - - - ossrh - - - gpg - 19680823www - - - - - - nexus - - - -