Merge commit 'f0d4ef694ac7483ab76851e4cbf7b45c45066277' into develop

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

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);
 	}
 
 	/**