fix bug

liuwenru · liuwenru · commit d4b5bcd34155 · 2018-04-04T10:52:54.000+08:00
diff --git a/doc/1.1.hyperledger1.0分布式环境搭建.md b/doc/1.1.hyperledger1.0分布式环境搭建.md
@@ -6,8 +6,6 @@
 
 ![](img/区块链网络构架图.png)
 
-
-
 如上图所示，在实验环境中我们将实现如上图所示的区块链结构，因为是实验环境，资源有限，所以在排序服务我们先暂时使用单节点实现，先验证功能。如上图所示，图中的`组织1`和`组织2`就是组成联盟链中的成员。为了演示以及验证超级账本中的各个节点的功能，我们可以在每一个组织节点中放入两个节点。
 
 ## 二、基本环境准备
@@ -39,6 +37,8 @@ Shell> git clone https://github.com/hyperledger/fabric-samples.git # 下载演
 ### 3.1、
 
 
+## 四、线上增加Peer或者Orderer节点
+
 
 
 ## 四、参考资料
diff --git a/src/main/java/ijarvis/intelliq/Fabric/TestConfigure.java b/src/main/java/ijarvis/intelliq/Fabric/TestConfigure.java
@@ -13,7 +13,7 @@
 
 public class TestConfigure {
     public static String CHAINCODENAME="epointchaincodecommon";
-    public static String CHAINCODEVERSION="0.2";
+    public static String CHAINCODEVERSION="0.1";
     public static String CHANNLNAME="epointchannel";
     public static HashMap<String,SampleOrg> getConfigure() throws MalformedURLException, InvalidArgumentException {
         HashMap<String,SampleOrg> orgHashMap=new HashMap<>();
diff --git a/src/main/java/ijarvis/intelliq/FabricCA/FabricCAApp.java b/src/main/java/ijarvis/intelliq/FabricCA/FabricCAApp.java
@@ -27,7 +27,6 @@ public static void init(User CAUSER) throws CryptoException, InvalidArgumentExce
         client.setCryptoSuite(cs);
         client.setUserContext(CAUSER);
     }
-
     /**
      * 调用链码添加KV结构
      */
diff --git a/src/main/java/ijarvis/intelliq/FabricCA/TestConfigure.java b/src/main/java/ijarvis/intelliq/FabricCA/TestConfigure.java
@@ -17,28 +17,27 @@
 
 public class TestConfigure {
     public static String CHAINCODENAME="epointchaincodecommon";
-    public static String CHAINCODEVERSION="0.2";
+    public static String CHAINCODEVERSION="0.1";
     public static String CHANNLNAME="epointchannel";
     public static HashMap<String,SampleOrg> getConfigure() throws MalformedURLException, InvalidArgumentException {
         HashMap<String,SampleOrg> orgHashMap=new HashMap<>();
-        SampleOrg org1=new SampleOrg("org1","Org1MSP");
-        org1.addPeerLocation("peer0org1","grpc://192.168.188.112:7051");
-        org1.addPeerLocation("peer1org1","grpc://192.168.188.113:7051");
-        org1.addOrdererLocation("orderer","grpc://192.168.188.111:7050");
-        org1.setCALocation("http://192.168.188.110:7054");
+        SampleOrg org1=new SampleOrg("city1","city1MSP");
+        org1.addPeerLocation("peer0city1","grpc://192.168.186.153:7051");
+        org1.addPeerLocation("peer1city1","grpc://192.168.186.154:7051");
+        org1.addOrdererLocation("orderer","grpc://192.168.186.152:7050");
+        org1.setCALocation("http://192.168.186.151:7054");
         org1.setCAClient(HFCAClient.createNewInstance(org1.getCALocation(),null));
         org1.getCAClient().setCryptoSuite(CryptoSuite.Factory.getCryptoSuite());
 
-
-        SampleOrg org2=new SampleOrg("org2","Org2MSP");
-        org2.addPeerLocation("peer0org2","grpc://192.168.188.114:7051");
-        org2.addPeerLocation("peer1org2","grpc://192.168.188.115:7051");
-        org2.addOrdererLocation("orderer","grpc://192.168.188.111:7050");
+        SampleOrg org2=new SampleOrg("city2","city2MSP");
+        org2.addPeerLocation("peer0city2","grpc://192.168.186.155:7051");
+        org2.addPeerLocation("peer1city2","grpc://192.168.186.156:7051");
+        org2.addOrdererLocation("orderer","grpc://192.168.186.152:7050");
         //org2.setCALocation("http://192.168.188.110:8054");//Org2的CA模块未启用所以暂时不提供
 
 
-        orgHashMap.put("org1",org1);
-        orgHashMap.put("org2",org2);
+        orgHashMap.put("city1",org1);
+        orgHashMap.put("city2",org2);
         return orgHashMap;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public static void init(User CAUSER) throws CryptoException, InvalidArgumentExce`
`27`	`27`	`client.setCryptoSuite(cs);`
`28`	`28`	`client.setUserContext(CAUSER);`
`29`	`29`	`}`
`30`		`-`
`31`	`30`	`/**`
`32`	`31`	`* 调用链码添加KV结构`
`33`	`32`	`*/`