From 6d5a5465b85f6bff76fbe74a6a9401a76e12573e Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Tue, 17 Sep 2019 14:29:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E5=B8=B8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jd/blockchain/ump/UmpBooter.java | 1 + .../jd/blockchain/ump/model/UmpConstant.java | 20 +++++++++++++++++-- .../blockchain/ump/web/RetrievalConfig.java | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java b/source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java index a492386b..2db451fb 100644 --- a/source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java +++ b/source/manager/ump-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java @@ -18,6 +18,7 @@ public class UmpBooter { private static final String ARG_HOST = "-h"; private static final String CONFIG = "BOOT-INF" + File.separator + "classes" + File.separator + "config.properties"; + private static final String CONFIG_APPLICATION = "BOOT-INF" + File.separator + "classes" + File.separator + "application.properties"; private static final String CONFIG_PROP_HOST = "server.host"; diff --git a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java b/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java index f6903306..51316a47 100644 --- a/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java +++ b/source/manager/ump-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java @@ -32,6 +32,10 @@ public class UmpConstant { public static final String PARTINODE_PUBKEY_FORMAT = PARTINODE_FORMAT + ".pubkey"; + public static final String PARTINODE_ROLES_FORMAT = PARTINODE_FORMAT + ".roles"; + + public static final String PARTINODE_ROLES_POLICY_FORMAT = PARTINODE_FORMAT + ".roles-policy"; + public static final String PARTINODE_INIT_FORMAT = PARTINODE_FORMAT + ".initializer"; public static final String PARTINODE_INIT_HOST_FORMAT = PARTINODE_INIT_FORMAT + ".host"; @@ -48,14 +52,26 @@ public class UmpConstant { public static final String CREATE_TIME_PREFIX = "created-time"; + public static final String SECURITY_PREFIX = "security"; + + public static final String SECURITY_ROLES = SECURITY_PREFIX + ".roles"; + + public static final String SECURITY_ROLES_PRIVILEGES_LEDGER_FORMAT = SECURITY_ROLES + ".%s.ledger-privileges"; + + public static final String SECURITY_ROLES_PRIVILEGES_TX_FORMAT = SECURITY_ROLES + ".%s.tx-privileges"; + + public static final String CRYPTO_PREFIX = "crypto"; + + public static final String CRYPTO_HASH_VERIFY = CRYPTO_PREFIX + ".verify-hash"; + + public static final String CRYPTO_HASH_ALGORITHM = CRYPTO_PREFIX + ".hash-algorithm"; + public static final String CONSENSUS_PREFIX = "consensus"; public static final String CONSENSUS_PROVIDER_PREFIX = CONSENSUS_PREFIX + ".service-provider"; public static final String CONSENSUS_CONF_PREFIX = CONSENSUS_PREFIX + ".conf"; - public static final String CRYPTO_PREFIX = "crypto"; - public static final String CRYPTO_PROVIDERS_PREFIX = CRYPTO_PREFIX + ".service-providers"; public static final String LOCAL_PREFIX = "local"; diff --git a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java b/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java index 36897c17..8c254f02 100644 --- a/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java +++ b/source/manager/ump-web/src/main/java/com/jd/blockchain/ump/web/RetrievalConfig.java @@ -12,7 +12,7 @@ import java.util.Properties; import static com.jd.blockchain.ump.model.UmpConstant.SCHEMA_RETRIEVAL_URL; import static com.jd.blockchain.ump.model.UmpConstant.TASK_RETRIEVAL_URL; -public class RetrievalConfig { +public class RetrievalConfig { private static Map propertiesMap = new HashMap<>();