chore: 恢复到std模式可以通过单元测试的状态

ximatai · Aug 8, 2024 · 6b30fe4 · 6b30fe4
1 parent 0050866
commit 6b30fe4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/my-boot/src/main/resources/application.properties b/my-boot/src/main/resources/application.properties
@@ -10,7 +10,7 @@ quarkus.datasource.jdbc.url= jdbc:postgresql://localhost:54324/muyun
 
 quarkus.datasource.reactive.url = vertx-reactive:postgresql://localhost:54324/muyun
 
-quarkus.datasource.jdbc=false
+quarkus.datasource.jdbc=true
 
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.log.sql=true
diff --git a/my-database-std/src/main/java/net/ximatai/muyun/database/std/DataAccessStd.java b/my-database-std/src/main/java/net/ximatai/muyun/database/std/DataAccessStd.java
@@ -3,7 +3,6 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceUnit;
 import jakarta.persistence.Query;
 import jakarta.persistence.Tuple;
 import jakarta.transaction.Transactional;
@@ -18,7 +17,6 @@
 public class DataAccessStd implements IDatabaseAccessStd {
 
     @Inject
-    @PersistenceUnit(name = "standard")
     EntityManager entityManager;
 
     //TODO 要审查params的内容类型，比如字符串的日期要做转化，才能入库

diff --git a/my-platform/build.gradle b/my-platform/build.gradle
@@ -9,6 +9,6 @@ plugins {
 dependencies {
     api project(':my-core')
     //TODO 测试同时依赖的情况
-//    api project(':my-database-std')
-    api project(':my-database-uni')
+    api project(':my-database-std')
+//    api 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,11 +2,11 @@
 
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Path;
-import net.ximatai.muyun.ability.curd.uni.ICreateAbilityUni;
+import net.ximatai.muyun.ability.curd.std.ICURDAbility;
 import net.ximatai.muyun.database.IDatabaseAccess;
 
 @Path("/module")
-public class ModuleController implements ICreateAbilityUni {
+public class ModuleController implements ICURDAbility {
 
     @Inject
     IDatabaseAccess databaseAccess;