Browse Source

fix some error

dotos 9 years ago
parent
commit
3a256ecf86
3 changed files with 38 additions and 34 deletions
  1. 20 18
      configs/config.js
  2. 15 13
      routes/netease.js
  3. 3 3
      routes/v1.js

+ 20 - 18
configs/config.js

@@ -1,19 +1,21 @@
-module.exports = {
-    //site config
-    site: {
-        title: 'JsonBird',
-        description: '业界领先的远程 JSON 代理服务'
-    },
-    //mysql config
-    mysql_dev: {
-        host: 'qdm16395144.my3w.com',
-        user: 'qdm16395144',
-        password: 'abc123456',
-        port: '3306',
-        database: 'qdm16395144_db',
-        connectionLimit: 10,
-        supportBigNumbers: true,
-        multipleStatements: true,
-        insecureAuth: true
-    }
+module.exports = {
+    //site config
+    site: {
+        title: 'JsonBird',
+        author: 'xCss',
+        concat: 'xioveliu@gmail.com',
+        description: '业界领先的远程 JSON 代理服务'
+    },
+    //mysql config
+    mysql_dev: {
+        host: 'qdm16395144.my3w.com',
+        user: 'qdm16395144',
+        password: 'abc123456',
+        port: '3306',
+        database: 'qdm16395144_db',
+        connectionLimit: 10,
+        supportBigNumbers: true,
+        multipleStatements: true,
+        insecureAuth: true
+    }
 };
 };

+ 15 - 13
routes/netease.js

@@ -9,31 +9,33 @@ router.get('/', function(req, res, next) {
     var id = req.query.id;
     var id = req.query.id;
     var playlist_id = req.query.playlist_id;
     var playlist_id = req.query.playlist_id;
 
 
-    var url = 'http://music.163.com/api/song/detail/?id='+id+'&ids=%5B'+id+'%5D';
-    if(playlist_id){
-        url = 'http://music.163.com/api/playlist/detail/?id='+playlist_id;
+    var url = 'http://music.163.com/api/song/detail/?id=' + id + '&ids=%5B' + id + '%5D';
+    if (playlist_id) {
+        url = 'http://music.163.com/api/playlist/detail/?id=' + playlist_id;
     }
     }
-    netease_http(url,function(data){
+    netease_http(url, nex, function(data) {
         return res.send(data);
         return res.send(data);
     });
     });
 });
 });
 
 
-function netease_http(url,callback){
+function netease_http(url, next, callbackt) {
     var options = {
     var options = {
         url: url,
         url: url,
         headers: {
         headers: {
-            Cookie:'appver=1.5.0.75771;',
-            referer:'http://music.163.com'
+            Cookie: 'appver=1.5.0.75771;',
+            referer: 'http://music.163.com'
         }
         }
     };
     };
-    request(options,function(err,res,body){
-        if(!err && res.statusCode == 200){
+    request(options, function(err, res, body) {
+        if (!err && res.statusCode == 200) {
             body = JSON.parse(body);
             body = JSON.parse(body);
-            callback&&callback(body);
-        }else{
-            console.log(err);
+            callback && callback(body);
+        } else {
+            var error = new Error(err);
+            error.status = 404;
+            next(error);
         }
         }
     });
     });
 }
 }
 
 
-module.exports = router;
+module.exports = router;

+ 3 - 3
routes/v1.js

@@ -29,17 +29,17 @@ router.get('/', function(req, res, next) {
         var url = originalUrl.replace('/v1/?url=', '');
         var url = originalUrl.replace('/v1/?url=', '');
         url = url.indexOf('?') === -1 ? url.replace('&', '?') : url;
         url = url.indexOf('?') === -1 ? url.replace('&', '?') : url;
         url = url.indexOf('http://') === -1 ? 'http://' + url : url;
         url = url.indexOf('http://') === -1 ? 'http://' + url : url;
-        getJSON(url, function(data) {
+        getJSON(url, next, function(data) {
             if (req.query.callback) {
             if (req.query.callback) {
                 return res.jsonp(data);
                 return res.jsonp(data);
             } else {
             } else {
                 return res.send(data);
                 return res.send(data);
             }
             }
-        }, next);
+        });
     }
     }
 });
 });
 
 
-function getJSON(url, callback, next) {
+function getJSON(url, next, callback) {
     request(url, function(err, res, body) {
     request(url, function(err, res, body) {
         if (!err && res.statusCode == 200) {
         if (!err && res.statusCode == 200) {
             callback && callback(body);
             callback && callback(body);