add joke

app.js

@@ -19,12 +19,14 @@ var logUtils = require('./utils/logUtils');
 var netease = require('./routes/netease');
 //JsonBird version 1.0
 var v1 = require('./routes/v1');
+//joke
+var joke = require('./routes/joke');
 //test
 var test = require('./routes/test');
 
 var app = express();
-// view engine setup
 app.set('views', path.join(__dirname, 'views'));
+// view engine setup
 app.set('view engine', 'pug');
 app.enable('trust proxy');
 // uncomment after placing your favicon in /public
@@ -44,7 +46,7 @@ app.use(sass({
 app.use('/static/', express.static(path.join(__dirname, 'static')));
 
 /***
- * 全局过滤，统计和日志
+ * 全局过滤:统计和日志
  */
 app.all('*', function(req, res, next) {
     res.header("Access-Control-Allow-Origin", "*");
@@ -64,7 +66,7 @@ app.all('*', function(req, res, next) {
         Referer: ref,
         //Protocol: protocol, 
         OriginalUrl: originalUrl,
-        Time: moment().tz('Asia/ShangHai').format('YYYY-MM-DD HH:mm:ss.ms')
+        Time: moment().tz('Asia/ShangHai').format('YYYY-MM-DD HH:mm:ss.SSS')
     };
     /**
      * 不记录日志和统计的请求:
@@ -93,13 +95,13 @@ app.all('*', function(req, res, next) {
         }
     }
     next();
-
 });
 
 app.use('/', welcome);
 app.use('/test', test);
 app.use('/v1', v1);
 app.use('/netease', netease);
+app.use('/joke', joke);
 
 
 

routes/joke.js

@@ -0,0 +1,40 @@
+var express = require('express');
+var request = require('request');
+var router = express.Router();
+var key = "64a40e3c55e88cc8cd66a78d030bddce";
+router.get('/', function(req, res, next) {
+    var page = req.query.page || 1;
+    var pagesize = req.query.pagesize || 1;
+    var url = "http://japi.juhe.cn/joke/img/text.from?key=" + key + "&page=" + page + "&pagesize=" + pagesize;
+    getJOKE(url, next, function(data) {
+        var output = {
+            data: data,
+            status: {
+                code: 200,
+                message: ''
+            }
+        };
+        if (req.query.callback) {
+            return res.jsonp(output);
+        } else {
+            return res.send(output);
+        }
+    });
+});
+
+function getJOKE(url, next, callback) {
+    request(url, function(err, res, body) {
+        if (!err && res.statusCode == 200) {
+            body = JSON.parse(body);
+            callback && callback(body);
+        } else {
+            var error = new Error(err);
+            error.status = 404;
+            next(error);
+        }
+    });
+}
+
+
+
+module.exports = router;

routes/test.js

@@ -1,9 +1,27 @@
 var express = require('express');
+var request = require('request');
 var router = express.Router();
 
 /* GET home page. */
 router.get('/', function(req, res, next) {
-    res.render('test', { title: 'Express' });
-});
+    //res.render('test', { title: 'Express' });
+    // request('https://bird.ioliu.cn/netease/?playlist_id=10998986', function(err, resp, body) {
+    //     console.log(body);
+    //     res.send(body);
+    // });
+    var mydata = {
+        url: 'CSMBP/data/service/discount/getMinPrice.do?type=MOBILE&token=E0xywTTmPMVVPd5B8u4cPvBMW2B4ZKPwpZ194hyuI%2FoDWG35pqOxAw%3D%3D&lang=zh',
+        page: {
+            "page": {
+                "INTER": "N",
+                "CHANNEL": "Mobile"
+            }
+        },
+        pagebase: 'https://m.csair.com'
+    };
 
+    request('https://m.csair.com/mbpwas.shtml?lang=zh&_1474445794030', { form: mydata }, function(err, resp, body) {
+        console.log(body);
+    });
+});
 module.exports = router;

routes/v1.js

@@ -36,7 +36,7 @@ router.get('/', function(req, res, next) {
         url = url.indexOf('http://') === -1 ? 'http://' + url : url;
         getJSON(url, next, function(data) {
             var output = {
-                data: JSON.parse(data),
+                data: data,
                 status: {
                     code: 200,
                     message: ''
@@ -54,6 +54,7 @@ router.get('/', function(req, res, next) {
 function getJSON(url, next, callback) {
     request(url, function(err, res, body) {
         if (!err && res.statusCode == 200) {
+            body = JSON.parse(body);
             callback && callback(body);
         } else {
             var error = new Error(err);