diff --git a/core b/core index 88fe97ef..2645acf5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 88fe97ef3d930404ba4b604e2e0744dc7f18902c +Subproject commit 2645acf5759c83a183ef123323188ebd6a976665 diff --git a/deploy/deploy-peer/src/main/resources/config/init/mq/mq.config b/deploy/deploy-peer/src/main/resources/config/init/mq/mq.config index 424a2e2b..6d8ae9b4 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/mq/mq.config +++ b/deploy/deploy-peer/src/main/resources/config/init/mq/mq.config @@ -1,20 +1,26 @@ # MQ连接地址,格式:{MQ类型}://{IP}:{PORT} -system.msg.queue.server=rabbit://127.0.0.1:5672 +system.msg.queue.server=amqp://127.0.0.1:5672 # 当前账本交易发送队列主题(不同账本需不同主题) -system.msg.queue.topic.tx=tx-topic +system.msg.queue.topic.tx=tx # 当前账本结块消息应答队列主题 -system.msg.queue.topic.bl=bl-topic +system.msg.queue.topic.tx-result=tx-result # 当前账本普通消息主题 -system.msg.queue.topic.msg=msg-topic +system.msg.queue.topic.msg=msg + +# 当前账本普通消息主题 +system.msg.queue.topic.msg-result=msg-result + +# 当前账本区块信息主题 +system.msg.queue.topic.block=block # 当前账本结块最大交易数 system.msg.queue.block.txsize=1000 # 当前账本结块最大时长(单位:毫秒) -system.msg.queue.block.maxdelay=2000 +system.msg.queue.block.maxdelay=50 # 当前账本节点总数 system.servers.num=4 diff --git a/framework b/framework index 32a5c735..da476973 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 32a5c73569e0fc0ee91c7da1fc2c52f98e99db63 +Subproject commit da4769736bfb5d73eab28b6aa64dbc3028e1c997