完成web3admin改造

server/bin/web3admin/config/marketdb_mysql.json

@@ -1,5 +1,5 @@
 {
-  "host": "192.168.100.21",
+  "host": "127.0.0.1",
   "port": 3306,
   "user": "root",
   "passwd": "keji178",

server/web3admin/be/controllers/buyrecord.js

@@ -1,16 +1,11 @@
-const utils = require('../utils');
+const app = require('j7/app');
-const db = require('../db');
-const dbhelper = require('../dbhelper');
 
-async function search(req, rsp) {
+async function search(session) {
-  const {err, rows} = await db.execQuery(
+  const rows = await session.marketConn(
+    'execQuery',
     'SELECT * FROM t_buy_record',
     []
   );
-  if (err) {
-    utils.rspErr(1, 'db error ' + err);
-    return;
-  }
   const data = {
     'rows': []
   };
@@ -22,14 +17,13 @@ async function search(req, rsp) {
       'modifytime': row['modifytime'],
     });
   });
-  utils.rspData(
+  session.rspData(
-    rsp,
     data
   );
 }
 
 function init() {
-  utils.registerHandler('buyrecord', 'search', search);
+  app.registerHandler('buyrecord', 'search', search);
 }
 
 exports.init = init;

server/web3admin/be/controllers/factory.js

@@ -1,5 +1,15 @@
-function init() {
+const controllers = {};
 
+function add(name) {
+  controllers[name] = require(`./${name}`);
+  controllers[name].init();
+}
+
+function init() {
+  add('order');
+  add('buyrecord');
+  add('log');
+  add('nft');
 }
 
 exports.init = init;

server/web3admin/be/controllers/log.js

@@ -1,16 +1,11 @@
-const utils = require('../utils');
+const app = require('j7/app');
-const db = require('../db');
-const dbhelper = require('../dbhelper');
 
-async function search(req, rsp) {
+async function search(session) {
-  const {err, rows} = await db.execQuery(
+  const rows = await session.marketConn(
+    'execQuery',
     'SELECT * FROM t_log',
     []
   );
-  if (err) {
-    utils.rspErr(1, 'db error ' + err);
-    return;
-  }
   const data = {
     'rows': []
   };
@@ -26,14 +21,11 @@ async function search(req, rsp) {
       'modifytime': row['modifytime'],
     });
   });
-  utils.rspData(
+  session.rspData(data);
-    rsp,
-    data
-  );
 }
 
 function init() {
-  utils.registerHandler('log', 'search', search);
+  app.registerHandler('log', 'search', search);
 }
 
 exports.init = init;

server/web3admin/be/controllers/nft.js

@@ -1,16 +1,11 @@
-const utils = require('../utils');
+const app = require('j7/app');
-const db = require('../db');
-const dbhelper = require('../dbhelper');
 
-async function search(req, rsp) {
+async function search(session) {
-  const {err, rows} = await db.execQuery(
+  const {err, rows} = await session.marketConn(
+    'execQuery',
     'SELECT * FROM t_nft',
     []
   );
-  if (err) {
-    utils.rspErr(1, 'db error ' + err);
-    return;
-  }
   const data = {
     'rows': []
   };
@@ -26,14 +21,11 @@ async function search(req, rsp) {
       'modifytime': row['modifytime'],
     });
   });
-  utils.rspData(
+  session.rspData(data);
-    rsp,
-    data
-  );
 }
 
 function init() {
-  utils.registerHandler('nft', 'search', search);
+  app.registerHandler('nft', 'search', search);
 }
 
 exports.init = init;

server/web3admin/be/controllers/order.js

@@ -1,28 +1,21 @@
-const utils = require('../utils');
+const app = require('j7/app');
-const db = require('../db');
-const dbhelper = require('../dbhelper');
 
-async function search(req, rsp) {
+async function search(session) {
-  const {err, rows} = await db.execQuery(
+  const rows = await session.marketConn(
+    'execQuery',
     'SELECT * FROM t_box_order',
     []
   );
-  if (err) {
-    utils.rspErr(1, 'db error ' + err);
-    return;
-  }
   const data = {
 
   };
-  utils.rspData(
+  session.rspData({
-    rsp,
-    {
     'rows': rows
   });
 }
 
 function init() {
-  utils.registerHandler('order', 'search', search);
+  app.registerHandler('order', 'search', search);
 }
 
 exports.init = init;

server/web3admin/be/metadata/factory.js

@@ -101,6 +101,11 @@ function init() {
                     'MarketDb'
                    );
   load();
+  {
+    traverseMetaList('MarketDb', (dbConf, idx) => {
+      app.registerDb('MarketDb' + idx, dbConf);
+    });
+  }
  }
 
 function getMetaClass(name) {

server/web3admin/be/session.js

@@ -106,6 +106,23 @@ class Session {
     return metaFactory[name](this, ...args);
   }
 
+  async marketConn(method, ...args) {
+    const conn = await this.getMarketDb();
+    const ret = await conn[method](...args);
+    if (ret.err){
+      this.throwError(500, 'internal error');
+      log.error(ret.err);
+      return;
+    }
+    if (utils.hasKey(ret, 'row')) {
+      return ret['row'];
+    } else if (utils.hasKey(ret, 'rows')) {
+      return ret['rows'];
+    } else {
+      return null;
+    }
+  }
+
 }
 
 module.exports = Session;

third_party/j7

@@ -1 +1 @@
-Subproject commit b48d506996787f8ecd00b3dfded4df10b41ddd88
+Subproject commit c243aa73026b9e41c9154f26049d6f98bdf01935