df94696564
Merge branch 'release/1.2.0'
# Conflicts:
# deploy/deploy-gateway/pom.xml
# deploy/deploy-peer/pom.xml
# deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
# samples/contract-samples/pom.xml
# samples/sdk-samples/pom.xml
# source/base/pom.xml
# source/binary-proto/pom.xml
# source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryProtocol.java
# source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/PrimitiveType.java
# source/consensus/consensus-bftsmart/pom.xml
# source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/client/BftsmartMessageService.java
# source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java
# source/consensus/consensus-framework/pom.xml
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/ActionMessage.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/ConsensusSecurityException.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/ConsensusService.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/OrderedAction.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/UnorderedAction.java
# source/consensus/consensus-framework/src/main/java/com/jd/blockchain/consensus/action/ActionResponseData.java
# source/consensus/consensus-mq/pom.xml
# source/consensus/pom.xml
# source/contract/contract-framework/pom.xml
# source/contract/contract-jvm/pom.xml
# source/contract/contract-maven-plugin/pom.xml
# source/contract/pom.xml
# source/crypto/crypto-adv/pom.xml
# source/crypto/crypto-classic/pom.xml
# source/crypto/crypto-framework/pom.xml
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/AddressEncoding.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/AddressVersion.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoKey.java
# source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/PrivKey.java
# source/crypto/crypto-pki/pom.xml
# source/crypto/crypto-sm/pom.xml
# source/crypto/pom.xml
# source/deployment/pom.xml
# source/gateway/pom.xml
# source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayConfiguration.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/GatewayServerBooter.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayWebSecurityConfigurer.java
# source/gateway/src/main/java/com/jd/blockchain/gateway/web/TxProcessingController.java
# source/gateway/src/main/resources/gateway.conf
# source/gateway/src/test/java/test/com/jd/blockchain/gateway/data/HashDigestDeserializer.java
# source/gateway/src/test/java/test/com/jd/blockchain/gateway/data/HashDigestSerializer.java
# source/ledger/ledger-core/pom.xml
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ContractAccountSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DataAccountSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminDataset.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerQueryService.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleAccountSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/MerkleDataSet.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/Node.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/Peer.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/TransactionBatchProcessor.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/UserAccountSet.java
# source/ledger/ledger-model/pom.xml
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/Contract.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/ContractEvent.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/contract/EventHandle.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockRollbackException.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainEventType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainIdentityData.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeyGenerator.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/BlockchainKeypair.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/CodeDeployOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/ContractCodeDeployOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataAccountKVSetOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataAccountRegisterOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DataVersionConflictException.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/DigitalSignature.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/EndpointRequest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/HashAlgorithm.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/HashObject.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/Ledger.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/MagicNumber.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/NodeRequest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/OperationArgument.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/PermissionType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/RolesConfigureOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/SignatureInfo.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/StateOpType.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/Transaction.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionRequestBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionResponse.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionRollbackException.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/TransactionTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserAuthorizeOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserInfoSetOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/UserRegisterOperation.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/setting/GatewayIncomingSetting.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainOperationFactory.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/BlockchainQueryService.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractCodeDeployOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractEventSendOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ContractInvocationProxyBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountRegisterOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DigitalSignatureBlob.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/LedgerInitOperationBuilderImpl.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/NewLedgerOpBlob.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PreparedTx.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PrivilegeSettingOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/PubKeyData.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/SecurityOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/SignatureEncoding.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TransactionService.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxRequestMessage.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxResponseMessage.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/TxTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOpTemplate.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilder.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserRegisterOperationBuilderImpl.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/BytesEncodingTest.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/OpBlobTest.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/SizeHeaderMaskTest.java
# source/ledger/ledger-model/src/test/java/test/com/jd/blockchain/ledger/TxContentBlobTest.java
# source/ledger/ledger-rpc/pom.xml
# source/ledger/pom.xml
# source/manager/manager-booter/pom.xml
# source/manager/manager-model/pom.xml
# source/manager/manager-service/pom.xml
# source/manager/manager-web/pom.xml
# source/manager/pom.xml
# source/peer/config/hosts.config
# source/peer/config/system.config
# source/peer/pom.xml
# source/peer/src/main/java/com/jd/blockchain/peer/PeerConfiguration.java
# source/peer/src/main/java/com/jd/blockchain/peer/consensus/BlockchainConsensusServiceImpl.java
# source/peer/src/main/java/com/jd/blockchain/peer/consensus/ConsensusViewDefinition.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/LedgerQueryController.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/PeerWebSecurityConfiguration.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/PeerWebServerConfigurer.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/service/ConsensusViewDefinitionTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/service/LedgerInitCordinatorTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/ControllerTestConfiguration.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/LedgerInitializingControllerTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/LedgerInitializingTest.java
# source/peer/src/test/java/test/com/jd/blockchain/peer/web/PeerKeyStorageServiceImpl.java
# source/pom.xml
# source/runtime/pom.xml
# source/runtime/runtime-context/pom.xml
# source/runtime/runtime-modular-booter/pom.xml
# source/runtime/runtime-modular/pom.xml
# source/sdk/pom.xml
# source/sdk/sdk-base/pom.xml
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/AbstractBlockchainServiceFactory.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventHandle.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventListener.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventMessage.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainEventService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/BlockchainTransactionService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/ManagementHttpService.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/PrivilegeSetting.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/TxCommiter.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/BlockchainServiceProxy.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/CodeDeployOperationBuilder.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/CodeInvokeOperationBuilder.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/proxy/HttpQueryServiceAdapter.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/NodeSigningAppender.java
# source/sdk/sdk-base/src/test/java/test/com/jd/blockchain/sdk/proxy/TxMessageTest.java
# source/sdk/sdk-client/pom.xml
# source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayIncomingInfo.java
# source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/GatewayServiceFactory.java
# source/sdk/sdk-client/src/main/java/com/jd/blockchain/sdk/client/HttpConsensusService.java
# source/storage/pom.xml
# source/storage/storage-composite/pom.xml
# source/storage/storage-redis/pom.xml
# source/storage/storage-redis/src/main/java/com/jd/blockchain/storage/service/impl/redis/JedisProperties.java
# source/storage/storage-redis/src/main/java/com/jd/blockchain/storage/service/impl/redis/RedisStorageService.java
# source/storage/storage-redis/src/main/resources/META-INF/spring.factories
# source/storage/storage-rocksdb/pom.xml
# source/storage/storage-rocksdb/src/main/java/com/jd/blockchain/storage/service/impl/rocksdb/RocksDBStorageService.java
# source/storage/storage-service/pom.xml
# source/storage/storage-service/src/main/java/com/jd/blockchain/storage/service/VersioningKVStorage.java
# source/test/pom.xml
# source/test/test-consensus-client/pom.xml
# source/test/test-consensus-client/src/main/java/test/perf/com/jd/blockchain/consensus/client/Settings.java
# source/test/test-consensus-client/src/main/java/test/perf/com/jd/blockchain/consensus/client/WebConfiguration.java
# source/test/test-consensus-client/src/main/resources/application.properties
# source/test/test-consensus-node/config/bft-system.config
# source/test/test-consensus-node/pom.xml
# source/test/test-consensus-node/src/main/java/test/perf/com/jd/blockchain/consensus/node/Settings.java
# source/test/test-consensus-node/src/main/java/test/perf/com/jd/blockchain/consensus/node/WebConfiguration.java
# source/test/test-consensus-node/src/main/resources/application.properties
# source/test/test-integration/pom.xml
# source/test/test-ledger/pom.xml
# source/tools/pom.xml
# source/tools/tools-capability/pom.xml
# source/tools/tools-initializer-booter/pom.xml
# source/tools/tools-initializer/pom.xml
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/DecisionRequestBodyConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/DecisionResponseConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/InitServiceExceptionHandler.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/InitWebSecurityConfiguration.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/InitWebServerConfiguration.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/LedgerInitMessageConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/PermissionResponseConverter.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/web/SignatureDigestRequestBodyConverter.java
# source/tools/tools-initializer/src/main/resources/META-INF/spring.factories
# source/tools/tools-initializer/src/main/resources/application.properties
# source/tools/tools-keygen-booter/pom.xml
# source/tools/tools-keygen/pom.xml
# source/tools/tools-mocker/pom.xml
# source/utils/.gitignore
# source/utils/pom.xml
# source/utils/utils-common/.gitignore
# source/utils/utils-common/pom.xml
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ArrayUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/AttributeMap.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/Attributes.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/BaseConstant.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/BusinessException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/DataEntry.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/Disposable.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/EmptyProperties.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/IllegalDataException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/IteratorWrapper.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/PathUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/PrimitiveUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/PropertiesUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ReadonlyArrayListWrapper.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/ServiceFactory.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/codec/Base58Utils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/codec/DataDecodeException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/codec/HexUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/AsyncFuture.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/AsyncFutureListener.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/CompletableAsyncFuture.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/NamedThreadFactory.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/RuntimeExecutionException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/RuntimeInterruptedException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/RuntimeTimeoutException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/SyncFutureAdaptor.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/concurrent/ThreadUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/console/CommandConsole.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/console/CommondProcessor.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/decompiler/utils/DecompilerUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/DefaultExceptionHandle.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/EventMulticaster.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/ExceptionHandle.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/ExceptionLoggingHandle.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/event/RethrowExceptionHandler.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/hash/Hashing.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/hash/MurmurHash3.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/id/KeyGenerator.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/id/KeyGeneratorFactory.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/ByteArray.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesBlob.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesChunkReader.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesChunkWriter.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesEncoding.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesReader.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/BytesWriter.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/EmptyInputStream.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/ForwardReadonlyInputStream.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/NumberMask.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/RuntimeIOException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/io/UnclosableOutputStream.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/net/NetworkAddress.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/net/NetworkException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/AESUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/AuthenticationException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/DESUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/DecryptionException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/Ed25519Utils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/EncryptionException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/KeyGenerationException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/KeyStoreException.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/KeyStoreUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RSAKeyPair.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RSAUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RandomUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/RipeMD160Utils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/security/ShaUtils.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/transfer/AsyncSendable.java
# source/utils/utils-common/src/main/java/com/jd/blockchain/utils/transfer/Sendable.java
# source/utils/utils-common/src/test/java/test/my/utils/io/BytesEncodingTest.java
# source/utils/utils-common/src/test/java/test/my/utils/io/BytesUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/AESUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/RSAUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/RandomUtilsTest.java
# source/utils/utils-common/src/test/java/test/my/utils/security/ShaUtilsTest.java
# source/utils/utils-http/.gitignore
# source/utils/utils-http/pom.xml
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpAction.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpMethod.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpService.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpServiceConsts.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpServiceContext.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpServiceException.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/HttpStatusException.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/PathParam.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/PropertiesConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestBody.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestParam.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestParamFilter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/RequestParamMap.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/ResponseBodyConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/ResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/StringConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ArgDefEntry.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/AuthorizationAlgs.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/AuthorizationHeader.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/AuthorizationHeaderResovler.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/CustomHeader.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/DefaultResponseConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/HttpServiceAgent.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/HttpServiceConnection.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/IllegalHttpServiceDefinitionException.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/LocalHttpDelete.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/NullRequestParamFilter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PathParamDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PathParamResolver.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PathParamResolvers.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PojoPropertiesConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/PropertiesConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyResolver.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyResolverComposite.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestBodyResolvers.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestHeader.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamMapDefinition.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamResolver.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestParamResolvers.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestPathTemplate.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/RequestUtils.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceActionContext.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceConnection.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceConnectionManager.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceEndpoint.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/ServiceRequest.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/StringConverterFactory.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/agent/TypeAutoAdaptingRequestBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/auth/Securities.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ByteArrayBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ByteArrayResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/EmptyBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/InputStreamBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/JsonBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/JsonConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/JsonResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/NullResponseConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ObjectToStringBodyConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/ObjectToStringConverter.java
# source/utils/utils-http/src/main/java/com/jd/blockchain/utils/http/converters/StringResponseConverter.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/BaseRequestSetting.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/ContentRequestSetting.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/CustomBooleanConverter.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/DataResponse.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/GetContentException.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/GetContentResponseConverter.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/GetContentResponseConverterWithException.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpRequestCollector.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpRequestInfo.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpServiceAgentTest.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/HttpTestService.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/MultiRequestBodiesWithDefaultConverterTestService.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/OpType.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/RequestContent.java
# source/utils/utils-http/src/test/java/test/my/utils/http/agent/TestData.java
# source/utils/utils-serialize/pom.xml
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/binary/BinarySerializeUtils.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/ArrayMergeStrategy.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/GenericType.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONBean.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONBeanDeserializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONBeanSerializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONSerializeUtils.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONString.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONStringDeserializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/JSONStringSerializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/RuntimeDeserializer.java
# source/utils/utils-serialize/src/main/java/com/jd/blockchain/utils/serialize/json/ToStringSerializer.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/BinarySerializeUtilsTest.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/Car.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/Entity.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/JSONBeanTest.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/JSONSerializeUtilsTest.java
# source/utils/utils-serialize/src/test/java/test/my/utils/serialize/Level.java
# source/utils/utils-test/.gitignore
# source/utils/utils-test/pom.xml
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/JunitAssertMatcher.java
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/ServletRegister.java
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/WebBoot.java
# source/utils/utils-test/src/main/java/com/jd/blockchain/utils/test/WebTest.java
# source/utils/utils-web-server/.gitignore
# source/utils/utils-web-server/pom.xml
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/ServletSetting.java
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/WebServer.java
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/WebServerDemo.java
# source/utils/utils-web-server/src/main/java/com/jd/blockchain/utils/web/server/WebServerException.java
# source/utils/utils-web/.gitignore
# source/utils/utils-web/pom.xml
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/client/WebResponseConverter.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/client/WebResponseConverterFactory.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/client/WebServiceException.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/BinaryMessageConverter.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/ErrorCode.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/JsonWebResponseMessageConverter.java
# source/utils/utils-web/src/main/java/com/jd/blockchain/utils/web/model/WebResponse.java
6 years ago
1b8923f851
1)0.0.0.0; 2)gateway's pool; 3)bftsmart's optimization；
6 years ago
58a19e473b
all: LF;
6 years ago
e622a7b247
when most of block hash is inconsistent, less than Quorum consistent responses, will return null response
6 years ago
0255ff9a45
solve block rollback
6 years ago
43977bb96a
Refactored directories;
6 years ago
e303674394
add integrate test
6 years ago
3765e9edb7
Merge branch 'develop' into hotfix/JDCHAIN-219-DataVersionConflictException
# Conflicts:
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionBatchProcessorTest.java
6 years ago
7469f5802d
modify block rollback
6 years ago
53bb8e6f08
solve block rollback exception
6 years ago
edce1888e9
Merge branch 'release/1.1.1' into develop
6 years ago
a05f4e7895
Fixed all compilation errors;
6 years ago
ae9d4aaa7b
Refactored MerkleAccount;
6 years ago
9a381ebfe9
Refactor ledger account;
6 years ago
b22c93b893
add the calFromIndexAndCountDescend();
6 years ago
582926477d
Merge branch 'feature/ledger_Bifurcation' into develop
6 years ago
a91da3d5a1
Change Peer startup shell !
6 years ago
7843638f65
Merge branch 'develop' into feature/ledger_Bifurcation
# Conflicts:
# source/contract/contract-samples/pom.xml
# source/pom.xml
6 years ago
00e07f79ec
Refactored ledger core;
6 years ago
f0d4ef694a
Adding Partial Serialization Interface
6 years ago
87dd1b63cb
delete the register of TransactionPermission/LedgerPermission/RolesPolicy, because it's enum type.
6 years ago
290af1b9b7
增加序列化注册接口
6 years ago
5f0a7ba094
增加部分未注册的序列化接口
6 years ago
c849affc4f
修改Gateway对应配置文件路径及LedgerSettings注册
6 years ago
db2c88c50c
Merge remote-tracking branch 'origin/develop' into feature/1.0.0-contract-check2.0-local
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/handles/ContractCodeDeployOperationHandle.java
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java
6 years ago
e285cac39b
修改集成测试BUG
6 years ago
a5ee1a10d2
Merge commit '0bcc74e15f5639d31c81e08285ade3df7f76bd71' into develop
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/DefaultOperationHandleRegisteration.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitProperties.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTest4Bftsmart.java
6 years ago
d1e40a91fa
Completed authorization test case and refactored TransactionBatchProcessor;
6 years ago
467e7b513b
Merge branch 'developold' into feature/regist_participant
# Conflicts:
# source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/LedgerAdminAccount.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantCertData.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/ParticipantDataset.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/DefaultOperationHandleRegisteration.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/ContractInvokingTest.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/LedgerManagerTest.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/core/TransactionSetTest.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/ledger/LedgerInitProperties.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ClientOperator.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/ConsensusParticipantData.java
# source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/LedgerPerformanceTest.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/perf/Utils.java
# source/tools/tools-capability/src/main/java/com/jd/blockchain/capability/service/SettingsInit.java
# source/tools/tools-mocker/src/main/java/com/jd/blockchain/mocker/MockerNodeContext.java
6 years ago
ae3af3ea72
Refactored LedgerDataset: extract readonly interface LedgerDataQuery;
6 years ago
13d2218f29
modify participant state update interface bug
6 years ago
d66de9beb2
Merge branch 'develop' into feature/authorize
# Conflicts:
# source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/converters/ClientResolveUtil.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitCommand.java
# source/tools/tools-initializer/src/main/java/com/jd/blockchain/tools/initializer/LedgerInitProperties.java
6 years ago
cd63d7612b
add regist participant code for feature
6 years ago
9bc12aa570
Renamed packages of ledger-core;
6 years ago
3542ca2ec2
Refactored LedgerRepository;
6 years ago
21772b13b2
Renamed;
6 years ago
cab12e9083
Passed verification of the testcases for RolePrivilegeDataSet and UserRolesDataSet;
6 years ago
c4ac70efa8
Fixed the bug that : the global standard time zone was not set and time parsing error occurred while running on a different time zone setting server.
6 years ago
9641c82e93
Fixed compilation error and refactored the API of querying meta info of Ledger;
6 years ago
f60c63e20b
solve ledger inconsistency problem
6 years ago
d201c568de
修正日志打印的问题
6 years ago
be4b9cf8e6
Fix Endpoint's Sign and Node's Sign Error !
6 years ago
884ae3d153
Merge branch 'test' into release/1.0.0
# Conflicts:
# source/pom.xml
# source/storage/storage-service/src/test/java/test/com/jd/blockchain/storage/service/utils/BufferedKVStorageTest.java
6 years ago
436022dda6
Set the default log level of console to error;
6 years ago
2602fb7c96
clean the project；
fixed the bug: get 10+ results by /accounts/.../entries?fromIndex=10&count=10, no results in the seconds page;
delete the modules of stp/state-transfer/crypto-impl;
delete the dependency out the dependencyManagement
6 years ago
867c0f6911
Add Contract Code Show !
6 years ago
1c8df1ac9d
modify contract return message !
6 years ago
d523334c9f
Refactored the structure of operation results of ledger transaction;
6 years ago
2c4bf3318d
Merge branch 'contract-return' into feature/contract_invocation
# Conflicts:
# source/base/src/main/java/com/jd/blockchain/consts/DataCodes.java
# source/contract/contract-jvm/src/main/java/com/jd/blockchain/contract/jvm/JavaContractCode.java
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/TransactionBatchProcessor.java
# source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/LedgerEditerTest.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
6 years ago
d60c5d4cb1
Merge branch 'feature/authorize' into develop
# Conflicts:
# source/ledger/ledger-core/src/main/java/com/jd/blockchain/ledger/core/impl/handles/ContractLedgerContext.java
# source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/DataAccountKVSetOperationBuilderImpl.java
# source/test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationBase.java
# source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/IntegrationTestAll4Redis.java
6 years ago
huanghaiquan
zhaoguangwei
zhangshuang
zhaoguangwei
shaozhuguang