jdchain

Commit Graph

Author	SHA1	Message	Date
huanghaiquan	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	5 years ago
zhaoguangwei	a572df5c98	use the 512m	5 years ago
huanghaiquan	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	5 years ago
shaozhuguang	ffd5b71e47	屏蔽ump编译	5 years ago
shaozhuguang	ce1e79b88d	增加部分注释	5 years ago
shaozhuguang	9f0fe0855c	增加ump代码	5 years ago
shaozhuguang	d201c568de	修正日志打印的问题	5 years ago
huanghaiquan	6ac03c4c69	Added manager project;	5 years ago
huanghaiquan	009f86dab3	Completed the definition of role privilege, and dealed some naming conflicts;	5 years ago
zhaoguangwei	ebdc566c4b	add the memo of ledger-binding.conf in the deployment.md;	5 years ago
shaozhuguang	06fe31e836	增加启动参数，设置使用的Console	6 years ago
huanghaiquan	0d8cc2be3e	Merge branch 'release/1.0.0' into develop # Conflicts: # source/sdk/sdk-base/pom.xml # source/storage/storage-redis/pom.xml # source/storage/storage-service/pom.xml	6 years ago
zhaoguangwei	36bd35130b	modify the file of 安装部署.*	6 years ago
huanghaiquan	a5bb09c00e	Merge branch 'release/1.0.0' into develop	6 years ago
shaozhuguang	08ca5926a9	Modify the default settings for the initialization part of the ledger ！	6 years ago
shaozhuguang	4edfe964ec	1、Fixed get consensus file error ！	6 years ago
shaozhuguang	f73a2280d9	Delete the public key part involved in the bftsmart file ！	6 years ago
huanghaiquan	e33a21310c	Upgraded version to 1.1.0-SNAPSHOT	6 years ago
huanghaiquan	859a60d3af	Upgraded version to 1.0.0.RELEASE;	6 years ago
shaozhuguang	06a932279c	Change String.getBytes() to UTF-8 Encode !	6 years ago
huanghaiquan	e3b9d97f5e	Completed configuring crypto service provider in ledger.init file;	6 years ago
shaozhuguang	3545a75fa1	1. Modify integration test cases; 2. Adding browser to get Settings configuration interface; 3. Repairing BUG of BftSMART Consensus.	6 years ago
huanghaiquan	d52188ff57	Fixed bugs in test case LedgerBindingConfigTest .	6 years ago
huanghaiquan	1ebe607a59	Merge branch 'develop' into feature/crypto-spi * develop: Modify license files, readme files, and other configurations change configure files and shell files change configure files Fix bugs in test case; # Conflicts: # README.md # source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/CryptoAlgorithm.java # source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/AsymmtricCryptographyImpl.java # source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/HashCryptographyImpl.java # source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/asymmetric/JNIED25519SignatureFunction.java # source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/hash/JNIRIPEMD160HashFunction.java # source/crypto/crypto-framework/src/main/java/com/jd/blockchain/crypto/impl/jni/hash/JNISHA256HashFunction.java # source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/asymmetric/AsymmtricCryptographyImplTest.java # source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/hash/HashCryptographyImplTest.java # source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIED25519UtilsTest.java # source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIMBSHA256UtilsTest.java # source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNIRIPEMD160UtilsTest.java # source/crypto/crypto-framework/src/test/java/test/com/jd/blockchain/crypto/jniutils/JNISHA256UtilsTest.java	6 years ago
shaozhuguang	a16f41ff3c	Modify license files, readme files, and other configurations	6 years ago
shaozhuguang	8831baafbf	change configure files and shell files	6 years ago
shaozhuguang	dd0abe3157	Merge remote-tracking branch 'origin/master' into develop-local	6 years ago
shaozhuguang	4c8ac6cf15	change configure files	6 years ago
huanghaiquan	d7c1e752c8	rebase crypto-spi;	6 years ago
huanghaiquan	a297d7d5d4	Update to version 0.9.0-SNAPSHOT;	6 years ago
huanghaiquan	43068a0281	Init the repository with the 0.8.3.RELEASE version of project;	6 years ago

31 Commits (be6d99ae3e15f89f28e854913e14efb51c4263c5)