diff --git a/core b/core index 5bf77112..212410cf 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5bf7711230df7d1a839a3260b434a8f026d97712 +Subproject commit 212410cf260f60e82a3d3f9a6fc628db47069242 diff --git a/deploy/deploy-gateway/src/main/resources/docs/code_example.MD b/deploy/deploy-gateway/src/main/resources/docs/code_example.MD index 3e35841a..cdb599ff 100644 --- a/deploy/deploy-gateway/src/main/resources/docs/code_example.MD +++ b/deploy/deploy-gateway/src/main/resources/docs/code_example.MD @@ -297,8 +297,7 @@ // 发布事件到指定的账户中; String eventAccount = "GGhhreGeasdfasfUUfehf9932lkae99ds66jf=="; txTemp.eventAccount(eventAccount).publish("event_name", "string", -1) - .publish("event_name", 0, 0) - .publish("event_name", "bytes".getBytes(), 1); + .publish("event_name", 0, 0); // TX 准备就绪; PreparedTransaction prepTx = txTemp.prepare(); @@ -343,12 +342,9 @@ BytesValue content = eventMessage.getContent(); switch (content.getType()) { case TEXT: - case XML: - case JSON: System.out.println(content.getBytes().toUTF8String()); break; case INT64: - case TIMESTAMP: System.out.println(BytesUtils.toLong(content.getBytes().toBytes())); break; default: diff --git a/framework b/framework index 919f1b04..79459a3b 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 919f1b048e15c3b4038d80120ba7fb931730d9ea +Subproject commit 79459a3b7e8a7c08418d52a91f1ec55b6d975212 diff --git a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_Event_Demo.java b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_Event_Demo.java index f4d85dbe..1685ecd7 100644 --- a/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_Event_Demo.java +++ b/samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_Event_Demo.java @@ -35,14 +35,8 @@ public class SDK_Event_Demo extends SDK_Base_Demo { // sequence传递当前事件名链上最新序号,不存在时传-1 Event event = blockchainService.getLatestEvent(ledgerHash, eventAccount.getAddress().toBase58(), "name"); long sequence = null != event ? event.getSequence() : -1; - txTpl.eventAccount(eventAccount.getAddress()).publish("name", "bytes".getBytes(), sequence); txTpl.eventAccount(eventAccount.getAddress()).publish("name", "string", sequence + 1); txTpl.eventAccount(eventAccount.getAddress()).publish("name", 0, sequence + 2); - txTpl.eventAccount(eventAccount.getAddress()).publish("name", 1l, sequence + 3); - txTpl.eventAccount(eventAccount.getAddress()).publishXML("name", "", sequence + 4); - txTpl.eventAccount(eventAccount.getAddress()).publishJSON("name", "{}", sequence + 5); - txTpl.eventAccount(eventAccount.getAddress()).publishImage("name", "img".getBytes(), sequence + 6); - txTpl.eventAccount(eventAccount.getAddress()).publishTimestamp("name", System.currentTimeMillis(), sequence + 7); commit(txTpl); } @@ -59,12 +53,9 @@ public class SDK_Event_Demo extends SDK_Base_Demo { BytesValue content = eventMessage.getContent(); switch (content.getType()) { case TEXT: - case XML: - case JSON: System.out.println(content.getBytes().toUTF8String()); break; case INT64: - case TIMESTAMP: System.out.println(BytesUtils.toLong(content.getBytes().toBytes())); break; default: diff --git a/test b/test index 27184cc0..f5057486 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 27184cc0e48ef69d7febdf4b1fedd6d9d38984b7 +Subproject commit f5057486324d0daf2f8ef9f223a04537d03edede