From 55453d9dbb451edd22444b984b1d68028232a765 Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Wed, 18 Sep 2019 17:04:12 +0800 Subject: [PATCH 1/2] Delete the -l parameter from the keygen.sh --- .../deployment-peer/src/main/resources/scripts/keygen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/deployment/deployment-peer/src/main/resources/scripts/keygen.sh b/source/deployment/deployment-peer/src/main/resources/scripts/keygen.sh index 0249e85d..f0844f4c 100644 --- a/source/deployment/deployment-peer/src/main/resources/scripts/keygen.sh +++ b/source/deployment/deployment-peer/src/main/resources/scripts/keygen.sh @@ -12,5 +12,5 @@ else else echo "keys file will be saved $HOME/config/keys" fi - java -jar $HOME/libs/$boot_file -o $HOME/config/keys -l $HOME/config/init/local.conf $* + java -jar $HOME/libs/$boot_file -o $HOME/config/keys $* fi \ No newline at end of file From f0d4ef694ac7483ab76851e4cbf7b45c45066277 Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Wed, 18 Sep 2019 17:18:59 +0800 Subject: [PATCH 2/2] Adding Partial Serialization Interface --- .../jd/blockchain/peer/web/ManagementController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 ced6284c..b21ba8da 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,12 +113,18 @@ public class ManagementController implements LedgerBindingConfigAware, PeerManag DataContractRegistry.register(LedgerAdminInfo.class); DataContractRegistry.register(LedgerSettings.class); + + // 注册角色/权限相关接口 + DataContractRegistry.register(RolesConfigureOperation.class); + DataContractRegistry.register(RolesConfigureOperation.RolePrivilegeEntry.class); + DataContractRegistry.register(UserAuthorizeOperation.class); + DataContractRegistry.register(UserAuthorizeOperation.UserRolesEntry.class); + DataContractRegistry.register(PrivilegeSet.class); DataContractRegistry.register(RoleSet.class); DataContractRegistry.register(SecurityInitSettings.class); DataContractRegistry.register(RoleInitSettings.class); DataContractRegistry.register(UserAuthInitSettings.class); - DataContractRegistry.register(PrivilegeSet.class); - + DataContractRegistry.register(LedgerMetadata_V2.class); } /**