From bc0ad38a3389c7c61c631d9b60f0e50dfeef8476 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 17 Mar 2020 10:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=BB=84=E7=BB=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=A7=BB=E5=88=B0epmet-module=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=8B=EF=BC=8Cepmet-module=E7=9A=84pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=88=A0=E9=99=A4=E5=8E=9Fepmet-api=E7=9A=84=E5=BC=95?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BF=AE=E6=94=B9epmet-gateway=E4=B8=ADboots?= =?UTF-8?q?tap.yaml=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84=E8=B7=AF=E7=94=B1o?= =?UTF-8?q?rder=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BF=AE=E6=94=B9gov-org-server?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E7=AB=AF=E5=8F=A3=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?8092?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 16 ++++++++-------- .../gov-org}/gov-org-client/pom.xml | 0 .../com/epmet/dto/CustomerDepartmentDTO.java | 0 .../main/java/com/epmet/dto/CustomerGridDTO.java | 0 .../com/epmet/dto/CustomerOrganizationDTO.java | 0 .../epmet/dto/CustomerRelevantDepartmentDTO.java | 0 .../main/java/com/epmet/dto/CustomerRoleDTO.java | 0 .../epmet/dto/CustomerStaffDepartmentDTO.java | 0 .../java/com/epmet/dto/CustomerStaffGridDTO.java | 0 .../epmet/dto/CustomerStaffOrganizationDTO.java | 0 .../java/com/epmet/dto/CustomerStaffRoleDTO.java | 0 .../java/com/epmet/dto/PdmanDbVersionDTO.java | 0 .../gov-org}/gov-org-server/pom.xml | 4 ++-- .../main/java/com/epmet/GovOrgApplication.java | 0 .../java/com/epmet/config/ModuleConfigImpl.java | 0 .../java/com/epmet/config/SwaggerConfig.java | 0 .../controller/CustomerDepartmentController.java | 0 .../epmet/controller/CustomerGridController.java | 0 .../CustomerOrganizationController.java | 0 .../CustomerRelevantDepartmentController.java | 0 .../epmet/controller/CustomerRoleController.java | 0 .../CustomerStaffDepartmentController.java | 0 .../controller/CustomerStaffGridController.java | 0 .../CustomerStaffOrganizationController.java | 0 .../controller/CustomerStaffRoleController.java | 0 .../controller/PdmanDbVersionController.java | 0 .../com/epmet/dao/CustomerDepartmentDao.java | 0 .../main/java/com/epmet/dao/CustomerGridDao.java | 0 .../com/epmet/dao/CustomerOrganizationDao.java | 0 .../epmet/dao/CustomerRelevantDepartmentDao.java | 0 .../main/java/com/epmet/dao/CustomerRoleDao.java | 0 .../epmet/dao/CustomerStaffDepartmentDao.java | 0 .../java/com/epmet/dao/CustomerStaffGridDao.java | 0 .../epmet/dao/CustomerStaffOrganizationDao.java | 0 .../java/com/epmet/dao/CustomerStaffRoleDao.java | 0 .../java/com/epmet/dao/PdmanDbVersionDao.java | 0 .../epmet/entity/CustomerDepartmentEntity.java | 0 .../com/epmet/entity/CustomerGridEntity.java | 0 .../epmet/entity/CustomerOrganizationEntity.java | 0 .../entity/CustomerRelevantDepartmentEntity.java | 0 .../com/epmet/entity/CustomerRoleEntity.java | 0 .../entity/CustomerStaffDepartmentEntity.java | 0 .../epmet/entity/CustomerStaffGridEntity.java | 0 .../entity/CustomerStaffOrganizationEntity.java | 0 .../epmet/entity/CustomerStaffRoleEntity.java | 0 .../com/epmet/entity/PdmanDbVersionEntity.java | 0 .../com/epmet/excel/CustomerDepartmentExcel.java | 0 .../java/com/epmet/excel/CustomerGridExcel.java | 0 .../epmet/excel/CustomerOrganizationExcel.java | 0 .../excel/CustomerRelevantDepartmentExcel.java | 0 .../java/com/epmet/excel/CustomerRoleExcel.java | 0 .../excel/CustomerStaffDepartmentExcel.java | 0 .../com/epmet/excel/CustomerStaffGridExcel.java | 0 .../excel/CustomerStaffOrganizationExcel.java | 0 .../com/epmet/excel/CustomerStaffRoleExcel.java | 0 .../com/epmet/excel/PdmanDbVersionExcel.java | 0 .../com/epmet/redis/CustomerDepartmentRedis.java | 0 .../java/com/epmet/redis/CustomerGridRedis.java | 0 .../epmet/redis/CustomerOrganizationRedis.java | 0 .../redis/CustomerRelevantDepartmentRedis.java | 0 .../java/com/epmet/redis/CustomerRoleRedis.java | 0 .../redis/CustomerStaffDepartmentRedis.java | 0 .../com/epmet/redis/CustomerStaffGridRedis.java | 0 .../redis/CustomerStaffOrganizationRedis.java | 0 .../com/epmet/redis/CustomerStaffRoleRedis.java | 0 .../com/epmet/redis/PdmanDbVersionRedis.java | 0 .../epmet/service/CustomerDepartmentService.java | 0 .../com/epmet/service/CustomerGridService.java | 0 .../service/CustomerOrganizationService.java | 0 .../CustomerRelevantDepartmentService.java | 0 .../com/epmet/service/CustomerRoleService.java | 0 .../service/CustomerStaffDepartmentService.java | 0 .../epmet/service/CustomerStaffGridService.java | 0 .../CustomerStaffOrganizationService.java | 0 .../epmet/service/CustomerStaffRoleService.java | 0 .../com/epmet/service/PdmanDbVersionService.java | 0 .../impl/CustomerDepartmentServiceImpl.java | 0 .../service/impl/CustomerGridServiceImpl.java | 0 .../impl/CustomerOrganizationServiceImpl.java | 0 .../CustomerRelevantDepartmentServiceImpl.java | 0 .../service/impl/CustomerRoleServiceImpl.java | 0 .../impl/CustomerStaffDepartmentServiceImpl.java | 0 .../impl/CustomerStaffGridServiceImpl.java | 0 .../CustomerStaffOrganizationServiceImpl.java | 0 .../impl/CustomerStaffRoleServiceImpl.java | 0 .../service/impl/PdmanDbVersionServiceImpl.java | 0 .../src/main/resources/bootstrap.yml | 0 .../src/main/resources/logback-spring.xml | 0 .../resources/mapper/CustomerDepartmentDao.xml | 0 .../main/resources/mapper/CustomerGridDao.xml | 0 .../resources/mapper/CustomerOrganizationDao.xml | 0 .../mapper/CustomerRelevantDepartmentDao.xml | 0 .../main/resources/mapper/CustomerRoleDao.xml | 0 .../mapper/CustomerStaffDepartmentDao.xml | 0 .../resources/mapper/CustomerStaffGridDao.xml | 0 .../mapper/CustomerStaffOrganizationDao.xml | 0 .../resources/mapper/CustomerStaffRoleDao.xml | 0 .../main/resources/mapper/PdmanDbVersionDao.xml | 0 {gov-org => epmet-module/gov-org}/pom.xml | 2 +- epmet-module/pom.xml | 2 +- 100 files changed, 12 insertions(+), 12 deletions(-) rename {gov-org => epmet-module/gov-org}/gov-org-client/pom.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/pom.xml (98%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/bootstrap.yml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/logback-spring.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml (100%) rename {gov-org => epmet-module/gov-org}/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml (100%) rename {gov-org => epmet-module/gov-org}/pom.xml (93%) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 309844844d..4644b5a062 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -69,7 +69,7 @@ spring: #工作流服务 - id: epmet-activiti-server uri: @gateway.routes.epmet-activiti-server.uri@ - order: 5 + order: 6 predicates: - Path=${server.servlet.context-path}/activiti/** filters: @@ -77,7 +77,7 @@ spring: #定时任务服务 - id: epmet-job-server uri: @gateway.routes.epmet-job-server.uri@ - order: 6 + order: 7 predicates: - Path=${server.servlet.context-path}/job/** filters: @@ -85,7 +85,7 @@ spring: #用户服务 - id: epmet-user-server uri: @gateway.routes.epmet-user-server.uri@ - order: 7 + order: 8 predicates: - Path=${server.servlet.context-path}/epmetuser/** filters: @@ -93,7 +93,7 @@ spring: #demo流服务 - id: epmet-demo-server uri: @gateway.routes.epmet-demo-server.uri@ - order: 8 + order: 9 predicates: - Path=${server.servlet.context-path}/demo/** filters: @@ -101,7 +101,7 @@ spring: #运营端客户定制化服务 - id: oper-customize-server uri: @gateway.routes.oper-customize-server.uri@ - order: 9 + order: 10 predicates: - Path=${server.servlet.context-path}/oper/customize/** filters: @@ -109,7 +109,7 @@ spring: #运营端客户管理 - id: oper-crm-server uri: @gateway.routes.oper-crm-server.uri@ - order: 9 + order: 11 predicates: - Path=${server.servlet.context-path}/oper/crm/** filters: @@ -117,7 +117,7 @@ spring: #居民端陌生人导览 - id: resi-guide-server uri: @gateway.routes.resi-guide-server.uri@ - order: 10 + order: 12 predicates: - Path=${server.servlet.context-path}/resi/guide/** filters: @@ -125,7 +125,7 @@ spring: #政府端组织管理 - id: gov-org-server uri: @gateway.routes.gov-org-server.uri@ - order: 10 + order: 13 predicates: - Path=${server.servlet.context-path}/gov/org/** filters: diff --git a/gov-org/gov-org-client/pom.xml b/epmet-module/gov-org/gov-org-client/pom.xml similarity index 100% rename from gov-org/gov-org-client/pom.xml rename to epmet-module/gov-org/gov-org-client/pom.xml diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerDepartmentDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerOrganizationDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRelevantDepartmentDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerRoleDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffDepartmentDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffGridDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffOrganizationDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerStaffRoleDTO.java diff --git a/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java similarity index 100% rename from gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PdmanDbVersionDTO.java diff --git a/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml similarity index 98% rename from gov-org/gov-org-server/pom.xml rename to epmet-module/gov-org/gov-org-server/pom.xml index 4efa0331da..d750db2d37 100644 --- a/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -82,7 +82,7 @@ true - 8087 + 8092 dev @@ -112,7 +112,7 @@ true --> - 8087 + 8092 test diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/ModuleConfigImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/SwaggerConfig.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerDepartmentController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerOrganizationController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRelevantDepartmentController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerRoleController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffDepartmentController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffOrganizationController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffRoleController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PdmanDbVersionController.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerOrganizationDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRelevantDepartmentDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerRoleDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffDepartmentDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffOrganizationDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffRoleDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PdmanDbVersionDao.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerOrganizationEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRelevantDepartmentEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerRoleEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffDepartmentEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffGridEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffOrganizationEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerStaffRoleEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PdmanDbVersionEntity.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerDepartmentExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerGridExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerOrganizationExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRelevantDepartmentExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerRoleExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffDepartmentExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffGridExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffOrganizationExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffRoleExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PdmanDbVersionExcel.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerDepartmentRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerGridRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerOrganizationRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRelevantDepartmentRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerRoleRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffDepartmentRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffGridRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffOrganizationRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerStaffRoleRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/PdmanDbVersionRedis.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerOrganizationService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRelevantDepartmentService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerRoleService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffDepartmentService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffOrganizationService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffRoleService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PdmanDbVersionService.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerOrganizationServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRelevantDepartmentServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerRoleServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffDepartmentServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffOrganizationServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffRoleServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java similarity index 100% rename from gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PdmanDbVersionServiceImpl.java diff --git a/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/bootstrap.yml rename to epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml diff --git a/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/logback-spring.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerOrganizationDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRelevantDepartmentDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerRoleDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffOrganizationDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffRoleDao.xml diff --git a/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml similarity index 100% rename from gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PdmanDbVersionDao.xml diff --git a/gov-org/pom.xml b/epmet-module/gov-org/pom.xml similarity index 93% rename from gov-org/pom.xml rename to epmet-module/gov-org/pom.xml index 55049442f5..0ef2ad2df6 100644 --- a/gov-org/pom.xml +++ b/epmet-module/gov-org/pom.xml @@ -5,7 +5,7 @@ com.epmet - epmet-cloud + epmet-module 2.0.0 diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 5ab568cb98..571b2fed2c 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -18,11 +18,11 @@ epmet-job epmet-message epmet-activiti - epmet-api epmet-demo oper-customize oper-crm resi-guide + gov-org