From ff5a69d3eda6c9c12be123c46825914e5a82c622 Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Wed, 18 Sep 2019 17:00:43 +0800 Subject: [PATCH] Rename Module UMP to Manager --- source/manager/{ump-booter => manager-booter}/pom.xml | 10 +++++----- .../src/main/java/com/jd/blockchain/ump/UmpBooter.java | 0 .../java/com/jd/blockchain/ump/UmpConfiguration.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/assembly.xml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/config.properties | 0 .../src/main/resources/log4j2-jump.xml | 0 .../src/main/resources/scripts/jump-start.sh | 0 .../src/main/resources/scripts/jump-stop.sh | 0 source/manager/{ump-model => manager-model}/pom.xml | 4 ++-- .../java/com/jd/blockchain/ump/dao/DBConnection.java | 0 .../jd/blockchain/ump/dao/DBConnectionProvider.java | 0 .../com/jd/blockchain/ump/dao/MemoryDBConnection.java | 0 .../com/jd/blockchain/ump/dao/RocksDBConnection.java | 0 .../main/java/com/jd/blockchain/ump/dao/UmpDao.java | 0 .../java/com/jd/blockchain/ump/dao/UmpDaoHandler.java | 0 .../java/com/jd/blockchain/ump/model/ApiResult.java | 0 .../java/com/jd/blockchain/ump/model/ErrorCode.java | 0 .../java/com/jd/blockchain/ump/model/MasterAddr.java | 0 .../java/com/jd/blockchain/ump/model/PartiNode.java | 0 .../com/jd/blockchain/ump/model/PeerSharedConfigs.java | 0 .../java/com/jd/blockchain/ump/model/UmpConstant.java | 0 .../java/com/jd/blockchain/ump/model/UmpQueue.java | 0 .../blockchain/ump/model/config/ConsensusConfig.java | 0 .../jd/blockchain/ump/model/config/LedgerConfig.java | 0 .../ump/model/config/LedgerIdentification.java | 0 .../blockchain/ump/model/config/LedgerInitConfig.java | 0 .../jd/blockchain/ump/model/config/MasterConfig.java | 0 .../blockchain/ump/model/config/PeerLocalConfig.java | 0 .../blockchain/ump/model/config/PeerSharedConfig.java | 0 .../ump/model/config/PeerSharedConfigVv.java | 0 .../ump/model/penetrate/DataAccountSchema.java | 0 .../jd/blockchain/ump/model/penetrate/FieldSchema.java | 0 .../blockchain/ump/model/penetrate/LeaderDomain.java | 0 .../jd/blockchain/ump/model/penetrate/PeerDomain.java | 0 .../blockchain/ump/model/penetrate/SchemaDomain.java | 0 .../blockchain/ump/model/penetrate/store/MemQueue.java | 0 .../blockchain/ump/model/penetrate/store/MemStore.java | 0 .../jd/blockchain/ump/model/state/InstallProcess.java | 0 .../jd/blockchain/ump/model/state/InstallSchedule.java | 0 .../blockchain/ump/model/state/LedgerBindingConf.java | 0 .../jd/blockchain/ump/model/state/LedgerInited.java | 0 .../ump/model/state/LedgerMasterInstall.java | 0 .../blockchain/ump/model/state/LedgerPeerInited.java | 0 .../blockchain/ump/model/state/LedgerPeerInstall.java | 0 .../ump/model/state/PeerInstallSchedule.java | 0 .../ump/model/state/PeerInstallSchedules.java | 0 .../ump/model/state/PeerStartupSchedules.java | 0 .../jd/blockchain/ump/model/state/ScheduleState.java | 0 .../jd/blockchain/ump/model/state/StartupState.java | 0 .../jd/blockchain/ump/model/user/UserKeyBuilder.java | 0 .../com/jd/blockchain/ump/model/user/UserKeys.java | 0 .../com/jd/blockchain/ump/model/user/UserKeysVv.java | 0 .../com/jd/blockchain/ump/model/web/ErrorCode.java | 0 .../com/jd/blockchain/ump/model/web/WebResponse.java | 0 .../manager/{ump-service => manager-service}/pom.xml | 6 +++--- .../blockchain/ump/service/DataAccountUmpService.java | 0 .../ump/service/DataAccountUmpServiceImpl.java | 0 .../blockchain/ump/service/DataRetrievalService.java | 0 .../ump/service/DataRetrievalServiceHandler.java | 0 .../com/jd/blockchain/ump/service/LedgerService.java | 0 .../blockchain/ump/service/LedgerServiceHandler.java | 0 .../com/jd/blockchain/ump/service/SecurityService.java | 0 .../blockchain/ump/service/SecurityServiceHandler.java | 0 .../java/com/jd/blockchain/ump/service/UmpService.java | 0 .../jd/blockchain/ump/service/UmpServiceHandler.java | 0 .../jd/blockchain/ump/service/UmpSimulateService.java | 0 .../ump/service/UmpSimulateServiceHandler.java | 0 .../com/jd/blockchain/ump/service/UmpStateService.java | 0 .../blockchain/ump/service/UmpStateServiceHandler.java | 0 .../com/jd/blockchain/ump/service/UmpStoreService.java | 0 .../jd/blockchain/ump/service/UmpStoreServiceImpl.java | 0 .../com/jd/blockchain/ump/service/UtilService.java | 0 .../jd/blockchain/ump/service/UtilServiceHandler.java | 0 .../ump/service/consensus/ConsensusProvider.java | 0 .../ump/service/consensus/ConsensusService.java | 0 .../ump/service/consensus/ConsensusServiceHandler.java | 0 .../consensus/providers/BftsmartConsensusProvider.java | 0 .../service/consensus/providers/BftsmartConstant.java | 0 .../consensus/providers/MsgQueueConsensusProvider.java | 0 .../java/com/jd/blockchain/ump/util/Base58Utils.java | 0 .../java/com/jd/blockchain/ump/util/CommandUtils.java | 0 .../com/jd/blockchain/ump/util/HttpClientPool.java | 0 .../jd/blockchain/ump/util/HttpJsonClientUtils.java | 0 .../src/main/resources/bftsmart.config | 0 .../src/main/resources/mq.config | 0 .../src/main/resources/security.config | 0 source/manager/{ump-web => manager-web}/pom.xml | 8 ++++---- .../blockchain/ump/controller/RetrievalController.java | 0 .../ump/controller/TaskRetrievalController.java | 0 .../jd/blockchain/ump/controller/UmpDBController.java | 0 .../jd/blockchain/ump/controller/UmpKeyController.java | 0 .../blockchain/ump/controller/UmpMasterController.java | 0 .../blockchain/ump/controller/UmpPeerController.java | 0 .../ump/controller/UmpPeerSimulateController.java | 0 .../jd/blockchain/ump/web/ControllerConfigurer.java | 0 .../jd/blockchain/ump/web/ExceptionResponseAdvice.java | 0 .../com/jd/blockchain/ump/web/JsonResponseAdvice.java | 0 .../com/jd/blockchain/ump/web/LogPrintInterceptor.java | 0 .../com/jd/blockchain/ump/web/RetrievalConfig.java | 0 .../jd/blockchain/ump/web/RetrievalConfigListener.java | 0 source/manager/pom.xml | 8 ++++---- 103 files changed, 18 insertions(+), 18 deletions(-) rename source/manager/{ump-booter => manager-booter}/pom.xml (94%) rename source/manager/{ump-booter => manager-booter}/src/main/java/com/jd/blockchain/ump/UmpBooter.java (100%) rename source/manager/{ump-booter => manager-booter}/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java (100%) rename source/manager/{ump-booter => manager-booter}/src/main/resources/application.properties (100%) rename source/manager/{ump-booter => manager-booter}/src/main/resources/assembly.xml (100%) rename source/manager/{ump-booter => manager-booter}/src/main/resources/banner.txt (100%) rename source/manager/{ump-booter => manager-booter}/src/main/resources/config.properties (100%) rename source/manager/{ump-booter => manager-booter}/src/main/resources/log4j2-jump.xml (100%) rename source/manager/{ump-booter => manager-booter}/src/main/resources/scripts/jump-start.sh (100%) rename source/manager/{ump-booter => manager-booter}/src/main/resources/scripts/jump-stop.sh (100%) rename source/manager/{ump-model => manager-model}/pom.xml (97%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/dao/DBConnection.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/dao/DBConnectionProvider.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/dao/MemoryDBConnection.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/dao/RocksDBConnection.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/dao/UmpDao.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/dao/UmpDaoHandler.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/ApiResult.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/ErrorCode.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/MasterAddr.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/PartiNode.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/PeerSharedConfigs.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/UmpQueue.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/ConsensusConfig.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/LedgerConfig.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/LedgerIdentification.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/LedgerInitConfig.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/MasterConfig.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/PeerLocalConfig.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfig.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfigVv.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/penetrate/DataAccountSchema.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/penetrate/FieldSchema.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/penetrate/LeaderDomain.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/penetrate/PeerDomain.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/penetrate/SchemaDomain.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemQueue.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemStore.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/InstallProcess.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/InstallSchedule.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/LedgerBindingConf.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/LedgerInited.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/LedgerMasterInstall.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInited.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInstall.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedule.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedules.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/PeerStartupSchedules.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/ScheduleState.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/state/StartupState.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/user/UserKeyBuilder.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/user/UserKeys.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/user/UserKeysVv.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/web/ErrorCode.java (100%) rename source/manager/{ump-model => manager-model}/src/main/java/com/jd/blockchain/ump/model/web/WebResponse.java (100%) rename source/manager/{ump-service => manager-service}/pom.xml (96%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpServiceImpl.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/DataRetrievalService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/DataRetrievalServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/LedgerService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/SecurityService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/SecurityServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpSimulateService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpSimulateServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpStoreService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UmpStoreServiceImpl.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UtilService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusProvider.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusService.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusServiceHandler.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConsensusProvider.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConstant.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/service/consensus/providers/MsgQueueConsensusProvider.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/util/Base58Utils.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/util/CommandUtils.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/util/HttpClientPool.java (100%) rename source/manager/{ump-service => manager-service}/src/main/java/com/jd/blockchain/ump/util/HttpJsonClientUtils.java (100%) rename source/manager/{ump-service => manager-service}/src/main/resources/bftsmart.config (100%) rename source/manager/{ump-service => manager-service}/src/main/resources/mq.config (100%) rename source/manager/{ump-service => manager-service}/src/main/resources/security.config (100%) rename source/manager/{ump-web => manager-web}/pom.xml (93%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/controller/RetrievalController.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/controller/TaskRetrievalController.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/controller/UmpDBController.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/controller/UmpPeerController.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/controller/UmpPeerSimulateController.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/web/ControllerConfigurer.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/web/ExceptionResponseAdvice.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/web/JsonResponseAdvice.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/web/LogPrintInterceptor.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java (100%) rename source/manager/{ump-web => manager-web}/src/main/java/com/jd/blockchain/ump/web/RetrievalConfigListener.java (100%) diff --git a/source/manager/ump-booter/pom.xml b/source/manager/manager-booter/pom.xml similarity index 94% rename from source/manager/ump-booter/pom.xml rename to source/manager/manager-booter/pom.xml index 392cb3b9..263dac1d 100644 --- a/source/manager/ump-booter/pom.xml +++ b/source/manager/manager-booter/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - ump-booter + manager-booter - ump-booter + manager-booter UTF-8 @@ -34,19 +34,19 @@ com.jd.blockchain - ump-web + manager-web ${project.version} com.jd.blockchain - ump-service + manager-service ${project.version} com.jd.blockchain - ump-model + manager-model ${project.version} diff --git a/source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java b/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java similarity index 100% rename from source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java rename to source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java diff --git a/source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java b/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java similarity index 100% rename from source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java rename to source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpConfiguration.java diff --git a/source/manager/ump-booter/src/main/resources/application.properties b/source/manager/manager-booter/src/main/resources/application.properties similarity index 100% rename from source/manager/ump-booter/src/main/resources/application.properties rename to source/manager/manager-booter/src/main/resources/application.properties diff --git a/source/manager/ump-booter/src/main/resources/assembly.xml b/source/manager/manager-booter/src/main/resources/assembly.xml similarity index 100% rename from source/manager/ump-booter/src/main/resources/assembly.xml rename to source/manager/manager-booter/src/main/resources/assembly.xml diff --git a/source/manager/ump-booter/src/main/resources/banner.txt b/source/manager/manager-booter/src/main/resources/banner.txt similarity index 100% rename from source/manager/ump-booter/src/main/resources/banner.txt rename to source/manager/manager-booter/src/main/resources/banner.txt diff --git a/source/manager/ump-booter/src/main/resources/config.properties b/source/manager/manager-booter/src/main/resources/config.properties similarity index 100% rename from source/manager/ump-booter/src/main/resources/config.properties rename to source/manager/manager-booter/src/main/resources/config.properties diff --git a/source/manager/ump-booter/src/main/resources/log4j2-jump.xml b/source/manager/manager-booter/src/main/resources/log4j2-jump.xml similarity index 100% rename from source/manager/ump-booter/src/main/resources/log4j2-jump.xml rename to source/manager/manager-booter/src/main/resources/log4j2-jump.xml diff --git a/source/manager/ump-booter/src/main/resources/scripts/jump-start.sh b/source/manager/manager-booter/src/main/resources/scripts/jump-start.sh similarity index 100% rename from source/manager/ump-booter/src/main/resources/scripts/jump-start.sh rename to source/manager/manager-booter/src/main/resources/scripts/jump-start.sh diff --git a/source/manager/ump-booter/src/main/resources/scripts/jump-stop.sh b/source/manager/manager-booter/src/main/resources/scripts/jump-stop.sh similarity index 100% rename from source/manager/ump-booter/src/main/resources/scripts/jump-stop.sh rename to source/manager/manager-booter/src/main/resources/scripts/jump-stop.sh diff --git a/source/manager/ump-model/pom.xml b/source/manager/manager-model/pom.xml similarity index 97% rename from source/manager/ump-model/pom.xml rename to source/manager/manager-model/pom.xml index 67436cc0..fc1890ec 100644 --- a/source/manager/ump-model/pom.xml +++ b/source/manager/manager-model/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - ump-model + manager-model - ump-model + manager-model UTF-8 diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/DBConnection.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/DBConnection.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/DBConnection.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/DBConnection.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/DBConnectionProvider.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/DBConnectionProvider.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/DBConnectionProvider.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/DBConnectionProvider.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/MemoryDBConnection.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/MemoryDBConnection.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/MemoryDBConnection.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/MemoryDBConnection.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/RocksDBConnection.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/RocksDBConnection.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/RocksDBConnection.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/RocksDBConnection.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/UmpDao.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/UmpDao.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/UmpDao.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/UmpDao.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/UmpDaoHandler.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/UmpDaoHandler.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/dao/UmpDaoHandler.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/dao/UmpDaoHandler.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/ApiResult.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/ApiResult.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/ApiResult.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/ApiResult.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/ErrorCode.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/ErrorCode.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/ErrorCode.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/ErrorCode.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/MasterAddr.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/MasterAddr.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/MasterAddr.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/MasterAddr.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/PartiNode.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/PartiNode.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/PartiNode.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/PartiNode.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/PeerSharedConfigs.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/PeerSharedConfigs.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/PeerSharedConfigs.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/PeerSharedConfigs.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpQueue.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpQueue.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpQueue.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpQueue.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/ConsensusConfig.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/ConsensusConfig.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/ConsensusConfig.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/ConsensusConfig.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerConfig.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerConfig.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerConfig.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerConfig.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerIdentification.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerIdentification.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerIdentification.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerIdentification.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerInitConfig.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerInitConfig.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerInitConfig.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/LedgerInitConfig.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/MasterConfig.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/MasterConfig.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/MasterConfig.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/MasterConfig.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/PeerLocalConfig.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/PeerLocalConfig.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/PeerLocalConfig.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/PeerLocalConfig.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfig.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfig.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfig.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfig.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfigVv.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfigVv.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfigVv.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/PeerSharedConfigVv.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/DataAccountSchema.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/DataAccountSchema.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/DataAccountSchema.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/DataAccountSchema.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/FieldSchema.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/FieldSchema.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/FieldSchema.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/FieldSchema.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/LeaderDomain.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/LeaderDomain.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/LeaderDomain.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/LeaderDomain.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/PeerDomain.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/PeerDomain.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/PeerDomain.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/PeerDomain.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/SchemaDomain.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/SchemaDomain.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/SchemaDomain.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/SchemaDomain.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemQueue.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemQueue.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemQueue.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemQueue.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemStore.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemStore.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemStore.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/penetrate/store/MemStore.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/InstallProcess.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/InstallProcess.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/InstallProcess.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/InstallProcess.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/InstallSchedule.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/InstallSchedule.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/InstallSchedule.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/InstallSchedule.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerBindingConf.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerBindingConf.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerBindingConf.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerBindingConf.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerInited.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerInited.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerInited.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerInited.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerMasterInstall.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerMasterInstall.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerMasterInstall.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerMasterInstall.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInited.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInited.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInited.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInited.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInstall.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInstall.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInstall.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/LedgerPeerInstall.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedule.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedule.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedule.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedule.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedules.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedules.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedules.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/PeerInstallSchedules.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/PeerStartupSchedules.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/PeerStartupSchedules.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/PeerStartupSchedules.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/PeerStartupSchedules.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/ScheduleState.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/ScheduleState.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/ScheduleState.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/ScheduleState.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/StartupState.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/StartupState.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/state/StartupState.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/state/StartupState.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeyBuilder.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeyBuilder.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeyBuilder.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeyBuilder.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeys.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeys.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeys.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeys.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeysVv.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeysVv.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeysVv.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/user/UserKeysVv.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/web/ErrorCode.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/web/ErrorCode.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/web/ErrorCode.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/web/ErrorCode.java diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/web/WebResponse.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/web/WebResponse.java similarity index 100% rename from source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/web/WebResponse.java rename to source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/web/WebResponse.java diff --git a/source/manager/ump-service/pom.xml b/source/manager/manager-service/pom.xml similarity index 96% rename from source/manager/ump-service/pom.xml rename to source/manager/manager-service/pom.xml index 7162f740..6c1d82a6 100644 --- a/source/manager/ump-service/pom.xml +++ b/source/manager/manager-service/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - ump-service + manager-service - ump-service + manager-service UTF-8 @@ -83,7 +83,7 @@ com.jd.blockchain - ump-model + manager-model ${project.version} diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpServiceImpl.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpServiceImpl.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpServiceImpl.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataAccountUmpServiceImpl.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/DataRetrievalServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/LedgerService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/LedgerService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/SecurityService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/SecurityService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/SecurityService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/SecurityService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/SecurityServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/SecurityServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/SecurityServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/SecurityServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpSimulateServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreServiceImpl.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreServiceImpl.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreServiceImpl.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UmpStoreServiceImpl.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UtilService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UtilService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/UtilServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusProvider.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusProvider.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusProvider.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusProvider.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusService.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusService.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusService.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusService.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusServiceHandler.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusServiceHandler.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusServiceHandler.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConsensusProvider.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConsensusProvider.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConsensusProvider.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConsensusProvider.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConstant.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConstant.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConstant.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConstant.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/MsgQueueConsensusProvider.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/MsgQueueConsensusProvider.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/MsgQueueConsensusProvider.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/MsgQueueConsensusProvider.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/Base58Utils.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/Base58Utils.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/Base58Utils.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/Base58Utils.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/CommandUtils.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/CommandUtils.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/CommandUtils.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/CommandUtils.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/HttpClientPool.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/HttpClientPool.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/HttpClientPool.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/HttpClientPool.java diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/HttpJsonClientUtils.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/HttpJsonClientUtils.java similarity index 100% rename from source/manager/ump-service/src/main/java/com/jd/blockchain/ump/util/HttpJsonClientUtils.java rename to source/manager/manager-service/src/main/java/com/jd/blockchain/ump/util/HttpJsonClientUtils.java diff --git a/source/manager/ump-service/src/main/resources/bftsmart.config b/source/manager/manager-service/src/main/resources/bftsmart.config similarity index 100% rename from source/manager/ump-service/src/main/resources/bftsmart.config rename to source/manager/manager-service/src/main/resources/bftsmart.config diff --git a/source/manager/ump-service/src/main/resources/mq.config b/source/manager/manager-service/src/main/resources/mq.config similarity index 100% rename from source/manager/ump-service/src/main/resources/mq.config rename to source/manager/manager-service/src/main/resources/mq.config diff --git a/source/manager/ump-service/src/main/resources/security.config b/source/manager/manager-service/src/main/resources/security.config similarity index 100% rename from source/manager/ump-service/src/main/resources/security.config rename to source/manager/manager-service/src/main/resources/security.config diff --git a/source/manager/ump-web/pom.xml b/source/manager/manager-web/pom.xml similarity index 93% rename from source/manager/ump-web/pom.xml rename to source/manager/manager-web/pom.xml index 658f3205..3e6ec912 100644 --- a/source/manager/ump-web/pom.xml +++ b/source/manager/manager-web/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - ump-web + manager-web - ump-web + manager-web UTF-8 @@ -53,13 +53,13 @@ com.jd.blockchain - ump-service + manager-service ${project.version} com.jd.blockchain - ump-model + manager-model ${project.version} diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/RetrievalController.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/RetrievalController.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/RetrievalController.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/RetrievalController.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/TaskRetrievalController.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/TaskRetrievalController.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/TaskRetrievalController.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/TaskRetrievalController.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpDBController.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpDBController.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpDBController.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpDBController.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpKeyController.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpMasterController.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerController.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerController.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerController.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerController.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerSimulateController.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerSimulateController.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerSimulateController.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/controller/UmpPeerSimulateController.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/ControllerConfigurer.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/ControllerConfigurer.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/ControllerConfigurer.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/ControllerConfigurer.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/ExceptionResponseAdvice.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/ExceptionResponseAdvice.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/ExceptionResponseAdvice.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/ExceptionResponseAdvice.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/JsonResponseAdvice.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/JsonResponseAdvice.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/JsonResponseAdvice.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/JsonResponseAdvice.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/LogPrintInterceptor.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/LogPrintInterceptor.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/LogPrintInterceptor.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/LogPrintInterceptor.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfigListener.java b/source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfigListener.java similarity index 100% rename from source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfigListener.java rename to source/manager/manager-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfigListener.java diff --git a/source/manager/pom.xml b/source/manager/pom.xml index a56f3423..f77277dd 100644 --- a/source/manager/pom.xml +++ b/source/manager/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ump-booter - ump-web - ump-service - ump-model + manager-booter + manager-web + manager-service + manager-model com.jd.blockchain