From 5f0a7ba0941a45365deccd522a6149d448ee5bf0 Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Tue, 17 Sep 2019 15:05:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E6=9C=AA?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9A=84=E5=BA=8F=E5=88=97=E5=8C=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jd/blockchain/ledger/RoleInitData.java | 6 ++++++ .../java/com/jd/blockchain/ledger/UserAuthInitData.java | 5 +++++ .../src/main/java/com/jd/blockchain/ledger/UserRoles.java | 5 +++++ .../java/com/jd/blockchain/transaction/LedgerInitData.java | 6 ++++++ .../com/jd/blockchain/peer/web/ManagementController.java | 4 ++++ 5 files changed, 26 insertions(+) diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/RoleInitData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/RoleInitData.java index ea1822e2..090b19f8 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/RoleInitData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/RoleInitData.java @@ -1,7 +1,13 @@ package com.jd.blockchain.ledger; +import com.jd.blockchain.binaryproto.DataContractRegistry; + public class RoleInitData implements RoleInitSettings { + static { + DataContractRegistry.register(RoleInitSettings.class); + } + private String roleName; private LedgerPermission[] ledgerPermissions; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserAuthInitData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserAuthInitData.java index 6866c991..81dd5587 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserAuthInitData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserAuthInitData.java @@ -1,9 +1,14 @@ package com.jd.blockchain.ledger; +import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.utils.Bytes; public class UserAuthInitData implements UserAuthInitSettings { + static { + DataContractRegistry.register(UserAuthInitSettings.class); + } + private Bytes userAddress; private String[] roles; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserRoles.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserRoles.java index 2cae56d1..19f86ed8 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserRoles.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserRoles.java @@ -5,10 +5,15 @@ import java.util.Collections; import java.util.Set; import java.util.TreeSet; +import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.utils.Bytes; public class UserRoles implements RoleSet { + static { + DataContractRegistry.register(RoleSet.class); + } + private Bytes userAddress; private RolesPolicy policy; diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitData.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitData.java index 6de96680..656b4aa3 100644 --- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitData.java +++ b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitData.java @@ -1,12 +1,18 @@ package com.jd.blockchain.transaction; +import com.jd.blockchain.binaryproto.DataContractRegistry; import com.jd.blockchain.ledger.CryptoSetting; import com.jd.blockchain.ledger.LedgerInitSetting; import com.jd.blockchain.ledger.ParticipantNode; +import com.jd.blockchain.ledger.UserAuthInitSettings; import com.jd.blockchain.utils.Bytes; public class LedgerInitData implements LedgerInitSetting { + static { + DataContractRegistry.register(LedgerInitSetting.class); + } + private byte[] ledgerSeed; private ParticipantNode[] consensusParticipants; 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 9e771a33..fde7b1d4 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 @@ -113,6 +113,10 @@ public class ManagementController implements LedgerBindingConfigAware, PeerManag DataContractRegistry.register(LedgerAdminInfo.class); DataContractRegistry.register(LedgerSettings.class); + DataContractRegistry.register(RoleSet.class); + DataContractRegistry.register(SecurityInitSettings.class); + DataContractRegistry.register(RoleInitSettings.class); + DataContractRegistry.register(UserAuthInitSettings.class); }