chore: 重新梳理了包和模块的结构和依赖关系

ximatai · Aug 2, 2024 · 4ef509a · 4ef509a
1 parent 4c85b3d
commit 4ef509a
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 25 deletions.
diff --git a/...i/muyun/ability/std/IDatabaseAbility.java → ...matai/muyun/ability/IDatabaseAbility.java b/...i/muyun/ability/std/IDatabaseAbility.java → ...matai/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/...uyun/ability/std/IDatabaseUniAbility.java → ...ai/muyun/ability/IDatabaseUniAbility.java b/...uyun/ability/std/IDatabaseUniAbility.java → ...ai/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/...i/muyun/ability/std/IMetadataAbility.java → ...matai/muyun/ability/IMetadataAbility.java b/...i/muyun/ability/std/IMetadataAbility.java → ...matai/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/...un/ability/std/curd/std/ICURDAbility.java → .../muyun/ability/curd/std/ICURDAbility.java b/...un/ability/std/curd/std/ICURDAbility.java → .../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/.../ability/std/curd/std/ICreateAbility.java → ...uyun/ability/curd/std/ICreateAbility.java b/.../ability/std/curd/std/ICreateAbility.java → ...uyun/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/.../ability/std/curd/std/IDeleteAbility.java → ...uyun/ability/curd/std/IDeleteAbility.java b/.../ability/std/curd/std/IDeleteAbility.java → ...uyun/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/.../ability/std/curd/std/ISelectAbility.java → ...uyun/ability/curd/std/ISelectAbility.java b/.../ability/std/curd/std/ISelectAbility.java → ...uyun/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/.../ability/std/curd/std/IUpdateAbility.java → ...uyun/ability/curd/std/IUpdateAbility.java b/.../ability/std/curd/std/IUpdateAbility.java → ...uyun/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/...ability/std/curd/uni/ICURDUniAbility.java → ...yun/ability/curd/uni/ICURDUniAbility.java b/...ability/std/curd/uni/ICURDUniAbility.java → ...yun/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/...ility/std/curd/uni/ICreateAbilityUni.java → ...n/ability/curd/uni/ICreateAbilityUni.java b/...ility/std/curd/uni/ICreateAbilityUni.java → ...n/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
@@ -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
@@ -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
@@ -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")