login config file: add caServerUrl

Signed-off-by: Yi DENG <[email protected]>
blockchain-desktop · Mar 25, 2019 · ba242a0 · ba242a0
1 parent 1b89fe2
commit ba242a0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/fabric/v1.3/fabric-ca/desktopConfig.yaml b/fabric/v1.3/fabric-ca/desktopConfig.yaml
@@ -1,10 +1,11 @@
 peerGrpcUrl: grpcs://localhost:7051
 peerEventUrl: grpcs://localhost:7053
 ordererUrl: grpcs://localhost:7050
+caServerUrl: http://localhost:7054
 mspId: org1MSP
 certificate: data/orgs/org1/admin/msp/signcerts/cert.pem
 # FIXME: privateKey值目前每次重启fabric-ca网络需手动修改，待优化
-privateKey: data/orgs/org1/admin/msp/keystore/4c860ce32fe575f8d782ddbee2e1e086b4390fdd59f7b7fa2306ad521e64502b_sk
+privateKey: data/orgs/org1/admin/msp/keystore/52aa979aa97e78e2df1ed49cf8e8fadef0adb880ad8a3b6946184ca1c1148105_sk
 peerTlsCaCert: data/org1-ca-chain.pem
 ordererTlsCaCert: data/org0-ca-chain.pem
 peerSslTarget: peer1-org1

diff --git a/fabric/v1.3/first-network/desktopConfig.yaml b/fabric/v1.3/first-network/desktopConfig.yaml
@@ -3,6 +3,7 @@ peerEventUrl: grpcs://localhost:7053
 ordererUrl: grpcs://localhost:7050
 mspId: Org1MSP
 certificate: crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/signcerts/[email protected]
+# FIXME: privateKey值目前每次重启fabric-ca网络需手动修改，待优化
 privateKey: crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/484c1040e45a96e059d48991a5426139f6f0c9fd2ee0a60dca1120398407683e_sk
 peerTlsCaCert: crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/tlscacerts/tlsca.org1.example.com-cert.pem
 ordererTlsCaCert: crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem

diff --git a/src/components/UserLayout.jsx b/src/components/UserLayout.jsx
@@ -154,6 +154,7 @@ export default class UserLayout extends React.Component {
         peerGrpcUrl: config.peerGrpcUrl,
         peerEventUrl: config.peerEventUrl,
         ordererUrl: config.ordererUrl,
+        caServerUrl: config.caServerUrl,
         mspid: config.mspId,
         certPath: _configImportPathHelper(config.certificate, configDir),
         keyPath: _configImportPathHelper(config.privateKey, configDir),