diff --git a/core b/core index ae6932b5..d2524684 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ae6932b5e7752aaac91560bc6c86302d2e81e9b9 +Subproject commit d252468479dd74ec806ac482d9505a017c140e99 diff --git a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config similarity index 100% rename from deploy/deploy-peer/src/main/resources/config/init/bftsmart.config rename to deploy/deploy-peer/src/main/resources/config/init/bftsmart/bftsmart.config diff --git a/deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init b/deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init deleted file mode 100644 index 3dff9113..00000000 --- a/deploy/deploy-peer/src/main/resources/config/init/mq/ledger.init +++ /dev/null @@ -1,33 +0,0 @@ -#账本的种子;一段16进制字符,最长可以包含64个字符;可以用字符“-”分隔,以便更容易读取; -ledger.seed=932dfe23-fe23232f-283f32fa-dd32aa76-8322ca2f-56236cda-7136b322-cb323ffe - -#账本的描述名称;此属性不参与共识,仅仅在当前参与方的本地节点用于描述用途; -ledger.name= - -#声明的账本创建时间;格式为 “yyyy-MM-dd HH:mm:ss.SSSZ”,表示”年-月-日 时:分:秒:毫秒时区“;例如:“2019-08-01 14:26:58.069+0800”,其中,+0800 表示时区是东8区 -created-time=2022-03-08 08:08:08.008+0800 - -#共识服务提供者;必须; -consensus.service-provider=com.jd.blockchain.consensus.mq.MsgQueueConsensusProvider - -#共识服务的参数配置;必须; -consensus.conf=mq.config - -#密码服务提供者列表,以英文逗点“,”分隔;必须; -crypto.service-providers=com.jd.blockchain.crypto.service.classic.ClassicCryptoService, \ -com.jd.blockchain.crypto.service.sm.SMCryptoService - - -#参与方的个数,后续以 cons_parti.id 分别标识每一个参与方的配置; -cons_parti.count=1 - -#第0个参与方的名称; -cons_parti.0.name= -#第0个参与方的公钥文件路径; -cons_parti.0.pubkey-path= -#第0个参与方的公钥内容(由jdchain-clis keys相关命令生成);此参数优先于 pubkey-path 参数; -cons_parti.0.pubkey= -#第0个参与方的账本初始服务的主机; -cons_parti.0.initializer.host= -#第0个参与方的账本初始服务的端口; -cons_parti.0.initializer.port= diff --git a/deploy/deploy-peer/src/main/resources/config/init/mq/local.conf b/deploy/deploy-peer/src/main/resources/config/init/mq/local.conf deleted file mode 100644 index 2a5392c5..00000000 --- a/deploy/deploy-peer/src/main/resources/config/init/mq/local.conf +++ /dev/null @@ -1,23 +0,0 @@ -#当前参与方的 id -local.parti.id=0 - -#当前参与方的公钥 -local.parti.pubkey= - -#当前参与方的私钥(密文编码) -local.parti.privkey= - -#当前参与方的私钥解密密钥(原始口令的一次哈希,Base58格式),如果不设置,则启动过程中需要从控制台输入 -local.parti.pwd= - -#账本初始化完成后生成的"账本绑定配置文件"的输出目录 -#推荐使用绝对路径,相对路径以当前文件(local.conf)所在目录为基准 -ledger.binding.out=../ - -#账本数据库的连接字符 -#rocksdb数据库连接格式:rocksdb://{path},例如:rocksdb:///export/App08/peer/rocks.db/rocksdb0.db -#redis数据库连接格式:redis://{ip}:{prot}/{db},例如:redis://127.0.0.1:6379/0 -ledger.db.uri= - -#账本数据库的连接口令 -ledger.db.pwd= \ No newline at end of file