dotos 9 éve
szülő
commit
2cbe797c0f
5 módosított fájl, 15 hozzáadás és 7 törlés
  1. 3 2
      app.js
  2. 6 1
      configs/config.js
  3. 1 0
      package.json
  4. 3 2
      routes/welcome.js
  5. 2 2
      views/welcome.pug

+ 3 - 2
app.js

@@ -6,7 +6,8 @@ var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
 var moment = require('moment');
-//暂时不需要本地化
+var timezone = require('moment-timezone');
+//本地化
 moment.locale('zh-cn');
 //Welcome Page
 var welcome = require('./routes/welcome');
@@ -41,7 +42,7 @@ app.all('*', function(req, res, next) {
         Referer: ref,
         //Protocol: protocol, 
         OriginalUrl: originalUrl,
-        Time: moment().format('YYYY-MM-DD HH:mm:ss.ms')
+        Time: moment().tz('Asia/ShangHai').format('YYYY-MM-DD HH:mm:ss.ms')
     };
     /**
      * 不记录日志和统计的请求:

+ 6 - 1
configs/config.js

@@ -1,5 +1,10 @@
 module.exports = {
-    welcome: 'JsonBird - 业界领先的远程 JSON 代理服务',
+    //site config
+    site: {
+        title: 'JsonBird',
+        description: '业界领先的远程 JSON 代理服务'
+    },
+    //mysql config
     mysql_dev: {
         host: 'qdm16395144.my3w.com',
         user: 'qdm16395144',

+ 1 - 0
package.json

@@ -28,6 +28,7 @@
     "express": "~4.13.4",
     "express-generator": "^4.13.4",
     "moment": "^2.15.0",
+    "moment-timezone": "^0.5.5",
     "morgan": "~1.7.0",
     "mysql": "^2.11.1",
     "pug": "^2.0.0-beta6",

+ 3 - 2
routes/welcome.js

@@ -1,6 +1,6 @@
 var express = require('express');
 var request = require('request');
-var config = require('../configs/config');
+var config = require('../configs/config').site;
 var router = express.Router();
 
 /* GET home page. */
@@ -8,7 +8,8 @@ router.get('/', function(req, res, next) {
     var ip = req.ip;
     ip2addr(ip, function(data) {
         var params = {
-            title: 'Welcome | ' + config.welcome
+            head: config.title,
+            title: 'Welcome | ' + config.title + ' - ' + config.description
         };
         if (data) {
             params['address'] = '欢迎来自' + data.area + data.location + '的朋友';

+ 2 - 2
views/welcome.pug

@@ -3,8 +3,8 @@ extends layout
 block content
     div.section-center
         div.container
-            div.cover.heading JsonBird
-            div.cover.description 业界领先的远程 JSON 代理服务<br>#{address}
+            div.cover.heading #{head}
+            div.cover.description #{description}<br>#{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