create base component

fluent-qa · Jan 26, 2024 · b3dd46f · b3dd46f
1 parent bbaaac2
commit b3dd46f
Show file tree

Hide file tree

Showing 25 changed files with 44 additions and 37 deletions.
diff --git a/qaserver/src/main/java/io/fluentqa/base/README.md b/qaserver/src/main/java/io/fluentqa/base/README.md
@@ -0,0 +1,8 @@
+# README
+
+shared component:
+
+- master data: shared configurations
+- upload data: upload component
+- product: product module
+- project: project module
diff --git a/...va/io/fluentqa/base/model/MasterData.java → ...tqa/base/masterdata/model/MasterData.java b/...va/io/fluentqa/base/model/MasterData.java → ...tqa/base/masterdata/model/MasterData.java
@@ -1,6 +1,7 @@
-package io.fluentqa.base.model;
+package io.fluentqa.base.masterdata.model;
 
 import io.fluentqa.base.handlers.SqlTagFetchHandler;
+import io.fluentqa.base.model.ModelWithValidFlagVo;
 import lombok.Data;
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;

diff --git a/...io/fluentqa/base/repo/MasterDataRepo.java → .../base/masterdata/repo/MasterDataRepo.java b/...io/fluentqa/base/repo/MasterDataRepo.java → .../base/masterdata/repo/MasterDataRepo.java
@@ -1,6 +1,6 @@
-package io.fluentqa.base.repo;
+package io.fluentqa.base.masterdata.repo;
 
-import io.fluentqa.base.model.MasterData;
+import io.fluentqa.base.masterdata.model.MasterData;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

diff --git a/.../pm/product/model/ProductModuleModel.java → ...ase/product/model/ProductModuleModel.java b/.../pm/product/model/ProductModuleModel.java → ...ase/product/model/ProductModuleModel.java
@@ -1,4 +1,4 @@
-package io.fluentqa.qtm.pm.product.model;
+package io.fluentqa.base.product.model;
 
 import io.fluentqa.base.model.ModelWithValidFlagVo;
 import xyz.erupt.annotation.Erupt;

diff --git a/...oduct/model/ProductModuleValidFlagVo.java → ...oduct/model/ProductModuleValidFlagVo.java b/...oduct/model/ProductModuleValidFlagVo.java → ...oduct/model/ProductModuleValidFlagVo.java
@@ -1,4 +1,4 @@
-package io.fluentqa.qtm.pm.product.model;
+package io.fluentqa.base.product.model;
 
 import io.fluentqa.base.model.ModelWithValidFlagVo;
 import lombok.Getter;

diff --git a/qaserver/src/main/java/io/fluentqa/base/product/package-info.java b/qaserver/src/main/java/io/fluentqa/base/product/package-info.java
@@ -0,0 +1 @@
+package io.fluentqa.base.product;
diff --git a/...tm/pm/product/repo/ProductModuleRepo.java → .../base/product/repo/ProductModuleRepo.java b/...tm/pm/product/repo/ProductModuleRepo.java → .../base/product/repo/ProductModuleRepo.java
@@ -1,7 +1,7 @@
-package io.fluentqa.qtm.pm.product.repo;
+package io.fluentqa.base.product.repo;
 
 
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

diff --git a/...product/service/ProductModuleService.java → ...product/service/ProductModuleService.java b/...product/service/ProductModuleService.java → ...product/service/ProductModuleService.java
@@ -1,11 +1,11 @@
-package io.fluentqa.qtm.pm.product.service;
+package io.fluentqa.base.product.service;
 
 import io.fluent.builtin.PingYinUtils;
+import io.fluentqa.base.product.repo.ProductModuleRepo;
 import io.fluentqa.base.proxies.AuditDataEnhancerProxy;
-import io.fluentqa.base.repo.MasterDataRepo;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
-import io.fluentqa.base.model.MasterData;
-import io.fluentqa.qtm.pm.product.repo.ProductModuleRepo;
+import io.fluentqa.base.masterdata.repo.MasterDataRepo;
+import io.fluentqa.base.product.model.ProductModuleModel;
+import io.fluentqa.base.masterdata.model.MasterData;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

