From 290af1b9b769a179b7713d7315cd8a682e7a835f Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Tue, 17 Sep 2019 16:23:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jd/blockchain/ledger/SecurityInitData.java | 6 ++++++ .../jd/blockchain/transaction/RolesConfigureOpTemplate.java | 1 + .../jd/blockchain/transaction/UserAuthorizeOpTemplate.java | 1 + .../com/jd/blockchain/peer/web/ManagementController.java | 5 +++++ 4 files changed, 13 insertions(+) diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/SecurityInitData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/SecurityInitData.java index 626adef1..90f51869 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/SecurityInitData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/SecurityInitData.java @@ -3,10 +3,16 @@ package com.jd.blockchain.ledger; import java.util.LinkedHashMap; import java.util.Map; +import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.utils.Bytes; public class SecurityInitData implements SecurityInitSettings { + static { + DataContractRegistry.register(SecurityInitSettings.class); + } + + private Map roles = new LinkedHashMap<>(); private Map userAuthentications = new LinkedHashMap<>(); diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java index ab8d19dc..ba5fc4e5 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java @@ -20,6 +20,7 @@ public class RolesConfigureOpTemplate implements RolesConfigurer, RolesConfigure static { DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(RolesConfigureOperation.class); + DataContractRegistry.register(RolePrivilegeEntry.class); } private Map rolesMap = Collections diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java index ed851763..2575fdd5 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java @@ -19,6 +19,7 @@ public class UserAuthorizeOpTemplate implements UserAuthorizer, UserAuthorizeOpe static { DataContractRegistry.register(UserRegisterOperation.class); DataContractRegistry.register(UserAuthorizeOperation.class); + DataContractRegistry.register(UserRolesEntry.class); } private Set userAuthMap = Collections diff --git a/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java b/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java index fde7b1d4..791ab862 100644 --- a/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java +++ b/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java @@ -118,6 +118,11 @@ public class ManagementController implements LedgerBindingConfigAware, PeerManag DataContractRegistry.register(RoleInitSettings.class); DataContractRegistry.register(UserAuthInitSettings.class); + DataContractRegistry.register(TransactionPermission.class); + DataContractRegistry.register(LedgerPermission.class); + DataContractRegistry.register(RolesPolicy.class); + DataContractRegistry.register(PrivilegeSet.class); + } /**