接口日志优化

@@ -23,6 +23,6 @@ app.engine('.hbs', hbs({
 }));
 }));
 
 
 // router
 // router
-app.use(require('./router'));
+require('./router')(app);
 
 
 module.exports = app;
 module.exports = app;

@@ -6,19 +6,24 @@
 
 
 'use strict';
 'use strict';
 
 
-const router = require('express').Router();
-const cRoot = './controllers';
+
 let API = require('../../library/api');
 let API = require('../../library/api');
+
 // Your controller here
 // Your controller here
-router.get('/', function(req, res) {
-    let api = new API();
-    let name = '/productColor/queryProductColors';
-    api.get(name, {}).then(function(body) {
-        res.send(body);
-    }).catch(function(error) {
-        res.send('some thing wrong');
+let router = function(app) {
+    app.get('/', function(req, res) {
+        let api = new API();
+        let name = '/productColor/queryProductColors';
+
+        api.get(name, {}).then(function(body) {
+            res.send(body);
+        }).catch(function() {
+            res.send('something wrong');
+        });
     });
     });
-});
+};
+
+
 
 
 
 
 module.exports = router;
 module.exports = router;

@@ -12,11 +12,43 @@ const log = require('./logger');
 const api = require('../config/common').domains.api;
 const api = require('../config/common').domains.api;
 const Timer = require('./timer');
 const Timer = require('./timer');
 
 
+/**
+ * 日志打印
+ * @param {Object} requestPromise 请求的promise对象
+ */
+function logPrint(options, requestPromise) {
+
+    // 接口统计
+    let timer = new Timer();
+
+    timer.put('getApi');// 统计时间开始
+
+    let method = options.method ? options.method : 'get';
+
+    log.info('API Begin %s call: %s, parms: %j',
+        method, options.url, options.qs, {});
+    requestPromise.then((body) => {
+        let duration = timer.put('getApi');// 接口返回
 
 
-const ApiUrl = api;
+        log.info('API %s res: %s, parms: %j , durationMs: %d ms , body: %s',
+            method, options.url, options.qs, duration, body);
+    }).catch((error) => {
+        let duration = timer.put('getApi');// 接口返回
+
+        log.error('API %s res: %s, parms: %j , durationMs: %d ms error: %s , statusCode: %d',
+            method, options.url, options.qs, duration, error.message, error.statusCode);
+    });
+}
+
+
+let ApiUrl;
 
 
 class API {
 class API {
 
 
+    constructor(url) {
+        ApiUrl = url || api;
+    }
+
     /**
     /**
      * get
      * get
      * @param url String
      * @param url String
@@ -29,20 +61,11 @@ class API {
             qs: data
             qs: data
         };
         };
 
 
-        let timer = new Timer();
-        timer.put('getApi');// 统计时间开始
+        let requestPromise = rp(options);
 
 
-        let ret = rp(options);
+        logPrint(options, requestPromise);// 日志打印
 
 
-        ret.then((body)=>{
-            let duration = timer.put('getApi');// 接口返回
-            log.info('API GET: %s, parms: %j , durationMs: %d ms , body: %s', options.url, options.qs, duration, body);
-        }).catch((error)=>{
-            let duration = timer.put('getApi');// 接口返回
-            log.error('API GET: %s, parms: %j , durationMs: %d ms error: %s , statusCode: %d', options.url, options.qs, duration, error.message, error.statusCode);
-        });
-
-        return ret;
+        return requestPromise;
     }
     }
 
 
     /**
     /**
@@ -50,13 +73,19 @@ class API {
      * @params: urls => Array[Object[url[string], data[object]]]
      * @params: urls => Array[Object[url[string], data[object]]]
      */
      */
     multiGet(urls) {
     multiGet(urls) {
-        var rps = [];
+        let rps = [];
 
 
         _.forEach(urls, function(el) {
         _.forEach(urls, function(el) {
-            rps.push(rp({
+            let options = {
                 url: `${ApiUrl}${el.url}`,
                 url: `${ApiUrl}${el.url}`,
                 qs: el.data
                 qs: el.data
-            }));
+            };
+
+            let requestPromise = rp(options);
+
+            logPrint(options, requestPromise);// 打印日志
+
+            rps.push(requestPromise);
         });
         });
 
 
         return Promise.all(rps).then((d) => {
         return Promise.all(rps).then((d) => {
@@ -70,11 +99,17 @@ class API {
      * @param data Obejct
      * @param data Obejct
      */
      */
     post(url, data) {
     post(url, data) {
-        return rp({
+        let options = {
             url: `${ApiUrl}${url}`,
             url: `${ApiUrl}${url}`,
             method: 'post',
             method: 'post',
             form: data
             form: data
-        });
+        };
+
+        let requestPromise = rp(options);
+
+        logPrint(options, requestPromise);// 打印日志
+
+        return requestPromise;
     }
     }
 }
 }
 
 

@@ -24,6 +24,7 @@ class Timer {
 
 
         if (labelTime) {
         if (labelTime) {
             let duration = process.hrtime(labelTime);
             let duration = process.hrtime(labelTime);
+
             return this._round(duration[1]);
             return this._round(duration[1]);
         } else {
         } else {
             this.timers[label] = process.hrtime();
             this.timers[label] = process.hrtime();