From af88e44e8f893728507cbad7627b7fb2695f0efe Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Mon, 25 May 2020 18:04:42 +0800 Subject: [PATCH 01/16] use new Privilege VO, because if use the old privilege, json instance the object by using the {0,4,5,6,7}. not we expect the result; --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 8eb96bd9..c810111f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8eb96bd9f656fdd4432066d7f5e9a1ec444a6d6a +Subproject commit c810111f17cc417773fea55cbcf7b2226a3dbf53 diff --git a/framework b/framework index 7260fab6..9d8f46da 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 7260fab6ee0336e2a197ddef7bebf2daf9363844 +Subproject commit 9d8f46da1440d1668649580babe3f758bffc0d8f From 4d9f4d673c3210dbb0f8c437e997347518ab0544 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Tue, 14 Jul 2020 15:28:51 +0800 Subject: [PATCH 02/16] merge privilege; --- core | 2 +- .../src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java | 8 ++++---- framework | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core b/core index 53822bf0..7e70bad3 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 53822bf005a7a29958d82c4c9cd18d24248fbca8 +Subproject commit 7e70bad369b8edc76d9da8906b6628b6ecbb5b4b diff --git a/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java b/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java index c8784892..d465a4ba 100644 --- a/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java +++ b/deploy/deploy-peer/src/main/java/com/jd/blockchain/boot/peer/PeerBooter.java @@ -1,5 +1,8 @@ package com.jd.blockchain.boot.peer; +import com.jd.blockchain.runtime.boot.HomeBooter; +import com.jd.blockchain.runtime.boot.HomeContext; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -11,12 +14,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.jd.blockchain.runtime.boot.HomeBooter; -import com.jd.blockchain.runtime.boot.HomeContext; - /** * Peer 启动器； - * + * * @author huanghaiquan * */ diff --git a/framework b/framework index 399ceeff..90332b9e 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 399ceeff4de82edd3ee93446c79cf32b1ba4cc59 +Subproject commit 90332b9efb0515feefb25b57a376b13a4aa09acd From d2fa9203c299999709789c04697fce6079c06c51 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Tue, 14 Jul 2020 15:44:17 +0800 Subject: [PATCH 03/16] update; --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index f8705658..634f7ba6 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit f8705658a9b3a9a0a01bf340a0d95e229524ab8d +Subproject commit 634f7ba68d70cdbf910284809f29cde7e3119544 From 7dfc25de1e7c1ba1ee7107284a6455ef698729f6 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Tue, 14 Jul 2020 17:37:40 +0800 Subject: [PATCH 04/16] delete the ledgerPrivilegeVO and TransactionPrivilegeVO; --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 7e70bad3..dc71a9d2 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7e70bad369b8edc76d9da8906b6628b6ecbb5b4b +Subproject commit dc71a9d2c4c0686a39179c6977b9e53b941e2751 diff --git a/framework b/framework index 90332b9e..f5159638 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 90332b9efb0515feefb25b57a376b13a4aa09acd +Subproject commit f51596386eb62681adcd0f932a644d07f45fdb88 From 7d47abee88c379432e930bc4ac238f1462354a81 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Tue, 14 Jul 2020 17:42:22 +0800 Subject: [PATCH 05/16] update; --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index f5159638..4f16d4bc 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit f51596386eb62681adcd0f932a644d07f45fdb88 +Subproject commit 4f16d4bcde93b752c8c8002114385009b6a87666 From 60aa24f27543b2421eb7f4b41992e7b0c334f36c Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Tue, 14 Jul 2020 17:51:16 +0800 Subject: [PATCH 06/16] update; --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index dc71a9d2..89e84a61 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit dc71a9d2c4c0686a39179c6977b9e53b941e2751 +Subproject commit 89e84a615504de3f89922213038a24ceb50422cd From 6dbb284570d24e7acfc5c6b704cb345761858706 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Tue, 14 Jul 2020 19:02:54 +0800 Subject: [PATCH 07/16] if default role, return empty result; when get the userPrivilege, if an exist user, then get all. if not, then get empty result; --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 89e84a61..9cd7bbe9 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 89e84a615504de3f89922213038a24ceb50422cd +Subproject commit 9cd7bbe952127722b37e214c439a3f93f54337bd diff --git a/framework b/framework index 4f16d4bc..33f103b0 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 4f16d4bcde93b752c8c8002114385009b6a87666 +Subproject commit 33f103b007ebb5350a3de0fd2e80d7ec08ad46ef From 7821b923cacbf6ac3170e5a0832890b941702db7 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Wed, 15 Jul 2020 17:02:05 +0800 Subject: [PATCH 08/16] optimize the code, make the best of the previous class, getRolePrivilege() return the PrivilegeSet; getUserPrivilege() return the UserPrivilegeSet(new class),comprehensive learning LedgerSecurityManagerImpl. --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 9cd7bbe9..83f648b4 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 9cd7bbe952127722b37e214c439a3f93f54337bd +Subproject commit 83f648b4dd0287a414443a736093a62a71ba39ec diff --git a/framework b/framework index 33f103b0..f07bb23c 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 33f103b007ebb5350a3de0fd2e80d7ec08ad46ef +Subproject commit f07bb23cf9148bb8a97fab6dae0e0bff8e66ad53 From e32fb01e1da29a5ab4b9f0064a9592d97449e01b Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Thu, 16 Jul 2020 10:30:42 +0800 Subject: [PATCH 09/16] modify default config og gateway.conf --- .../src/main/resources/config/gateway.conf | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/deploy/deploy-gateway/src/main/resources/config/gateway.conf b/deploy/deploy-gateway/src/main/resources/config/gateway.conf index b0bcb4af..e19b82b9 100644 --- a/deploy/deploy-gateway/src/main/resources/config/gateway.conf +++ b/deploy/deploy-gateway/src/main/resources/config/gateway.conf @@ -1,16 +1,25 @@ -#网关的HTTP服务地址，建议直接使用0.0.0.0； +#网关的HTTP服务地址； http.host=0.0.0.0 #网关的HTTP服务端口； -http.port=8081 +http.port=8080 #网关的HTTP服务上下文路径，可选； #http.context-path= +#对端Peer节点的数量 +peer.size=2 #共识节点的服务地址（与该网关节点连接的Peer节点的IP地址）； -peer.host=127.0.0.1 -#共识节点的服务端口（与该网关节点连接的Peer节点的端口）； -peer.port=7080 +peer.0.host=127.0.0.1 +#共识节点的服务端口（与该网关节点连接的Peer节点的端口，即在Peer节点的peer-startup.sh中定义的端口）； +peer.0.port=7080 #共识节点的服务是否启用安全证书； -peer.secure=false +peer.0.secure=false +#共识节点的服务地址（与该网关节点连接的Peer节点的IP地址）； +peer.1.host=127.0.0.1 +#共识节点的服务端口（与该网关节点连接的Peer节点的端口，即在Peer节点的peer-startup.sh中定义的端口）； +peer.1.port=7081 +#共识节点的服务是否启用安全证书； +peer.1.secure=false + #共识节点的服务提供解析器 #BftSmart共识Provider：com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider #简单消息共识Provider：com.jd.blockchain.consensus.mq.MsgQueueConsensusProvider @@ -18,7 +27,6 @@ peer.providers=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider #数据检索服务对应URL，格式：http://{ip}:{port}，例如：http://127.0.0.1:10001 #若该值不配置或配置不正确，则浏览器模糊查询部分无法正常显示 -#数据检索服务模块（Argus）需单独部署，若不部署其他功能仍可正常使用 data.retrieval.url=http://127.0.0.1:10001 schema.retrieval.url=http://127.0.0.1:8082 @@ -29,4 +37,4 @@ keys.default.privkey-path= #默认私钥的内容（加密的Base58编码数据）；在 pk-path 和 pk 之间必须设置其一； keys.default.privkey= #默认私钥的解码密码； -keys.default.privkey-password= \ No newline at end of file +keys.default.privkey-password= From 925a83e90050935983ffdcb9bc160f2c029502f4 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 16 Jul 2020 19:11:24 +0800 Subject: [PATCH 10/16] getPermission by LedgerSecurityManagerImpl; optimize the code; --- core | 2 +- framework | 2 +- test | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core b/core index 83f648b4..f9bcd620 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 83f648b4dd0287a414443a736093a62a71ba39ec +Subproject commit f9bcd620151b634e07b23add63a8629aca9fde1c diff --git a/framework b/framework index f07bb23c..16e99ecd 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit f07bb23cf9148bb8a97fab6dae0e0bff8e66ad53 +Subproject commit 16e99ecdd0e280655ddeee096ae8e39eca06dc92 diff --git a/test b/test index 634f7ba6..0104801c 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 634f7ba68d70cdbf910284809f29cde7e3119544 +Subproject commit 0104801cfb4998c8f90bdd7e9e07d3b4dddeedfd From 140289f856d5cea0ee5b1657dc81987d022c494c Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Thu, 16 Jul 2020 19:57:25 +0800 Subject: [PATCH 11/16] if return null, then get ""; --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index f9bcd620..572174ce 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f9bcd620151b634e07b23add63a8629aca9fde1c +Subproject commit 572174ce4af367563f514bc6304bf139ca804247 diff --git a/framework b/framework index 16e99ecd..b7f5876d 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 16e99ecdd0e280655ddeee096ae8e39eca06dc92 +Subproject commit b7f5876dd9454502d3b8c2361cbd1580b81d744d From 8298224b939115cc8c413d2933364d72342fff8d Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Fri, 17 Jul 2020 15:20:10 +0800 Subject: [PATCH 12/16] use info level; --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 572174ce..73bb5d04 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 572174ce4af367563f514bc6304bf139ca804247 +Subproject commit 73bb5d04e37fdf5abe91af568fd3cbc8976cc385 From 785c4b0e98f178480ecf358098390e2f0f2f75f7 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Mon, 20 Jul 2020 10:37:48 +0800 Subject: [PATCH 13/16] delete the user-role interface; --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 73bb5d04..7d819b91 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 73bb5d04e37fdf5abe91af568fd3cbc8976cc385 +Subproject commit 7d819b918a3e87380fdd7f520834bfe8bf73ad73 diff --git a/framework b/framework index b7f5876d..9d47861c 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit b7f5876dd9454502d3b8c2361cbd1580b81d744d +Subproject commit 9d47861c8c79c0898126f0a5b4b5ed4b01869a06 From 78d89c8db050a8e2caba4adb8d31bb418ccd5828 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Mon, 20 Jul 2020 10:56:31 +0800 Subject: [PATCH 14/16] path use : authorization/role ; authorization/user; --- core | 2 +- framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core b/core index 7d819b91..d9f0ec6f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7d819b918a3e87380fdd7f520834bfe8bf73ad73 +Subproject commit d9f0ec6fabc0d15a023cd95cb1be098161a1b3af diff --git a/framework b/framework index 9d47861c..83441caa 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 9d47861c8c79c0898126f0a5b4b5ed4b01869a06 +Subproject commit 83441caae79ffa1c49fbd34b37378a45e3094a95 From a7612e5ce2792cd2ed0bd8ea41aeec2a1024f5de Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Mon, 20 Jul 2020 11:36:00 +0800 Subject: [PATCH 15/16] new HashSet<>() --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index d9f0ec6f..cef087f0 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d9f0ec6fabc0d15a023cd95cb1be098161a1b3af +Subproject commit cef087f01ec4711085e0f7671abc2154c8f312f7 From 58444c22e3f8152fbe8396e1cf929d6a6a42b3da Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Mon, 20 Jul 2020 16:58:42 +0800 Subject: [PATCH 16/16] update; --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 0104801c..27184cc0 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 0104801cfb4998c8f90bdd7e9e07d3b4dddeedfd +Subproject commit 27184cc0e48ef69d7febdf4b1fedd6d9d38984b7