Przeglądaj źródła

add ip2location

dotos 9 lat temu
rodzic
commit
a8a0243136
4 zmienionych plików z 29 dodań i 12 usunięć
  1. 3 0
      app.js
  2. 6 7
      public/css/style.css
  3. 15 1
      routes/home.js
  4. 5 4
      views/welcome.pug

+ 3 - 0
app.js

@@ -4,6 +4,7 @@ var favicon = require('serve-favicon');
 var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
+var request = require('request');
 
 var routes = require('./routes/index');
 var users = require('./routes/users');
@@ -76,4 +77,6 @@ app.use(function(err, req, res, next) {
     });
 });
 
+
+
 module.exports = app;

+ 6 - 7
public/css/style.css

@@ -29,18 +29,17 @@ html,body{height:100%;overflow: hidden;background: -webkit-linear-gradient(300de
   width:100%;
   color:#fff;
 }
-.section-center .container .cover-heading{
+.section-center .container .cover{
+    font-size:18px;  
+    margin-bottom: 30px;
+    font-weight: 400;
+}
+.section-center .container .heading{
     margin-bottom:10px;
     text-shadow: 1px 1px 1px rgba(0,0,0,.3);
     font-weight: 100;
     font-size: 4.5rem;
 }
-.section-center .container .cover-description{    
-    margin-bottom: 30px;
-    font-weight: 400;
-    font-size: 18px;
-}
-
 .btn {
     display: inline-block;
     margin-bottom: 0;

+ 15 - 1
routes/home.js

@@ -23,7 +23,21 @@ router.get('/', function(req, res, next) {
     //         issue:'https://github.com/xCss/JsonBird/issues'
     //     }
     // });
-    res.render('welcome',{title:'Welcome'});
+    var ip = req.ip;
+    ip2address(ip,function(data){
+        res.render('welcome',{title:'Welcome | JsonBird - 业界领先的远程 JSON 代理服务',address:data.area+data.location});
+    });
+    
 });
 
+function ip2address(ip,callback){
+    request('http://apis.juhe.cn/ip/ip2addr?ip='+ip+'&key=28c0a6a5eb9cca3f38bc5877a83c9868', function(err, res, body) {
+        if (!err && res.statusCode == 200 && body.resultCode==200) {
+            callback && callback(body.result);
+        } else {
+            console.log(err);
+        }
+    }
+};
+
 module.exports = router;

+ 5 - 4
views/welcome.pug

@@ -3,9 +3,10 @@ extends layout
 block content
 	div.section-center
 		div.container
-			div.cover-heading JsonBird
-			div.cover-description 业界领先的远程 JSON 代理服务
-			div.cover-action
+			div.cover.heading JsonBird
+			div.cover.description 业界领先的远程 JSON 代理服务
+			div.cover.address 欢迎来自#{address}的朋友
+			div.cover.action
 				a.btn.btn-ghost-light(href="/v1/?url=http://www.bing.com/HPImageArchive.aspx?format=js&idx=16&n=1") Quick Start
 
 	script(src="/libs/three/three.min.js")
@@ -27,7 +28,7 @@ block content
 		window.onload = function(){
 			init();
 			animate();
-			//- baidu Ans
+			//- baidu Analytics
 			var _hmt = _hmt || [];
 			var hm = document.createElement("script");
 			hm.src = "//hm.baidu.com/hm.js?99d1e1ee6b085485bc6ec3e23b821b49";