Browse Source

修改tools.jar文件引入

tags/1.1.0
shaozhuguang 5 years ago
parent
commit
1d40514432
4 changed files with 27 additions and 24 deletions
  1. +10
    -9
      source/gateway/src/test/java/test/com/jd/blockchain/gateway/GatewayConfigPropertiesTest.java
  2. +15
    -13
      source/gateway/src/test/resources/gateway.conf
  3. +1
    -1
      source/manager/ump-service/pom.xml
  4. +1
    -1
      source/pom.xml

+ 10
- 9
source/gateway/src/test/java/test/com/jd/blockchain/gateway/GatewayConfigPropertiesTest.java View File

@@ -23,19 +23,20 @@ public class GatewayConfigPropertiesTest {
ClassPathResource gatewayConfigResource = new ClassPathResource("gateway.conf"); ClassPathResource gatewayConfigResource = new ClassPathResource("gateway.conf");
try (InputStream in = gatewayConfigResource.getInputStream()) { try (InputStream in = gatewayConfigResource.getInputStream()) {
GatewayConfigProperties configProps = GatewayConfigProperties.resolve(in); 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()); 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()); 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) { } catch (IOException e) {
throw new IllegalStateException(e.getMessage(), e); throw new IllegalStateException(e.getMessage(), e);


+ 15
- 13
source/gateway/src/test/resources/gateway.conf View File

@@ -1,29 +1,31 @@

#网关的HTTP服务地址; #网关的HTTP服务地址;
http.host=192.168.10.108
http.host=0.0.0.0
#网关的HTTP服务端口; #网关的HTTP服务端口;
http.port=80
http.port=8081
#网关的HTTP服务上下文路径,可选; #网关的HTTP服务上下文路径,可选;
#http.context-path= #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 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 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编码数据); #默认公钥的内容(Base58编码数据);
keys.default.pubkey=64hnNxUPcH4a8NxUPc
keys.default.pubkey=3snPdw7i7PjVKiTH2VnXZu5H8QmNaSXpnk4ei533jFpuifyjS5zzH9
#默认私钥的路径;在 pk-path 和 pk 之间必须设置其一; #默认私钥的路径;在 pk-path 和 pk 之间必须设置其一;
keys.default.privkey-path=keys/default.priv
keys.default.privkey-path=
#默认私钥的内容(加密的Base58编码数据);在 pk-path 和 pk 之间必须设置其一; #默认私钥的内容(加密的Base58编码数据);在 pk-path 和 pk 之间必须设置其一;
keys.default.privkey=64hnH4a8n48LeEmNxUPcaZ1J
keys.default.privkey=177gjzHTznYdPgWqZrH43W3yp37onm74wYXT4v9FukpCHBrhRysBBZh7Pzdo5AMRyQGJD7x
#默认私钥的解码密码; #默认私钥的解码密码;
keys.default.privkey-password=a8n48LeEP
keys.default.privkey-password=DYu3G8aGTMBW1WrTw76zxQJQU4DHLw9MLyy7peG4LKkY

+ 1
- 1
source/manager/ump-service/pom.xml View File

@@ -107,7 +107,7 @@
<artifactId>tools</artifactId> <artifactId>tools</artifactId>
<version>1.8</version> <version>1.8</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/../ump-booter/libs/tools.jar</systemPath>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency> </dependency>


<dependency> <dependency>


+ 1
- 1
source/pom.xml View File

@@ -37,7 +37,7 @@
<properties> <properties>
<my.utils.version>0.8.1-SNAPSHOT</my.utils.version> <my.utils.version>0.8.1-SNAPSHOT</my.utils.version>
<bft-smart.version>0.0.8.RELEASE</bft-smart.version> <bft-smart.version>0.0.8.RELEASE</bft-smart.version>
<explorer.version>0.8.0-SNAPSHOT</explorer.version>
<explorer.version>0.7.0.RELEASE</explorer.version>
<ump-explorer.version>1.0.0-SNAPSHOT</ump-explorer.version> <ump-explorer.version>1.0.0-SNAPSHOT</ump-explorer.version>
<commons-io.version>2.4</commons-io.version> <commons-io.version>2.4</commons-io.version>
<mongo.driver.version>3.3.0</mongo.driver.version> <mongo.driver.version>3.3.0</mongo.driver.version>


Loading…
Cancel
Save