Merge pull request #2 from blockchain-desktop/master

#75
blockchain-desktop · Nov 30, 2018 · 6400b58 · 6400b58
2 parents ad7461c + f3b3aa0
commit 6400b58
Show file tree

Hide file tree

Showing 13 changed files with 276 additions and 466 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,10 @@ node_modules
 out
 .eslintcache
 .idea
-resources/persistence/
+/resources/persistence/:
+/resources/key/users:
+/resources/key/tx:
+!.gitkeep
 
 # fabric network
 fabric/fabcar/hfc-key-store

diff --git a/resources/key/tls/orderers/ca.crt b/resources/key/tls/orderers/ca.crt
diff --git a/resources/key/tls/peer/ca.crt b/resources/key/tls/peer/ca.crt
diff --git a/resources/key/tx/.gitkeep b/resources/key/tx/.gitkeep
@@ -0,0 +1,3 @@
+# Ignore everything in this directory
+*
+# Except this file !.gitkeep
diff --git a/resources/key/tx/configtx.yaml b/resources/key/tx/configtx.yaml
diff --git a/resources/key/tx/configtxgen b/resources/key/tx/configtxgen
diff --git a/resources/key/users/.gitkeep b/resources/key/users/.gitkeep
@@ -0,0 +1,3 @@
+# Ignore everything in this directory
+*
+# Except this file !.gitkeep
diff --git a/resources/persistence/.gitkeep b/resources/persistence/.gitkeep
@@ -0,0 +1,3 @@
+# Ignore everything in this directory
+*
+# Except this file !.gitkeep
diff --git a/resources/persistence/config.db b/resources/persistence/config.db
diff --git a/src/components/UserLayout.jsx b/src/components/UserLayout.jsx
@@ -25,10 +25,10 @@ export default class UserLayout extends React.Component {
     super(props);
 
     this.state = {
-      peerGrpcUrl: 'grpc://localhost:7051',
-      peerEventUrl: 'grpc://localhost:7053',
-      ordererUrl: 'grpc://localhost:7050',
-      username: 'Org1Admin',
+      peerGrpcUrl: 'grpcs://139.198.122.54:7051',
+      peerEventUrl: 'grpcs://139.198.122.54:7053',
+      ordererUrl: 'grpcs://139.198.122.54:7050',
+      username: 'Org1',
       certPath: '',
       keyPath: '',
       tlsPeerPath: '',

diff --git a/src/components/content/ChannelManangeContent.jsx b/src/components/content/ChannelManangeContent.jsx
@@ -160,3 +160,11 @@ export default class ChannelManangeContent extends React.Component {
     );
   }
 }
+/*
+*  1.显示通道，包含通道成员等信息(可简化，目前暂未在SDK找到查找通道成员的方法)
+*  2.创建通道，用户可以通过客户端来制定哪些组织可加入通道， 即可通过客户端生成用户自定义的yaml文件
+*            (1)前端，用户添加组织，包括组织名称，MSPID， MSPDir，AnchorPeers，MSPDir即msp证书的目录
+*           （2）后台，通过用户所输入的，生成yaml文件，并配置好证书，后面创建通道跟现有操作保持一致
+*  3.更新通道，用户可以通过更新通道来新增成员，该成员在创建通道时未定义在yaml文件内
+*
+* */
diff --git a/src/components/content/DataContent.jsx b/src/components/content/DataContent.jsx
@@ -400,7 +400,7 @@ export default class DataContent extends React.Component {
           width="640px"
           centered
         >
-          <strong>Tx:</strong>{this.state.block[this.state.currentBlock] ? this.state.block[this.state.currentBlock][this.state.currentTransaction].tx : '1'}<br />
+          <strong>Tx:</strong>{this.state.block[this.state.currentBlock] ? this.state.block[this.state.currentBlock][this.state.currentTransaction].tx : ''}<br />
           <strong>Creator MSP:</strong>{this.state.block[this.state.currentBlock] ? this.state.block[this.state.currentBlock][this.state.currentTransaction].creatorMSP : ''}<br />
           <strong>Endorser:</strong>{this.state.block[this.state.currentBlock] ? this.state.block[this.state.currentBlock][this.state.currentTransaction].endorser : ''}<br />
           <strong>Chaincode Name:</strong>{this.state.block[this.state.currentBlock] ? this.state.block[this.state.currentBlock][this.state.currentTransaction].chaincodeName : ''}<br />