From 1d405144327ffa092530b7acafdeeda2c44b5c59 Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Wed, 18 Sep 2019 11:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9tools.jar=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gateway/GatewayConfigPropertiesTest.java | 19 +++++++------ .../gateway/src/test/resources/gateway.conf | 28 ++++++++++--------- source/manager/ump-service/pom.xml | 2 +- source/pom.xml | 2 +- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/source/gateway/src/test/java/test/com/jd/blockchain/gateway/GatewayConfigPropertiesTest.java b/source/gateway/src/test/java/test/com/jd/blockchain/gateway/GatewayConfigPropertiesTest.java index 5bcb142c..1ab1340a 100644 --- a/source/gateway/src/test/java/test/com/jd/blockchain/gateway/GatewayConfigPropertiesTest.java +++ b/source/gateway/src/test/java/test/com/jd/blockchain/gateway/GatewayConfigPropertiesTest.java @@ -23,19 +23,20 @@ public class GatewayConfigPropertiesTest { ClassPathResource gatewayConfigResource = new ClassPathResource("gateway.conf"); try (InputStream in = gatewayConfigResource.getInputStream()) { GatewayConfigProperties configProps = GatewayConfigProperties.resolve(in); - assertEquals("192.168.10.108", configProps.http().getHost()); - assertEquals(80, configProps.http().getPort()); + assertEquals("0.0.0.0", configProps.http().getHost()); + assertEquals(8081, configProps.http().getPort()); assertNull(configProps.http().getContextPath()); - assertEquals("10.1.6.61", configProps.masterPeerAddress().getHost()); - assertEquals(7100, configProps.masterPeerAddress().getPort()); + assertEquals("127.0.0.1", configProps.masterPeerAddress().getHost()); + assertEquals(12000, configProps.masterPeerAddress().getPort()); assertTrue(configProps.masterPeerAddress().isSecure()); - assertEquals("http://192.168.1.1:10001", configProps.dataRetrievalUrl()); - - assertEquals("keys/default.priv", configProps.keys().getDefault().getPrivKeyPath()); - assertEquals("64hnH4a8n48LeEmNxUPcaZ1J", configProps.keys().getDefault().getPrivKeyValue()); - assertEquals("a8n48LeEP", configProps.keys().getDefault().getPrivKeyPassword()); + assertEquals("http://127.0.0.1:10001", configProps.dataRetrievalUrl()); + + assertEquals("3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9", configProps.keys().getDefault().getPubKeyValue()); + assertNull(configProps.keys().getDefault().getPrivKeyPath()); + assertEquals("177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x", configProps.keys().getDefault().getPrivKeyValue()); + assertEquals("DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY", configProps.keys().getDefault().getPrivKeyPassword()); } catch (IOException e) { throw new IllegalStateException(e.getMessage(), e); diff --git a/source/gateway/src/test/resources/gateway.conf b/source/gateway/src/test/resources/gateway.conf index b99068a2..e112bf72 100644 --- a/source/gateway/src/test/resources/gateway.conf +++ b/source/gateway/src/test/resources/gateway.conf @@ -1,29 +1,31 @@ - #网关的HTTP服务地址； -http.host=192.168.10.108 +http.host=0.0.0.0 #网关的HTTP服务端口； -http.port=80 +http.port=8081 #网关的HTTP服务上下文路径，可选； #http.context-path= -#共识节点的服务地址； -peer.host=10.1.6.61 -#共识节点的服务端口； -peer.port=7100 +#共识节点的服务地址（与该网关节点连接的Peer节点的IP地址）； +peer.host=127.0.0.1 +#共识节点的服务端口（与该网关节点连接的Peer节点的端口）； +peer.port=12000 #共识节点的服务是否启用安全证书； peer.secure=true #共识节点的服务提供解析器 +#BftSmart共识Provider：com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider +#简单消息共识Provider：com.jd.blockchain.consensus.mq.MsgQueueConsensusProvider peer.providers=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider -#数据检索服务对应URL +#数据检索服务对应URL，格式：http://{ip}:{port}，例如：http://127.0.0.1:10001 #若该值不配置或配置不正确，则浏览器模糊查询部分无法正常显示 -data.retrieval.url=http://192.168.1.1:10001 +data.retrieval.url=http://127.0.0.1:10001 +schema.retrieval.url=http://192.168.151.39:8082 #默认公钥的内容（Base58编码数据）； -keys.default.pubkey=64hnNxUPcH4a8NxUPc +keys.default.pubkey=3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9 #默认私钥的路径；在 pk-path 和 pk 之间必须设置其一； -keys.default.privkey-path=keys/default.priv +keys.default.privkey-path= #默认私钥的内容（加密的Base58编码数据）；在 pk-path 和 pk 之间必须设置其一； -keys.default.privkey=64hnH4a8n48LeEmNxUPcaZ1J +keys.default.privkey=177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x #默认私钥的解码密码； -keys.default.privkey-password=a8n48LeEP \ No newline at end of file +keys.default.privkey-password=DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY \ No newline at end of file diff --git a/source/manager/ump-service/pom.xml b/source/manager/ump-service/pom.xml index b01c60cc..7162f740 100644 --- a/source/manager/ump-service/pom.xml +++ b/source/manager/ump-service/pom.xml @@ -107,7 +107,7 @@ tools 1.8 system - ${project.basedir}/../ump-booter/libs/tools.jar + ${java.home}/../lib/tools.jar diff --git a/source/pom.xml b/source/pom.xml index 1d4735e8..77e8149b 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -37,7 +37,7 @@ 0.8.1-SNAPSHOT 0.0.8.RELEASE - 0.8.0-SNAPSHOT + 0.7.0.RELEASE 1.0.0-SNAPSHOT 2.4 3.3.0