From 8e8bc28d12857437bdd7ea7bdec582be600fa881 Mon Sep 17 00:00:00 2001
From: Dotos <yy.liu@foxmail.com>
Date: Thu, 22 Dec 2016 10:16:52 +0800
Subject: [PATCH] x

---
 routes/index.js     | 9 +++++----
 utils/bingUtils.js  | 2 +-
 utils/qiniuUtils.js | 2 +-
 views/index.pug     | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index 894c694..2860f9e 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,5 +1,6 @@
 var express = require('express');
 var dbUtils = require('../utils/dbUtils');
+var qiniuUtils = require('../utils/qiniuUtils');
 var router = express.Router();
 /* GET home page. */
 router.get('/', function(req, res, next) {
@@ -81,10 +82,10 @@ var common = function(req, res, next, page, rows) {
                 city: rows[i]['city'],
                 country: rows[i]['country'],
                 continent: rows[i]['continent'],
-                thumbnail_pic: rows[i]['thumbnail_pic'],
-                bmiddle_pic: rows[i]['bmiddle_pic'],
-                original_pic: rows[i]['original_pic'],
-                weibo: rows[i]['weibo'],
+                thumbnail: qiniuUtils(rows[i]['qiniu_url'], 400, 300),
+                //bmiddle_pic: rows[i]['bmiddle_pic'],
+                //original_pic: rows[i]['original_pic'],
+                //weibo: rows[i]['weibo'],
                 date: full
             });
         }
diff --git a/utils/bingUtils.js b/utils/bingUtils.js
index f27b462..028e129 100644
--- a/utils/bingUtils.js
+++ b/utils/bingUtils.js
@@ -36,7 +36,7 @@ module.exports = {
                                 startdate: data.startdate,
                                 fullstartdate: data.fullstartdate,
                                 enddate: data.enddate,
-                                url: data.url,
+                                url: /(http|https)\:\/\//gi.test(data.url) ? data.url : 'http://s.cn.bing.net' + data.url,
                                 urlbase: data.urlbase,
                                 copyright: data.copyright,
                                 copyrightlink: data.copyrightlink,
diff --git a/utils/qiniuUtils.js b/utils/qiniuUtils.js
index 8065772..192ae05 100644
--- a/utils/qiniuUtils.js
+++ b/utils/qiniuUtils.js
@@ -51,7 +51,7 @@ module.exports = {
         mode = mode || 1;
         var base = 'http://images.ioliu.cn/bing/';
         url = url.indexOf('1920x1080') == -1 ? url + '_1920x1080.jpg' : url;
-        url = /http/.test(url) ? url : base + url;
+        url = /(http|https)\:\/\//.test(url) ? url : base + url;
         var imageView = new qiniu.fop.ImageView(mode, width, height, quality);
         return imageView.makeRequest(url);
     }
diff --git a/views/index.pug b/views/index.pug
index 1aa40ca..7a8a9ca 100644
--- a/views/index.pug
+++ b/views/index.pug
@@ -11,7 +11,7 @@ block content
                 - var original = 'http://images.ioliu.cn/bing/'+val.qiniu_url+'_1920x1080.jpg';
                 article(rid=val.id)
                     a.thumbnail(href= original   )
-                        img(src=val.bmiddle_pic )
+                        img(src=val.thumbnail )
                     h2 ##{val.date}# #{val.copyright}
                     p #{val.description}
                     - var url = 'http://service.weibo.com/share/share.php?url='+encodeURIComponent('http://bing.ioliu.cn?id='+val.id)+'&title='+encodeURIComponent('#必应壁纸# '+ val.date + ' / '+ val.description) + '&appkey=1833831541';