diff --git a/...qa/qtm/pm/project/model/ProjectModel.java → ...ntqa/base/project/model/ProjectModel.java b/...qa/qtm/pm/project/model/ProjectModel.java → ...ntqa/base/project/model/ProjectModel.java
@@ -1,8 +1,8 @@
-package io.fluentqa.qtm.pm.project.model;
+package io.fluentqa.base.project.model;
 
 
 import io.fluentqa.base.model.ModelWithValidFlagVo;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import lombok.Data;
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;

diff --git a/...qtm/pm/project/repo/ProjectModelRepo.java → ...a/base/project/repo/ProjectModelRepo.java b/...qtm/pm/project/repo/ProjectModelRepo.java → ...a/base/project/repo/ProjectModelRepo.java
@@ -1,7 +1,7 @@
-package io.fluentqa.qtm.pm.project.repo;
+package io.fluentqa.base.project.repo;
 
 
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

diff --git a/...luentqa/upload/model/UploadFileModel.java → ...qa/base/upload/model/UploadFileModel.java b/...luentqa/upload/model/UploadFileModel.java → ...qa/base/upload/model/UploadFileModel.java
@@ -1,7 +1,7 @@
-package io.fluentqa.upload.model;
+package io.fluentqa.base.upload.model;
 
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
-import io.fluentqa.upload.proxy.UploadFileDataProxy;
+import io.fluentqa.base.upload.proxy.UploadFileDataProxy;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import lombok.Data;
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;

diff --git a/qaserver/src/main/java/io/fluentqa/base/upload/package-info.java b/qaserver/src/main/java/io/fluentqa/base/upload/package-info.java
@@ -0,0 +1 @@
+package io.fluentqa.base.upload;
diff --git a/...tqa/upload/proxy/UploadFileDataProxy.java → ...ase/upload/proxy/UploadFileDataProxy.java b/...tqa/upload/proxy/UploadFileDataProxy.java → ...ase/upload/proxy/UploadFileDataProxy.java
@@ -1,10 +1,10 @@
-package io.fluentqa.upload.proxy;
+package io.fluentqa.base.upload.proxy;
 
 
 
 import cn.hutool.core.bean.BeanUtil;
 import io.fluentqa.excel.ExcelReadWriter;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import io.fluentqa.qtm.tc.dto.TestCaseDTO;
 import io.fluentqa.qtm.tc.service.TestCaseService;
 import io.fluentqa.qtm.tc.service.impl.MindMappingService;

