From 4ef509a4150fbb39cd623a801b05c5020f3e1cda Mon Sep 17 00:00:00 2001 From: Liu Rui Date: Fri, 2 Aug 2024 13:33:53 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=87=8D=E6=96=B0=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E4=BA=86=E5=8C=85=E5=92=8C=E6=A8=A1=E5=9D=97=E7=9A=84=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=92=8C=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ximatai/muyun/ability/{std => }/IDatabaseAbility.java | 2 +- .../muyun/ability/{std => }/IDatabaseUniAbility.java | 2 +- .../ximatai/muyun/ability/{std => }/IMetadataAbility.java | 2 +- .../muyun/ability/{std => }/curd/std/ICURDAbility.java | 2 +- .../muyun/ability/{std => }/curd/std/ICreateAbility.java | 6 +++--- .../muyun/ability/{std => }/curd/std/IDeleteAbility.java | 6 +++--- .../muyun/ability/{std => }/curd/std/ISelectAbility.java | 6 +++--- .../muyun/ability/{std => }/curd/std/IUpdateAbility.java | 6 +++--- .../muyun/ability/{std => }/curd/uni/ICURDUniAbility.java | 2 +- .../muyun/ability/{std => }/curd/uni/ICreateAbilityUni.java | 6 +++--- my-database-std/build.gradle | 1 - my-platform/build.gradle | 3 --- .../ximatai/muyun/platform/controller/ModuleController.java | 2 +- 13 files changed, 21 insertions(+), 25 deletions(-) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/IDatabaseAbility.java (88%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/IDatabaseUniAbility.java (88%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/IMetadataAbility.java (96%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/curd/std/ICURDAbility.java (68%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/curd/std/ICreateAbility.java (65%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/curd/std/IDeleteAbility.java (79%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/curd/std/ISelectAbility.java (70%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/curd/std/IUpdateAbility.java (80%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/curd/uni/ICURDUniAbility.java (57%) rename my-core/src/main/java/net/ximatai/muyun/ability/{std => }/curd/uni/ICreateAbilityUni.java (67%) diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/IDatabaseAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/IDatabaseAbility.java similarity index 88% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/IDatabaseAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/IDatabaseAbility.java index 202f1573..e2361d99 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/IDatabaseAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/IDatabaseAbility.java @@ -1,4 +1,4 @@ -package net.ximatai.muyun.ability.std; +package net.ximatai.muyun.ability; import net.ximatai.muyun.database.IDatabaseAccess; import net.ximatai.muyun.database.IDatabaseAccessStd; diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/IDatabaseUniAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/IDatabaseUniAbility.java similarity index 88% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/IDatabaseUniAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/IDatabaseUniAbility.java index ff57ddc6..8ecfbd05 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/IDatabaseUniAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/IDatabaseUniAbility.java @@ -1,4 +1,4 @@ -package net.ximatai.muyun.ability.std; +package net.ximatai.muyun.ability; import net.ximatai.muyun.database.IDatabaseAccess; import net.ximatai.muyun.database.IDatabaseAccessUni; diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/IMetadataAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/IMetadataAbility.java similarity index 96% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/IMetadataAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/IMetadataAbility.java index 71e49f0c..b5f709f5 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/IMetadataAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/IMetadataAbility.java @@ -1,4 +1,4 @@ -package net.ximatai.muyun.ability.std; +package net.ximatai.muyun.ability; import java.util.Map; import java.util.StringJoiner; diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ICURDAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICURDAbility.java similarity index 68% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ICURDAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICURDAbility.java index 131d405f..c435465f 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ICURDAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICURDAbility.java @@ -1,4 +1,4 @@ -package net.ximatai.muyun.ability.std.curd.std; +package net.ximatai.muyun.ability.curd.std; public interface ICURDAbility extends ICreateAbility, IUpdateAbility, IDeleteAbility, ISelectAbility { } diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ICreateAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICreateAbility.java similarity index 65% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ICreateAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICreateAbility.java index 51ed1c5a..472f89d9 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ICreateAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ICreateAbility.java @@ -1,9 +1,9 @@ -package net.ximatai.muyun.ability.std.curd.std; +package net.ximatai.muyun.ability.curd.std; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; -import net.ximatai.muyun.ability.std.IDatabaseAbility; -import net.ximatai.muyun.ability.std.IMetadataAbility; +import net.ximatai.muyun.ability.IDatabaseAbility; +import net.ximatai.muyun.ability.IMetadataAbility; import java.util.Map; diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/IDeleteAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IDeleteAbility.java similarity index 79% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/IDeleteAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IDeleteAbility.java index 1dbda70b..80f7f104 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/IDeleteAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IDeleteAbility.java @@ -1,11 +1,11 @@ -package net.ximatai.muyun.ability.std.curd.std; +package net.ximatai.muyun.ability.curd.std; import jakarta.transaction.Transactional; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; -import net.ximatai.muyun.ability.std.IDatabaseAbility; -import net.ximatai.muyun.ability.std.IMetadataAbility; +import net.ximatai.muyun.ability.IDatabaseAbility; +import net.ximatai.muyun.ability.IMetadataAbility; import net.ximatai.muyun.database.exception.MyDatabaseException; import java.util.Map; diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ISelectAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java similarity index 70% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ISelectAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java index ee04a0ab..380ce667 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/ISelectAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java @@ -1,10 +1,10 @@ -package net.ximatai.muyun.ability.std.curd.std; +package net.ximatai.muyun.ability.curd.std; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; -import net.ximatai.muyun.ability.std.IDatabaseAbility; -import net.ximatai.muyun.ability.std.IMetadataAbility; +import net.ximatai.muyun.ability.IDatabaseAbility; +import net.ximatai.muyun.ability.IMetadataAbility; import java.util.Map; diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/IUpdateAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IUpdateAbility.java similarity index 80% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/IUpdateAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IUpdateAbility.java index d610fc09..8d274a19 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/std/IUpdateAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/curd/std/IUpdateAbility.java @@ -1,11 +1,11 @@ -package net.ximatai.muyun.ability.std.curd.std; +package net.ximatai.muyun.ability.curd.std; import jakarta.transaction.Transactional; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; -import net.ximatai.muyun.ability.std.IDatabaseAbility; -import net.ximatai.muyun.ability.std.IMetadataAbility; +import net.ximatai.muyun.ability.IDatabaseAbility; +import net.ximatai.muyun.ability.IMetadataAbility; import net.ximatai.muyun.database.exception.MyDatabaseException; import java.util.Map; diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/uni/ICURDUniAbility.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/uni/ICURDUniAbility.java similarity index 57% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/curd/uni/ICURDUniAbility.java rename to my-core/src/main/java/net/ximatai/muyun/ability/curd/uni/ICURDUniAbility.java index 0f3afb51..f5faa8f7 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/uni/ICURDUniAbility.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/curd/uni/ICURDUniAbility.java @@ -1,4 +1,4 @@ -package net.ximatai.muyun.ability.std.curd.uni; +package net.ximatai.muyun.ability.curd.uni; public interface ICURDUniAbility extends ICreateAbilityUni { } diff --git a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/uni/ICreateAbilityUni.java b/my-core/src/main/java/net/ximatai/muyun/ability/curd/uni/ICreateAbilityUni.java similarity index 67% rename from my-core/src/main/java/net/ximatai/muyun/ability/std/curd/uni/ICreateAbilityUni.java rename to my-core/src/main/java/net/ximatai/muyun/ability/curd/uni/ICreateAbilityUni.java index 5bfd051c..6bef683d 100644 --- a/my-core/src/main/java/net/ximatai/muyun/ability/std/curd/uni/ICreateAbilityUni.java +++ b/my-core/src/main/java/net/ximatai/muyun/ability/curd/uni/ICreateAbilityUni.java @@ -1,10 +1,10 @@ -package net.ximatai.muyun.ability.std.curd.uni; +package net.ximatai.muyun.ability.curd.uni; import io.smallrye.mutiny.Uni; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; -import net.ximatai.muyun.ability.std.IDatabaseUniAbility; -import net.ximatai.muyun.ability.std.IMetadataAbility; +import net.ximatai.muyun.ability.IDatabaseUniAbility; +import net.ximatai.muyun.ability.IMetadataAbility; import java.util.Map; diff --git a/my-database-std/build.gradle b/my-database-std/build.gradle index 74b90905..0f680dad 100644 --- a/my-database-std/build.gradle +++ b/my-database-std/build.gradle @@ -10,7 +10,6 @@ dependencies { api enforcedPlatform(libs.quarkus.platform.bom) implementation project(':my-database') - api "io.quarkus:quarkus-agroal" api "io.quarkus:quarkus-hibernate-orm" api "io.quarkus:quarkus-jdbc-postgresql" } diff --git a/my-platform/build.gradle b/my-platform/build.gradle index 0ce7ca11..26559ae4 100644 --- a/my-platform/build.gradle +++ b/my-platform/build.gradle @@ -7,9 +7,6 @@ plugins { dependencies { implementation project(':my-core') -// implementation project(':my-ability') -// implementation project(':my-database-std') -// implementation project(':my-ability') // implementation project(':my-database-std') implementation project(':my-database-uni') } diff --git a/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java b/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java index a7679895..d6963572 100644 --- a/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java +++ b/my-platform/src/main/java/net/ximatai/muyun/platform/controller/ModuleController.java @@ -2,7 +2,7 @@ import jakarta.inject.Inject; import jakarta.ws.rs.Path; -import net.ximatai.muyun.ability.std.curd.uni.ICURDUniAbility; +import net.ximatai.muyun.ability.curd.uni.ICURDUniAbility; import net.ximatai.muyun.database.IDatabaseAccess; @Path("/module")