fix CORS

app.js

@@ -5,12 +5,10 @@ var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
 
-var routes = require('./routes/index');
-var users = require('./routes/users');
-//HOME PAGE
-var home = require('./routes/home');
+//Welcome Page
+var welcome = require('./routes/welcome');
 var index = require('./routes/index');
-//version 1.0
+//JsonBird version 1.0
 var v1 = require('./routes/v1');
 
 var app = express();
@@ -20,11 +18,11 @@ app.listen(process.env.PORT || 5000);
  * 获取引用网站
  */
 app.all('*', function(req, res, next) {
-    // res.header("Access-Control-Allow-Origin", "*");
-    // res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-    // res.header("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS");
-    // res.header("X-Powered-By", '3.2.1');
-    // res.header("Vary", "Origin");
+    res.header("Access-Control-Allow-Origin", "*");
+    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept,Access-Control-Allow-Origin");
+    res.header("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS");
+    res.header("X-Powered-By", '3.2.1');
+    res.header("Vary", "Origin");
     // res.header("Content-Type", "application/json;charset=utf-8");
     console.log('ref:' + req.header('referer'));
     next();
@@ -41,8 +39,7 @@ app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
-app.use('/', home);
-app.use('/user', index);
+app.use('/', welcome);
 app.use('/v1', v1);
 
 // catch 404 and forward to error handler

routes/users.js

@@ -1,9 +0,0 @@
-var express = require('express');
-var router = express.Router();
-
-/* GET users listing. */
-router.get('/', function(req, res, next) {
-  res.send('respond with a resource');
-});
-
-module.exports = router;

routes/v1.js

@@ -2,12 +2,12 @@ var express = require('express');
 var request = require('request');
 var router = express.Router();
 
-router.all('/v1/*', function(req, res, next) {
-    res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-    res.header("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS");
-    res.header("X-Powered-By", '3.2.1');
-    res.header("Vary", "Origin");
+router.all('*', function(req, res, next) {
+    // res.header("Access-Control-Allow-Origin", "*");
+    // res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept,Access-Control-Allow-Origin");
+    // res.header("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS");
+    // res.header("X-Powered-By", '3.2.1');
+    // res.header("Vary", "Origin");
     res.header("Content-Type", "application/json;charset=utf-8");
     next();
 });
@@ -70,7 +70,7 @@ function ip2address(ip,callback){
             callback && callback(body['result']);
         } else {
             console.log(' / request info:'+err);
-            callback && callback(null);
+            callback && callback();
         }
     });
 }