bdware/cm
2
0
Fork 0
mirror of https://gitee.com/BDWare/cm synced 2025-01-10 09:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: support jsontype in execute contract

Browse Source
This commit is contained in:
CaiHQ 2021-12-03 11:19:29 +08:00
parent 3c4c33bb1b
commit ecc51330db
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/bdware/sc/ContractManager.java
View File

@ -1524,12 +1524,13 @@ public class ContractManager {
// LOGGER.info("查看合约 " + cr.getContractID() + " 的master为 " + pubKey); // LOGGER.info("查看合约 " + cr.getContractID() + " 的master为 " + pubKey);
if (null != pubKey) {
if (!masterStub.hasAgentConnection(pubKey)) { if (!masterStub.hasAgentConnection(pubKey)) {
pubKey = nodeCenterConn.reRouteContract(cr.getContractID()); pubKey = nodeCenterConn.reRouteContract(cr.getContractID());
LOGGER.info("查看合约 " + cr.getContractID() + " 的master为 " + pubKey); LOGGER.info("查看合约 " + cr.getContractID() + " 的master为 " + pubKey);
} }
if (null != pubKey) {
masterStub.executeByOtherNodeAsync(pubKey, cr, rcb); masterStub.executeByOtherNodeAsync(pubKey, cr, rcb);
return; return;
// result = masterStub.executeByOtherNode(pubKey, cr); // result = masterStub.executeByOtherNode(pubKey, cr);

2
src/main/java/org/bdware/sc/handler/ManagerHandler.java
View File

@ -87,7 +87,7 @@ public class ManagerHandler extends MsgHandler {
@Description("add distributed execution member, sample: {contractID:id/name, arg:ipAndPort}") @Description("add distributed execution member, sample: {contractID:id/name, arg:ipAndPort}")
public void addDEMember(GetMessage msg, ResultCallback cb) { public void addDEMember(GetMessage msg, ResultCallback cb) {
ContractRequest cr = JsonUtil.fromJson(msg.arg, ContractRequest.class); ContractRequest cr = JsonUtil.fromJson(msg.arg, ContractRequest.class);
cb.onResult(cm.addDEMember(cr.getContractID(), cr.getArg())); cb.onResult(cm.addDEMember(cr.getContractID(), cr.getArg().getAsString()));
} }
/** /**