From 4e2b1543d100b6612bacca69332fc05faa312c15 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@juzix.io>
Date: Mon, 2 Apr 2018 15:57:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=8E=B7=E5=8F=96favicon?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=9D=80=E4=B8=BAhttps://api.statvoo.com/fav?=
 =?UTF-8?q?icon/=3Furl=3D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/bookmark-info-controller.js | 2 +-
 public/views/bookmarks.html                            | 8 ++++----
 public/views/search.html                               | 2 +-
 public/views/tags.html                                 | 4 ++--
 routes/api.js                                          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/scripts/controllers/bookmark-info-controller.js b/public/scripts/controllers/bookmark-info-controller.js
index cef07f9..7c57c59 100644
--- a/public/scripts/controllers/bookmark-info-controller.js
+++ b/public/scripts/controllers/bookmark-info-controller.js
@@ -9,7 +9,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win
         $('.ui.modal.js-bookmark-info').modal({
             closable: false,
         }).modal('setting', 'transition', dataService.animation()).modal('show');
-        bookmark.favicon_url = bookmark.favicon_url || ('http://g.soz.im/' + bookmark.url + '/cdn.ico');
+        bookmark.favicon_url = bookmark.favicon_url || ('https://api.statvoo.com/favicon/?url=' + bookmark.url);
         bookmark.snap_url = bookmark.snap_url || ('./images/snap/' + bookmark.id + '.png');
         $scope.bookmark = bookmark;
         $scope.bookmark.description = $sce.trustAsHtml(bookmark.description);
diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html
index 66eed4f..ceef9dc 100644
--- a/public/views/bookmarks.html
+++ b/public/views/bookmarks.html
@@ -30,7 +30,7 @@
                             id="{{bookmark.id}}">
                             <img
                                 class="ui ui middle aligned tiny image bookmarkInfo"
-                                ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico"
+                                ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}"
                                 style="width:16px;height:16px;"
                                 ng-click="detailBookmark(bookmark);$event.stopPropagation()"
                                 favicon-err="./images/favicon/{{bookmark.id}}.ico">
@@ -66,7 +66,7 @@
             id="{{bookmark.id}}">
             <img
                 class="ui ui middle aligned tiny image bookmarkInfo"
-                ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico"
+                ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}"
                 style="width:16px;height:16px;"
                 ng-click="detailBookmark(bookmark);$event.stopPropagation()"
                 favicon-err="./images/favicon/{{bookmark.id}}.ico">
@@ -89,7 +89,7 @@
     <tbody>
         <tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
             <td>
-                <img class="ui ui middle aligned tiny image" ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                <img class="ui ui middle aligned tiny image" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
                 <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
                     {{ bookmark.title }}
                 </span>
@@ -142,7 +142,7 @@
             </div>
             <div class="extra content" ng-show="!bookmark.edit" style="height:50px;padding-right:2px;padding-left:8px;">
                 <span class="left floated like" style="margin-top:6px;">
-                    <img class="ui ui middle aligned tiny image" ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                    <img class="ui ui middle aligned tiny image" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
                     创建于:
                     <span title="{{bookmark.created_at}}" class="need_to_be_rendered" data-timeago="{{bookmark.created_at}}"></span>
                     <!-- {{ bookmark.created_at }} -->
diff --git a/public/views/search.html b/public/views/search.html
index 939b0d3..7e5b589 100644
--- a/public/views/search.html
+++ b/public/views/search.html
@@ -142,7 +142,7 @@
                     ng-if="searchHotBookmarks">
                 <img
                     class="ui ui middle aligned mini image"
-                    ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico"
+                    ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}"
                     style="width:16px;height:16px;cursor:pointer;"
                     ng-click="jumpToUrl(bookmark.url, bookmark.id)"
                     favicon-err="./images/favicon/{{bookmark.id}}.ico"
diff --git a/public/views/tags.html b/public/views/tags.html
index 66f3488..0be6909 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -85,7 +85,7 @@
     <tbody>
         <tr ng-repeat="bookmark in bookmarksByTag" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
             <td>
-                <img class="ui ui middle aligned tiny image" ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico" style="width:16px;height:16px;cursor:pointer;"
+                <img class="ui ui middle aligned tiny image" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;"
                     ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
                 <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
                     {{ bookmark.title }}
@@ -129,7 +129,7 @@
         <div ng-repeat="bookmark in bookmarksByTag" class="column js-costomTag-item" ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmark:(!bookmarkNormalHover)}"
             ng-mouseover="bookmarkNormalHover=true; setHoverBookmark(bookmark)" ng-mouseleave="bookmarkNormalHover=false; setHoverBookmark(null)"
             ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{ bookmark.title }}" id="{{bookmark.id}}">
-            <img class="ui ui middle aligned tiny image bookmarkInfo" ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico" style="width:16px;height:16px;"
+            <img class="ui ui middle aligned tiny image bookmarkInfo" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;"
                 ng-click="detailBookmark(bookmark);$event.stopPropagation()" favicon-err="./images/favicon/{{bookmark.id}}.ico">
             <span>{{ bookmark.title}}</span>
         </div>
diff --git a/routes/api.js b/routes/api.js
index d843063..d4d3d67 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -1223,9 +1223,9 @@ api.getFaviconByTimer = function() {
                             });
                     } else {
                         // http://www.cnblogs.com/zhangwei595806165/p/4984912.html 各种方法都试一遍
-                        var faviconUrl = "http://favicon.byi.pw/?url=" + url; // 默认地址
+                        var faviconUrl = "https://api.statvoo.com/favicon/?url=" + url; // 默认地址
                         if (faviconState == 1) {
-                            faviconUrl = "http://g.soz.im/" + url;
+                            faviconUrl = "http://favicon.byi.pw/?url=" + url;
                         } else if (faviconState == 2) {
                             faviconUrl = "http://www.google.com/s2/favicons?domain=" + url;
                         }