diff --git a/...ntqa/upload/proxy/UploadFileTypeEnum.java → ...base/upload/proxy/UploadFileTypeEnum.java b/...ntqa/upload/proxy/UploadFileTypeEnum.java → ...base/upload/proxy/UploadFileTypeEnum.java
@@ -1,4 +1,4 @@
-package io.fluentqa.upload.proxy;
+package io.fluentqa.base.upload.proxy;
 
 public enum UploadFileTypeEnum {
     EXCEL_TC,FREEMIND,PM,MINDMAP;

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/api/model/ApiTestScenario.java b/qaserver/src/main/java/io/fluentqa/qtm/api/model/ApiTestScenario.java
@@ -2,7 +2,7 @@
 
 import io.fluentqa.base.handlers.SqlTagFetchHandler;
 import io.fluentqa.base.model.ModelWithValidFlag;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;
 import xyz.erupt.annotation.sub_erupt.Layout;

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/api/service/RemoteApiService.java b/qaserver/src/main/java/io/fluentqa/qtm/api/service/RemoteApiService.java
@@ -8,8 +8,8 @@
 import io.fluentqa.qtm.api.model.RemoteApi;
 import io.fluentqa.qtm.api.model.RemoteApiStatus;
 import io.fluentqa.qtm.api.repo.RemoteServiceRepo;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
-import io.fluentqa.qtm.pm.product.service.ProductModuleService;
+import io.fluentqa.base.product.model.ProductModuleModel;
+import io.fluentqa.base.product.service.ProductModuleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/pm/product/package-info.java b/qaserver/src/main/java/io/fluentqa/qtm/pm/product/package-info.java
diff --git a/qaserver/src/main/java/io/fluentqa/qtm/pm/requirement/TestRequirement.java b/qaserver/src/main/java/io/fluentqa/qtm/pm/requirement/TestRequirement.java
@@ -3,7 +3,7 @@
 
 import io.fluentqa.base.handlers.SqlTagFetchHandler;
 import io.fluentqa.base.model.ModelWithValidFlag;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;
 import xyz.erupt.annotation.fun.ChoiceFetchHandler;

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/tc/model/TestCase.java b/qaserver/src/main/java/io/fluentqa/qtm/tc/model/TestCase.java
@@ -2,7 +2,7 @@
 
 import io.fluentqa.base.handlers.SqlTagFetchHandler;
 import io.fluentqa.base.model.ModelWithValidFlagVo;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;
 import xyz.erupt.annotation.sub_erupt.Layout;

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/tc/model/TestRun.java b/qaserver/src/main/java/io/fluentqa/qtm/tc/model/TestRun.java
@@ -1,7 +1,7 @@
 package io.fluentqa.qtm.tc.model;
 
 
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import io.fluentqa.qtm.tc.handlers.GenerateTestRecordHandler;
 import xyz.erupt.annotation.Erupt;
 import xyz.erupt.annotation.EruptField;

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/tc/service/TestCaseService.java b/qaserver/src/main/java/io/fluentqa/qtm/tc/service/TestCaseService.java
@@ -1,6 +1,6 @@
 package io.fluentqa.qtm.tc.service;
 
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import io.fluentqa.qtm.tc.dto.TestCaseDTO;
 import org.springframework.stereotype.Service;
 

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/tc/service/impl/MindMappingService.java b/qaserver/src/main/java/io/fluentqa/qtm/tc/service/impl/MindMappingService.java
@@ -4,7 +4,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import io.fluentqa.mindmap.api.MindMapAccessor;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
+import io.fluentqa.base.product.model.ProductModuleModel;
 import io.fluentqa.qtm.tc.dto.TestCaseDTO;
 import io.fluentqa.qtm.tc.service.TestCaseService;
 import org.springframework.stereotype.Service;

diff --git a/qaserver/src/main/java/io/fluentqa/qtm/tc/service/impl/TestCaseServiceImpl.java b/qaserver/src/main/java/io/fluentqa/qtm/tc/service/impl/TestCaseServiceImpl.java
@@ -5,16 +5,14 @@
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.StrUtil;
 import io.fluentqa.base.proxies.AuditDataEnhancerProxy;
-import io.fluentqa.qtm.pm.product.model.ProductModuleModel;
-import io.fluentqa.qtm.pm.product.service.ProductModuleService;
+import io.fluentqa.base.product.model.ProductModuleModel;
+import io.fluentqa.base.product.service.ProductModuleService;
 import io.fluentqa.qtm.tc.dto.TestCaseDTO;
 import io.fluentqa.qtm.tc.model.TestCase;
 import io.fluentqa.qtm.tc.repo.TestCaseRepo;
 import io.fluentqa.qtm.tc.service.TestCaseService;
-import org.apache.commons.math3.stat.descriptive.summary.Product;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import xyz.erupt.upms.service.EruptUserService;
 
 import javax.annotation.Resource;
 import javax.transaction.Transactional;

diff --git a/qaserver/src/main/java/io/fluentqa/upload/package-info.java b/qaserver/src/main/java/io/fluentqa/upload/package-info.java
diff --git a/to-do.yaml b/to-do.yaml
@@ -1,6 +1,6 @@
 data:
   - https://gitee.com/opengoofy/crane4j
-
+  - https://github.com/datageartech/datagear.git
 
 low-code:
   - https://github.com/pingapi/crabc-api