From 5570bd03b99360d8f8bccfe86745a7521c42d8da Mon Sep 17 00:00:00 2001 From: AlexBob Date: Wed, 31 Jul 2024 14:58:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(build):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96Gradle=E6=9E=84=E5=BB=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E8=B0=83=E5=BA=A6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E4=BB=A3=E7=A0=81=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b9cc5ab0..9b6a362d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,10 +9,15 @@ run-name: ${{ github.actor }} is bootBuildImage Actions on: release: types: [ created ] + workflow_dispatch: + branches: + - main pull_request: branches: - main - + push: + branches: + - main permissions: contents: read packages: write From 58078dde3fea6eafb8868dac6e5b326c130c8d2a Mon Sep 17 00:00:00 2001 From: AlexBob Date: Thu, 1 Aug 2024 09:14:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(boot,=20platf?= =?UTF-8?q?orm):=20=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=99=A8=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=9E=84=E5=BB=BA=E5=92=8C=E7=BC=93=E5=AD=98=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/plate/boot/commons/base/AbstractDatabase.java | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/platform/src/main/java/com/plate/boot/commons/base/AbstractDatabase.java b/boot/platform/src/main/java/com/plate/boot/commons/base/AbstractDatabase.java index e781497b..1583e530 100644 --- a/boot/platform/src/main/java/com/plate/boot/commons/base/AbstractDatabase.java +++ b/boot/platform/src/main/java/com/plate/boot/commons/base/AbstractDatabase.java @@ -70,7 +70,6 @@ protected Mono countWithCache(Object key, String sql, Map return countWithCache(key, source); } - protected Mono countWithCache(Object key, Mono sourceMono) { String cacheKey = key + ":count"; Long cacheCount = this.cache.get(cacheKey, () -> null); From 88f530013f99e35857bdbfe1492fbdeae2f50d82 Mon Sep 17 00:00:00 2001 From: AlexBob Date: Thu, 1 Aug 2024 09:24:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(build):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96Gradle=E6=9E=84=E5=BB=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E8=B0=83=E5=BA=A6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E4=BB=A3=E7=A0=81=E5=8F=AF=E7=BB=B4=E6=8A=A4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 992ed981..b23d5dd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=0.0.2-SNAPSHOT -org.gradle.parallel=false +org.gradle.parallel=true org.gradle.caching=true org.gradle.daemon=true org.gradle.jvmargs=-Dfile.encoding=UTF-8 \ No newline at end of file From 569d09cf82553964b9eab24e9a3a4065040622b8 Mon Sep 17 00:00:00 2001 From: AlexBob Date: Thu, 1 Aug 2024 09:41:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(build,=20boot?= =?UTF-8?q?/platform):=20=E6=9B=B4=E6=96=B0=E6=9E=84=E5=BB=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=92=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E9=AB=98=E9=A1=B9=E7=9B=AE=E5=8F=AF=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=80=A7=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 10 ++++------ .../java/com/plate/boot/config/R2dbcConfiguration.java | 5 +++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9b6a362d..4026b35d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -7,17 +7,15 @@ name: Gradle Build Docker Package run-name: ${{ github.actor }} is bootBuildImage Actions on: - release: - types: [ created ] - workflow_dispatch: + push: branches: - main pull_request: branches: - main - push: - branches: - - main + release: + types: [ created ] + permissions: contents: read packages: write diff --git a/boot/platform/src/main/java/com/plate/boot/config/R2dbcConfiguration.java b/boot/platform/src/main/java/com/plate/boot/config/R2dbcConfiguration.java index 966ad4d4..3c86d7d1 100644 --- a/boot/platform/src/main/java/com/plate/boot/config/R2dbcConfiguration.java +++ b/boot/platform/src/main/java/com/plate/boot/config/R2dbcConfiguration.java @@ -12,6 +12,7 @@ import org.springframework.data.domain.ReactiveAuditorAware; import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration; import org.springframework.data.r2dbc.config.EnableR2dbcAuditing; +import org.springframework.lang.NonNull; import org.springframework.transaction.annotation.EnableTransactionManagement; import java.util.List; @@ -28,12 +29,12 @@ public class R2dbcConfiguration extends AbstractR2dbcConfiguration { private final List> customConverters; @Override - public @lombok.NonNull ConnectionFactory connectionFactory() { + public @NonNull ConnectionFactory connectionFactory() { return ConnectionFactories.get("r2dbc:.."); } @Override - public @lombok.NonNull List getCustomConverters() { + public @NonNull List getCustomConverters() { return Lists.newArrayList(customConverters); }