From 43a825c7aa691e728c9945015de0cf75159ee0fe Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Tue, 9 Apr 2019 09:37:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20ActTransfer?= =?UTF-8?q?=20=E4=B8=BA=20ActionTransfer=EF=BC=8C=E8=B4=AF=E5=BD=BB?= =?UTF-8?q?=E2=80=9C=E5=85=A8=E7=A7=B0=E5=91=BD=E5=90=8D=E2=80=9D=E7=9A=84?= =?UTF-8?q?=E8=A7=84=E8=8C=83=EF=BC=8C=E4=BB=A5=E5=B0=BD=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E6=B6=88=E7=81=AD=E6=89=80=E6=9C=89=E5=8F=AF=E8=83=BD=E7=9A=84?= =?UTF-8?q?=E6=AD=A7=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/tic.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/tic.js b/src/services/tic.js index 5d6609c..e8c359a 100644 --- a/src/services/tic.js +++ b/src/services/tic.js @@ -2,7 +2,7 @@ import axios from 'axios' import * as Ticrypto from 'tic.crypto' import * as ticAction from 'tic.action' -const TicActTransfer = ticAction.ActTransfer +const TicActionTransfer = ticAction.ActionTransfer const TIC_TXFEE = 10 @@ -91,7 +91,7 @@ export class TIC { if (!toAddress || !amount) { throw new Error('ERROR:RequiredParamsMissing') } // amount cannot be zero - let action = new TicActTransfer({ + let action = new TicActionTransfer({ amount: parseInt(amount), toAddress: toAddress, fee: option.gasFee, @@ -122,7 +122,7 @@ export class TIC { if (!option.toAddress || !option.amount) { throw new Error('ERROR:RequiredParamsMissing') } - let action = new TicActTransfer({ + let action = new TicActionTransfer({ amount: parseInt(option.amount), toAddress: option.toAddress, fee: option.fee || this._defaultFee, From 65262d479e527f298045c41c43abc17b3aa685f0 Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Thu, 11 Apr 2019 16:20:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[package.json]=20=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E4=BA=86=E6=96=B0=E7=9A=84=20npm=20run=20=E7=B3=BB=E5=88=97?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=EF=BC=9A?= =?UTF-8?q?=20dev/debug/daemon=20=E4=BD=BF=E7=94=A8=20node=20=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=20dev.sup/debug.sup/daemon.pm2=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20supervisor=20=E6=88=96=20pm2=20=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E7=9C=8B=E8=84=9A=E6=9C=AC=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E5=B0=B1=E8=83=BD=E7=90=86=E8=A7=A3=E5=85=B6=E7=89=B9=E5=BE=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dd912be..dad9286 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "dev": "vue-cli-service serve", "dist": "vue-cli-service build", "deploy": "node ./deploy.js", - "daemon:sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist server.js", - "daemon": "cross-env NODE_ENV=production pm2 start server.js -n node.console.web", + "daemon": "cross-env NODE_ENV=production node server.js", + "daemon.sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist server.js", + "daemon.pm2": "cross-env NODE_ENV=production pm2 start server.js -n node.console.web", "lint": "vue-cli-service lint", "test:unit": "vue-cli-service test:unit" }, From ca55fede93519fb3a406cd1086a43bc4ffb042f7 Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Sat, 13 Apr 2019 14:15:04 +0800 Subject: [PATCH 3/4] Rename Node to Netnode. --- src/i18n/en.js | 8 ++++---- src/i18n/zh-CN.js | 2 +- src/router.js | 6 +++--- src/store/modules/index.js | 2 +- src/store/modules/{node.js => netnode.js} | 14 +++++++------- src/store/modules/network.js | 2 +- src/store/rootStore.js | 2 +- src/views/{Node.vue => Netnode.vue} | 14 +++++++------- 8 files changed, 25 insertions(+), 25 deletions(-) rename src/store/modules/{node.js => netnode.js} (71%) rename src/views/{Node.vue => Netnode.vue} (91%) diff --git a/src/i18n/en.js b/src/i18n/en.js index 81e25a2..a1d6a83 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -8,7 +8,7 @@ export default { }, home: { titleOwner: 'Account', - titleNode: 'Node', + titleNode: 'Netnode', titleNetwork: 'Network', titleChain: 'Data', titleToken: 'Token', @@ -28,8 +28,8 @@ export default { tableNone: '暂无数据', }, network: { - tableHeader: 'Current neighbouring node list', - searchHolder: 'Please input node owner address or network url', + tableHeader: 'Current neighbouring netnode list', + searchHolder: 'Please input netnode owner address or network url', thIndex: 'Nr.', thAccessPoint: 'Url', thStatus: 'Status', @@ -45,7 +45,7 @@ export default { thHash: 'Hash', tableNone: '暂无数据', }, - node: { + netnode: { tableHeader: '本节点打包的区块列表', searchHolder: '输入要查询的区块高度或者区块哈希', thHeight: '区块高度', diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 3329470..0f47308 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -45,7 +45,7 @@ export default { thHash: '区块哈希', tableNone: '暂无数据', }, - node: { + netnode: { tableHeader: '本节点打包的区块列表', searchHolder: '输入要查询的区块高度或者区块哈希', thHeight: '区块高度', diff --git a/src/router.js b/src/router.js index 1a8f898..0999bf3 100644 --- a/src/router.js +++ b/src/router.js @@ -6,7 +6,7 @@ import Home from './views/Home' import Login from './views/Login' import Owner from './views/Owner' import Chain from './views/Chain' -import Node from './views/Node' +import Netnode from './views/Netnode' import Network from './views/Network' import Market from './views/Market' @@ -27,8 +27,8 @@ const router = new Router({ component: Owner, }, { - path: 'node', - component: Node, + path: 'netnode', + component: Netnode, }, { path: 'network', diff --git a/src/store/modules/index.js b/src/store/modules/index.js index c582df9..d2bedd3 100644 --- a/src/store/modules/index.js +++ b/src/store/modules/index.js @@ -1,6 +1,6 @@ export { default as chain } from './chain' export { default as market } from './market' export { default as network } from './network' -export { default as node } from './node' +export { default as netnode } from './netnode' export { default as owner } from './owner' export { default as login } from './login' diff --git a/src/store/modules/node.js b/src/store/modules/netnode.js similarity index 71% rename from src/store/modules/node.js rename to src/store/modules/netnode.js index 7bdc402..4edbdb0 100644 --- a/src/store/modules/node.js +++ b/src/store/modules/netnode.js @@ -5,13 +5,13 @@ export default { state: { pageEntity: [5, 10, 25], headers: [ - { text: 'node.thHeight', value: 'height', align: 'center' }, - { text: 'node.thType', value: 'type', align: 'center' }, - { text: 'node.thHash', value: 'hash', align: 'center' }, - { text: 'node.thTimestamp', value: 'timestamp', align: 'center' }, - // { text: 'node.thWinner', value: 'winnerPubkey', align: 'center' }, - { text: 'node.thPacker', value: 'packerPubkey', align: 'center' }, - { text: 'node.thRewardPacker', value: 'rewardPacker', align: 'center' }, + { text: 'netnode.thHeight', value: 'height', align: 'center' }, + { text: 'netnode.thType', value: 'type', align: 'center' }, + { text: 'netnode.thHash', value: 'hash', align: 'center' }, + { text: 'netnode.thTimestamp', value: 'timestamp', align: 'center' }, + // { text: 'netnode.thWinner', value: 'winnerPubkey', align: 'center' }, + { text: 'netnode.thPacker', value: 'packerPubkey', align: 'center' }, + { text: 'netnode.thRewardPacker', value: 'rewardPacker', align: 'center' }, ], blockList: [ { diff --git a/src/store/modules/network.js b/src/store/modules/network.js index 94cb4e3..5094703 100644 --- a/src/store/modules/network.js +++ b/src/store/modules/network.js @@ -38,7 +38,7 @@ export default { actions: { async updateNetInfo({ state, commit }) { - let result = await axios.post('Node/nodeStat', {}) + let result = await axios.post('Netnode/nodeStat', {}) commit('setNodeNumber', (result && result.data) ? result.data.length : 0) diff --git a/src/store/rootStore.js b/src/store/rootStore.js index 3ea1af1..a9e35c0 100644 --- a/src/store/rootStore.js +++ b/src/store/rootStore.js @@ -29,7 +29,7 @@ const sideMenus = [ { title: 'home.titleNode', icon: 'all_inclusive', - path: '/node', + path: '/netnode', }, { title: 'home.titleNetwork', diff --git a/src/views/Node.vue b/src/views/Netnode.vue similarity index 91% rename from src/views/Node.vue rename to src/views/Netnode.vue index 6baf5d5..83a9863 100644 --- a/src/views/Node.vue +++ b/src/views/Netnode.vue @@ -1,5 +1,5 @@  @@ -58,10 +58,10 @@ import { createNamespacedHelpers, } from 'vuex' -const { mapState, mapGetters, mapActions, mapMutations } = createNamespacedHelpers('node') +const { mapState, mapGetters, mapActions, mapMutations } = createNamespacedHelpers('netnode') export default { - name: 'Node', + name: 'Netnode', computed: { ...mapState([ @@ -94,7 +94,7 @@ export default {