diff --git a/server/web3service/metadata/factory.js b/server/web3service/metadata/factory.js index d7292f5..cff3ecb 100644 --- a/server/web3service/metadata/factory.js +++ b/server/web3service/metadata/factory.js @@ -96,7 +96,7 @@ function init() { 'Contract' ); - registerMetaClass(configDir + 'marketdb_mysql.json', + registerMetaClass(configDir + 'blockchaindb_mysql.json', '', 'MarketDb' ); diff --git a/server/web3service/models/log.js b/server/web3service/models/log.js index d585d59..d55f768 100644 --- a/server/web3service/models/log.js +++ b/server/web3service/models/log.js @@ -18,7 +18,7 @@ class Log extends BaseModel { fields.push([key, params[key]]); } } - await this.getSession().marketConn + await this.getSession().blockChainConn ( 'insert', 't_log', diff --git a/server/web3service/models/transaction.js b/server/web3service/models/transaction.js index 6f016da..2d3507a 100644 --- a/server/web3service/models/transaction.js +++ b/server/web3service/models/transaction.js @@ -9,7 +9,7 @@ class Transaction extends BaseModel { seqId: 0 }; const nowTime = utils.getUtcTime(); - const lastId = await this.getSession().marketConn + const lastId = await this.getSession().blockChainConn ( 'insertEx', 't_transaction', @@ -26,7 +26,7 @@ class Transaction extends BaseModel { } async update(idx, fields) { - const err = await this.getSession().marketConn + const err = await this.getSession().blockChainConn ( 'update', 't_transaction', diff --git a/server/web3service/models/used_tokenid.js b/server/web3service/models/used_tokenid.js index c310ba3..6e1479d 100644 --- a/server/web3service/models/used_tokenid.js +++ b/server/web3service/models/used_tokenid.js @@ -14,7 +14,7 @@ class UsedTokenId extends BaseModel { ['createtime', nowTime], ['modifytime', nowTime], ]; - await this.getSession().marketConn + await this.getSession().blockChainConn ( 'insert', 't_used_token_id', @@ -23,7 +23,7 @@ class UsedTokenId extends BaseModel { } async find(tokenId) { - const {err, row} = await this.getSession().marketConn + const {err, row} = await this.getSession().blockChainConn ( 'ormSelectOne', 't_used_token_id', diff --git a/server/web3service/session.js b/server/web3service/session.js index 149bff7..915e91d 100644 --- a/server/web3service/session.js +++ b/server/web3service/session.js @@ -65,9 +65,9 @@ class Session { return utils.jsonEncode(this.req.query); } - async getMarketDb() { + async getBlockChainDb() { const idx = 0; - const dbKey = 'MarketDb' + idx; + const dbKey = 'BlockChainDb' + idx; if (this.useConns[dbKey]) { return this.useConns[dbKey]; } @@ -106,8 +106,8 @@ class Session { return metaFactory[name](this, ...args); } - async marketConn(method, ...args) { - const conn = await this.getMarketDb(); + async blockChainConn(method, ...args) { + const conn = await this.getBlockChainDb(); const ret = await conn[method](...args); if (ret.err){ this.throwError(500, 'internal error');