fix: fix conflict

Author: Keith-CY

README.md

@@ -58,7 +58,7 @@ CHAIN_SERVERS= # default appchain addresses
 APP_NAME= # explorer name
 ```
 
-> NOTICE: Our CDN for static assets is available at `http://pccoq959o.bkt.clouddn.com/`, namely icons and images can be added by setting `PUBLIC=http://pccoq959o.bkt.clouddn.com/` on `.env`.
+> NOTICE: Our CDN for static assets is available at `https://cdn.cryptape.com/`, namely icons and images can be added by setting `PUBLIC=https://cdn.cryptape.com/` on `.env`.
 
 5.  Developing
 

src/containers/Header/index.tsx

@@ -196,9 +196,8 @@ class Header extends React.Component<HeaderProps, HeaderState> {
   }
   private switchChain = (chain: string = '') => (e?: any) => {
     const ip = chain || this.state.searchIp
-    if (!ip) return
-    this.props.CITAObservables.setServer(ip.startsWith('http') ? ip : `http://${ip}`)
-    const chainIp = ip.startsWith('http') ? ip : `http://${ip}`
+    this.props.CITAObservables.setServer(ip.startsWith('http') ? ip : `https://${ip}`)
+    const chainIp = ip.startsWith('http') ? ip : `https://${ip}`
     window.localStorage.setItem('chainIp', chainIp)
     window.location.reload()
   }

src/initValues.ts

@@ -2,7 +2,7 @@
  * @Author: Keith-CY
  * @Date: 2018-07-22 19:59:22
  * @Last Modified by: Keith-CY
- * @Last Modified time: 2018-08-03 18:01:57
+ * @Last Modified time: 2018-08-15 18:39:21
  */
 
 import { IBlock, IBlockHeader, Transaction, Metadata, ABI } from './typings'
@@ -86,6 +86,7 @@ export const initPanelConfigs: PanelConfigs = {
 }
 
 export const initServerList = (process.env.CHAIN_SERVERS || '').split(',')
+console.log(initServerList)
 export const initPrivateKeyList = []
 export const initError = { message: '', code: '' }
 export const initAccountState = {

src/utils/fetcher.tsx

@@ -53,7 +53,7 @@ export const fetchStatistics = params =>
 
 export const fetchServerList = () =>
   axios
-    .get(`${process.env.PUBLIC}defaultServerList.json`)
+    .get(`${process.env.PUBLIC}/defaultServerList.json`)
     .then((res: AxiosResponse) => res.data)
     .catch(() => {
       throw new Error(ErrorTexts.SERVER_LIST_NOT_FOUND)

yarn.lock

@@ -882,7 +882,7 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-bindings@^1.2.1, bindings@^1.3.0:
+bindings@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
 
@@ -911,15 +911,15 @@ bluebird@^2.9.34:
   version "2.11.0"
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
-bluebird@^3.0.2, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
+bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
 [email protected]:
   version "4.11.6"
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.6, bn.js@^4.4.0, bn.js@^4.6.4:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.6, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
@@ -1802,10 +1802,6 @@ [email protected], crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-js@^3.1.9-1:
-  version "3.1.9-1"
-  resolved "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
-
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -2310,16 +2306,6 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-eccrypto@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/eccrypto/-/eccrypto-1.0.3.tgz#a4120e6ce98b0072c1ceaafdead156f6bb8b24e3"
-  dependencies:
-    elliptic "^6.0.2"
-    es6-promise "^3.0.2"
-    nan "^2.1.0"
-  optionalDependencies:
-    secp256k1 "^2.0.4"
-
 echarts@^4.0.4:
   version "4.1.0"
   resolved "https://registry.npmjs.org/echarts/-/echarts-4.1.0.tgz#d588c95f73c1a9928b9c73d5b769751c3185bcdc"
@@ -2338,7 +2324,7 @@ elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
 
-elliptic@^6.0.0, elliptic@^6.0.2, elliptic@^6.4.0:
+elliptic@^6.0.0, elliptic@^6.4.0:
   version "6.4.0"
   resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
   dependencies:
@@ -2489,10 +2475,6 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-es6-promise@^3.0.2:
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
-
 es6-promise@^4.0.5:
   version "4.2.4"
   resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
@@ -5313,7 +5295,7 @@ mz@^2.6.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-[email protected], nan@^2.0.2, nan@^2.0.8, nan@^2.0.9, nan@^2.1.0, nan@^2.10.0, nan@^2.3.3, nan@^2.4.0, nan@^2.9.2:
+[email protected], nan@^2.0.2, nan@^2.0.8, nan@^2.10.0, nan@^2.3.3, nan@^2.4.0, nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -7201,17 +7183,6 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-secp256k1@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.npmjs.org/secp256k1/-/secp256k1-2.0.10.tgz#c7d6a3c119e1ca44083c367b0715e184907417b3"
-  dependencies:
-    bindings "^1.2.1"
-    bluebird "^3.0.2"
-    bn.js "^4.6.4"
-    elliptic "^6.0.2"
-    nan "^2.0.9"
-    object-assign "^4.0.1"
-
 seek-bzip@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"