From f87af906d9761178f63ae79ae762ac9a7090dca7 Mon Sep 17 00:00:00 2001
From: "MI15\\Win" <10359480+tznb@user.noreply.gitee.com>
Date: Thu, 7 Nov 2024 00:59:43 +0800
Subject: [PATCH] v2.1.18-20241105

---
 system/templates.php                 | 18 +++++-------------
 system/version.txt                   |  2 +-
 templates/admin/page/SiteSetting.php |  6 +++---
 templates/admin/page/updatelog.php   |  5 +++--
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/system/templates.php b/system/templates.php
index e3244bf..f96a6dd 100644
--- a/system/templates.php
+++ b/system/templates.php
@@ -171,22 +171,14 @@ function geticourl($icon,$link){
     }
     if ($site['link_icon'] == 'default'){
         return($GLOBALS['libs'].'/Other/default.ico');
-    }elseif ($icon ==20){
+    }elseif ($icon == 20){
         return('./index.php?c=icon&url='.base64_encode($link['real_url']));
-    }elseif ($icon ==21){
+    }elseif ($icon == 21){
         return('./ico/'.base64_encode($link['real_url']));
-    }elseif($icon ==2){ 
+    }elseif($icon == 2){ 
         return('https://favicon.png.pub/v1/'.base64_encode(get_url_host($link['real_url'],true,true)));
-    }elseif($icon ==4){
-        return('https://api.15777.cn/get.php?url='.$link['real_url']);
-    }elseif($icon ==5){
-        return('https://favicon.cccyun.cc/'.$link['real_url']);
-    }elseif($icon ==6){
-        return('https://api.iowen.cn/favicon/'.parse_url($link['real_url'])['host'].'.png');
-    }elseif($icon ==7){
-        return('https://toolb.cn/favicon/'.parse_url($link['real_url'])['host']);
-    }elseif($icon ==8){
-        return('https://apis.jxcxin.cn/api/Favicon?url='.$link['real_url']);
+    }elseif($icon == 6){
+        return('https://t3.gstatic.cn/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&size=128&url='.$link['real_url']);
     }else{
         return('./system/ico.php?text='.mb_strtoupper(mb_substr($link['title'], 0, 1)));
     }
diff --git a/system/version.txt b/system/version.txt
index 997887b..1b7fa7c 100644
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.1.18-20241018
\ No newline at end of file
+v2.1.18-20241105
\ No newline at end of file
diff --git a/templates/admin/page/SiteSetting.php b/templates/admin/page/SiteSetting.php
index 649597d..7c1211a 100644
--- a/templates/admin/page/SiteSetting.php
+++ b/templates/admin/page/SiteSetting.php
@@ -72,11 +72,11 @@
                         <option value="0" selected>离线图标(首字图标)</option>
                         <option value="20" >本地服务</option>
                         <option value="21" >本地服务(伪静态)</option>
-                        <option value="2" >favicon.png.pub (小图标)</option>
-                        <option value="6" >api.iowen.cn</option>
+                        <option value="2" >第三方:favicon.png.pub (小图标)</option>
+                        <option value="6" >第三方:gstatic.cn (大图标)</option>
                     </select>
                 </div>
-                <div class="layui-form-mid layui-word-aux">所有API接口均由其他大佬提供!若有异常请尝试更换接口!</div>
+                <div class="layui-form-mid layui-word-aux">三方接口由其他站长提供!若有异常请尝试更换接口!建议使用本地服务!</div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">重复链接</label>
diff --git a/templates/admin/page/updatelog.php b/templates/admin/page/updatelog.php
index b537422..05f997e 100644
--- a/templates/admin/page/updatelog.php
+++ b/templates/admin/page/updatelog.php
@@ -5,9 +5,9 @@
     <li class="layui-timeline-item">
         <i class="layui-icon layui-timeline-axis"></i>
         <div class="layui-timeline-content layui-text">
-            <h4 class="layui-timeline-title">v2.1.18-20241018</h4>
+            <h4 class="layui-timeline-title">v2.1.18-20241105</h4>
             <ul>
-                <li>[升级] Layui组件由2.9.14升级到2.9.16</li>
+                <li>[升级] Layui组件由2.9.14升级到2.9.18</li>
                 <li>[升级] Medoo组件由2.1.8升级到2.1.12</li>
                 <li>[新增] 授权管理页面增加修改域名入口</li>
                 <li>[变更] 分类页面标题显示分类名称-分类描述</li>
@@ -15,6 +15,7 @@
                 <li>[优化] 调高超时参数以兼顾网络较慢的环境</li>
                 <li>[优化] 默认登录模板检测到使用IE浏览器时弹出提示</li>
                 <li>[优化] 内置防火墙拦截时提示如何解决</li>
+                <li>[修复] 替换已失效的第三方图标接口</li>
             </ul>
         </div>
     </li>