From d32ac90e78d51b62a4bba6a80800378911234261 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Wed, 11 Dec 2019 10:31:11 +0800 Subject: [PATCH 1/5] add lineEnding:unix --- .../deployment-gateway/src/main/resources/assembly.xml | 3 +++ .../deployment/deployment-peer/src/main/resources/assembly.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/source/deployment/deployment-gateway/src/main/resources/assembly.xml b/source/deployment/deployment-gateway/src/main/resources/assembly.xml index 39811c14..861990d0 100644 --- a/source/deployment/deployment-gateway/src/main/resources/assembly.xml +++ b/source/deployment/deployment-gateway/src/main/resources/assembly.xml @@ -12,14 +12,17 @@ src/main/resources/scripts bin + unix src/main/resources/config config + unix src/main/resources/docs docs + unix diff --git a/source/deployment/deployment-peer/src/main/resources/assembly.xml b/source/deployment/deployment-peer/src/main/resources/assembly.xml index 881c0aef..37aa494c 100644 --- a/source/deployment/deployment-peer/src/main/resources/assembly.xml +++ b/source/deployment/deployment-peer/src/main/resources/assembly.xml @@ -12,14 +12,17 @@ src/main/resources/scripts bin + unix src/main/resources/config config + unix src/main/resources/docs docs + unix From 8cee2ee38e6945cc7f163f37900be7d343f9eeb7 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 12 Dec 2019 10:47:10 +0800 Subject: [PATCH 2/5] not use the oss-parent node in the central library publishing. fill some info related in the proifle and distributionManagement node; --- source/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/source/pom.xml b/source/pom.xml index d2195de0..2e7dbd5b 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -515,7 +515,63 @@ -Xdoclint:none + + + + sonatype-oss-release + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + From cc531006d70b925262f4524e0a6e7564f65065d2 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 12 Dec 2019 18:32:20 +0800 Subject: [PATCH 3/5] add the param: jdchain.log; --- .../blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java index ec77fbee..1ccf994c 100644 --- a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java +++ b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java @@ -53,6 +53,7 @@ public class LedgerInitializeWeb4Nodes { System.setProperty("peer.log", path); System.setProperty("init.log", path); System.setProperty("gateway.log", path); + System.setProperty("jdchain.log", path); } catch (Exception e) { e.printStackTrace(); } From 69b013c75b3346e670ad1fb5c1cd18f46aaa86e5 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 12 Dec 2019 19:08:05 +0800 Subject: [PATCH 4/5] add the interface: 6.8 /ledgers/{ledger}/accounts/{address}/entries-version --- .../src/main/resources/docs/api_doc_cn_1.4.MD | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD b/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD index 7ff79c96..017b97d2 100644 --- a/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD +++ b/source/deployment/deployment-gateway/src/main/resources/docs/api_doc_cn_1.4.MD @@ -1768,7 +1768,7 @@ KVInfoVO对应格式如下： KVInfoVO说明： + 1）支持多个Key作为入参； - + + 2）每个Key支持多个version； @@ -1808,6 +1808,57 @@ http://localhost/ledgers/657TQAw6ssVoeKniWGwbovk7njvCTvikPambM9eBv6ezs/accounts/ |type|value类型| |value|值| +### 6.9 查询某数据账户键数量 +``` +GET /ledgers/{ledger}/accounts/address/{address}/keys/count/search?keyword={keyword} +``` +#### 参数 +请求类型 | 名称 | 是否必需 | 说明 | 数据类型 +--- | --- | --- | --- | --- +path | ledger | 是 | 所要搜索的账本，需要完整的账本哈希 | string +path | address | 是 | 所要搜索的数据账户地址，需要完整的数据账户地址 | string +query | keyword | 否 | 键的部分字符，空表示全部 | string + +#### 请求实例 +``` +http://localhost/ledgers/657TQAw6ssVoeKniWGwbovk7njvCTvikPambM9eBv6ezs/accounts/address/5Sm4gWXrNpDWW9Boi4xZCzZMHboRvEDm29Fa/keys/count/search?keyword=j +``` +#### 返回实例 +``` +{ "data": 66, "success": true } +``` +说明 + +名称 | 说明 +--- | --- +data | 条件查询键总数 + +### 6.10 查询某数据账户键 +``` +GET /ledgers/{ledger}/accounts/address/{address}/keys/search?keyword={keyword}&fromIndex={start_index}&count={count} +``` +#### 参数 +请求类型 | 名称 | 是否必需 | 说明 | 数据类型 +--- | --- | --- | --- | --- +path | ledger | 是 | 所要搜索的账本，需要完整的账本哈希 | string +path | address | 是 | 所要搜索的数据账户地址，需要完整的数据账户地址 | string +query | keyword | 否 | 键的部分字符，空表示全部 | string +query | start_index | 否 | 查询数据账户对应Key的起始序号，默认为0 | 数字 +query | count | 否 | 查询返回数据账户对应Key的数量，默认最大返回值为100，小于0或大于100均返回最大可返回结果集 | 数字 + +#### 请求实例 +``` +http://localhost/ledgers/657TQAw6ssVoeKniWGwbovk7njvCTvikPambM9eBv6ezs/accounts/address/5Sm4gWXrNpDWW9Boi4xZCzZMHboRvEDm29Fa/keys/search?keyword=j&fromIndex=0&count=-1 +``` +#### 返回实例 +``` +{ "data": [ { "key": "jd" }, { "key": "jdchain" }], "success": true } +``` +说明 + +名称 | 说明 +--- | --- +key | 键 ## 7 搜索 From 30babb99babf6e6d79358aa0965b555e6897a02b Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Fri, 13 Dec 2019 11:06:24 +0800 Subject: [PATCH 5/5] delete the Unnecessary content: unix --- .../deployment-gateway/src/main/resources/assembly.xml | 2 -- .../deployment/deployment-peer/src/main/resources/assembly.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/source/deployment/deployment-gateway/src/main/resources/assembly.xml b/source/deployment/deployment-gateway/src/main/resources/assembly.xml index 861990d0..bcfb659f 100644 --- a/source/deployment/deployment-gateway/src/main/resources/assembly.xml +++ b/source/deployment/deployment-gateway/src/main/resources/assembly.xml @@ -17,12 +17,10 @@ src/main/resources/config config - unix src/main/resources/docs docs - unix diff --git a/source/deployment/deployment-peer/src/main/resources/assembly.xml b/source/deployment/deployment-peer/src/main/resources/assembly.xml index 37aa494c..b5de9443 100644 --- a/source/deployment/deployment-peer/src/main/resources/assembly.xml +++ b/source/deployment/deployment-peer/src/main/resources/assembly.xml @@ -17,12 +17,10 @@ src/main/resources/config config - unix src/main/resources/docs docs - unix