Merge branch 'master' of https://git.faronear.org/tic/console.web.site

server.js

@@ -101,14 +101,14 @@ async function init(){  /*** 设置全局对象 ***/
   }else if ('httpall'===wo.Config.protocol) {
     let portHttp=wo.Config.port?wo.Config.port:80 // 如果port参数已设置，使用它；否则默认为80
     require('http').createServer(server).listen(portHttp, function(err) {
-      console.log('Server listening on %s://%s:%d for %s environment', wo.Config.protocol, wo.Config.host, portHttp, server.settings.env)
+      console.log('Server listening on %s://%s:%d for %s environment', 'httpall:http', wo.Config.host, portHttp, server.settings.env)
     })
 
     let portHttps=(wo.Config.port && wo.Config.port!==80)?wo.Config.port+443:443 // 如果port参数已设置，使用它+443；否则默认为443
     require('https').createServer({
       key: fs.readFileSync(wo.Config.sslKey), cert: fs.readFileSync(wo.Config.sslCert) // , ca: [ fs.readFileSync(wo.Config.sslCA) ] // https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
     }, server).listen(portHttps, function(err){
-      console.log('Server listening on %s://%s:%d for %s environment', wo.Config.protocol, wo.Config.host, portHttps, server.settings.env)
+      console.log('Server listening on %s://%s:%d for %s environment', 'httpall:https', wo.Config.host, portHttps, server.settings.env)
     })  
   }
 

src/services/api/tic-bg.js

@@ -1,7 +1,7 @@
 import ticCrypto from 'tic.crypto'
 
-export const secword2PubKey = secword => ticCrypto.seckey2pubkey(secword)
-export const secword2Address = secword => ticCrypto.secword2address(secword)
-export const isAddress = address => ticCrypto.isAddress(address)
-export const secword2Account = secword => ticCrypto.secword2account(secword)
+export const seckey2pubkey = seckey => ticCrypto.seckey2pubkey(seckey)
+export const secword2address = secword => ticCrypto.secword2address(secword)
+export const secword2account = secword => ticCrypto.secword2account(secword)
 export const randomSecword = lang => ticCrypto.randomSecword(lang)
+export const isAddress = address => ticCrypto.isAddress(address)

src/services/api/tic.js

@@ -4,9 +4,9 @@ import * as worker from 'workerize-loader!./tic-bg'
 const instance = worker()
 
 export default {
-  secword2PubKey: async secword => instance.secword2PubKey(secword),
-  secword2Address: async secword => instance.secword2Address(secword),
+  seckey2pubkey: async seckey => instance.seckey2pubkey(seckey),
+  secword2address: async secword => instance.secword2address(secword),
   isAddress: async address => instance.isAddress(address),
-  secword2Account: async secword => instance.secword2Account(secword),
+  secword2account: async secword => instance.secword2account(secword),
   randomSecword: async lang => instance.randomSecword(lang),
 }

src/services/axios.js

@@ -2,4 +2,4 @@
 // import app from './app'
 
 // 控制台应当默认访问控制台所在主机(localhost 或者 window.location.hostname)的 TIC后台，或者访问用户自己设置的主机。
-axios.defaults.baseURL = 'http://localhost:6842/api/'
+axios.defaults.baseURL = `http://${window.location.hostname}:6842/api/`

src/store/modules/login.js

@@ -10,6 +10,7 @@ export default {
     mnemonic: '',
     errorMnemonic: '',
     signing: false,
+    renewing: false,
   },
 
   getters: {
@@ -36,7 +37,7 @@ export default {
   actions: {
     async login({ state, commit }) {
       commit('updateSign', true)
-      const account = (await ticApi.secword2Account(state.mnemonic)) || {}
+      const account = (await ticApi.secword2account(state.mnemonic)) || {}
       console.log(account)
       commit('updateSign', false)
       if (await ticApi.isAddress(account.address)) {
@@ -48,7 +49,7 @@ export default {
     },
     async createSecword({ state, commit }) {
       alert('entering createSecword')
-      let secword = await ticApi.randomSecword('English')
+      let secword = await ticApi.randomSecword() // 这句导致报错 "window is not defined"。猜测是 bitcore-mnemonic 不能在前端页面里使用。
       alert('after secword')
       console.info('secword=' + secword)
       alert('secword=' + secword)

src/views/Login.vue

@@ -12,6 +12,7 @@
       :error-messages="errorMnemonic"
       :value="mnemonic"
       :loading="signing"
+      :renewing="renewing"
       @input="updateMnemonic"
       @keyup.13="login"
       :label="$t('login.inputLabel')" />
@@ -26,7 +27,7 @@
       item-text="label"
     />
 
-    <v-btn :loading="renewing" dark large color="transparent" @click="createSecword">
+    <v-btn :renewing="renewing" dark large color="transparent" @click="createSecword">
       {{ $t('login.secwordBtn') }}
     </v-btn>
 
@@ -53,6 +54,7 @@ export default {
       'mnemonic',
       'errorMnemonic',
       'signing',
+      'renewing',
     ]),
     ...mapGetters([
       'inputError',