From a69b39031bf8ce03f7af2dacb64506cbb8e2fd75 Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Thu, 24 Mar 2022 22:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4dedeajax=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E6=88=90fetch=E8=8E=B7=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/article_template_rand.php           |   9 +-
 src/admin/js/album.js                         |  14 +-
 src/admin/js/dedeajax.js                      | 146 -----------
 src/admin/js/dialog.js                        |   6 +-
 src/admin/js/indexbody.js                     |  10 +-
 src/admin/js/leftmenu.js                      |  22 +-
 src/admin/js/main.js                          |  13 +-
 src/admin/templets/article_coonepage_rule.htm |   6 +-
 src/admin/templets/catalog_main.htm           |   5 +-
 src/admin/templets/catalog_menu.htm           |   5 +-
 src/admin/templets/catalog_menu2.htm          |   5 +-
 src/admin/templets/freelist_main.htm          |  20 +-
 src/admin/templets/index.htm                  |   1 +
 src/admin/templets/module_help.htm            |  29 +--
 src/admin/templets/module_main.htm            |   6 +-
 src/admin/templets/search_keywords_main.htm   |  59 +++--
 src/admin/templets/stepselect_main.htm        |  48 +++-
 src/admin/templets/sys_admin_user_tj.htm      |  12 +-
 src/admin/templets/sys_data.htm               |  13 +-
 src/admin/templets/sys_data_replace.htm       |  13 +-
 src/admin/templets/sys_info.htm               |  12 +-
 src/admin/templets/sys_safetest.htm           |  30 ++-
 src/static/js/member_album.js                 |  24 +-
 src/static/js/webajax.js                      | 246 ------------------
 src/theme/templets/article_article.htm        |   2 +-
 src/theme/templets/article_default.htm        |   2 +-
 src/theme/templets/article_default_sg.htm     |   2 +-
 src/theme/templets/article_image.htm          |   2 +-
 src/theme/templets/article_infos.htm          |   2 +-
 src/theme/templets/article_shop.htm           |   2 +-
 src/theme/templets/article_soft.htm           |   2 +-
 src/theme/templets/article_spec.htm           |   2 +-
 src/theme/templets/index.htm                  |   2 +-
 src/theme/templets/index_article.htm          |   2 +-
 src/theme/templets/index_default.htm          |   2 +-
 src/theme/templets/index_default_sg.htm       |   2 +-
 src/theme/templets/index_image.htm            |   2 +-
 src/theme/templets/index_infos.htm            |   2 +-
 src/theme/templets/index_shop.htm             |   2 +-
 src/theme/templets/index_soft.htm             |   2 +-
 src/theme/templets/list_article.htm           |   2 +-
 src/theme/templets/list_default.htm           |   2 +-
 src/theme/templets/list_default_sg.htm        |   2 +-
 src/theme/templets/list_free.htm              |   2 +-
 src/theme/templets/list_image.htm             |   2 +-
 src/theme/templets/list_infos.htm             |   2 +-
 src/theme/templets/list_shop.htm              |   2 +-
 src/theme/templets/list_soft.htm              |   2 +-
 src/theme/templets/list_spec.htm              |   2 +-
 src/theme/templets/search.htm                 |   2 +-
 src/theme/templets/tag.htm                    |   2 +-
 src/theme/templets/taglist.htm                |   2 +-
 52 files changed, 272 insertions(+), 538 deletions(-)
 delete mode 100644 src/admin/js/dedeajax.js

diff --git a/src/admin/article_template_rand.php b/src/admin/article_template_rand.php
index e16be5f9..9a8a1e24 100644
--- a/src/admin/article_template_rand.php
+++ b/src/admin/article_template_rand.php
@@ -80,10 +80,11 @@ function DoRand(jobname)
 {
     ChangeFullDiv('show');
     \$DE('loading').style.display = 'block';
-    var myajax = new DedeAjax(\$DE('tmpct'));
-    myajax.SendGet2('article_template_rand.php?dopost='+jobname+'&token={$_SESSION['token']}');
-    \$DE('loading').style.display = 'none';
-    ChangeFullDiv('hide');
+    fetch('article_template_rand.php?dopost='+jobname+'&token={$_SESSION['token']}').then(resp=>resp.text()).then((d)=>{
+        \$DE('tmpct').innerHTML = d;
+        \$DE('loading').style.display = 'none';
+        ChangeFullDiv('hide');
+    });
 }
 </script>
 <div id='loading' style='z-index:3000;top:160;left:300;position:absolute;display:none;'>
diff --git a/src/admin/js/album.js b/src/admin/js/album.js
index f7eb46e2..cf08d3a6 100644
--- a/src/admin/js/album.js
+++ b/src/admin/js/album.js
@@ -127,15 +127,17 @@ function seePicNewAlb(f, imgdid, frname, hpos, acname) {
 //删除已经上传的图片
 function delAlbPic(pid) {
 	var tgobj = $Obj('albCtok' + pid);
-	var myajax = new DedeAjax(tgobj);
-	myajax.SendGet2('swfupload.php?dopost=del&id=' + pid);
-	$Obj('thumbnails').removeChild(tgobj);
+	fetch('swfupload.php?dopost=del&id=' + pid).then(resp=>resp.text()).then((d)=>{
+		tgobj.innerHTML = d;
+		$Obj('thumbnails').removeChild(tgobj);
+	});
 }
 
 //删除已经上传的图片(编辑时用)
 function delAlbPicOld(picfile, pid) {
 	var tgobj = $Obj('albold' + pid);
-	var myajax = new DedeAjax(tgobj);
-	myajax.SendGet2('swfupload.php?dopost=delold&picfile=' + picfile);
-	$Obj('thumbnailsEdit').removeChild(tgobj);
+	fetch('swfupload.php?dopost=delold&picfile=' + picfile).then(resp=>resp.text()).then((d)=>{
+		tgobj.innerHTML = d;
+		$Obj('thumbnailsEdit').removeChild(tgobj);
+	});
 }
\ No newline at end of file
diff --git a/src/admin/js/dedeajax.js b/src/admin/js/dedeajax.js
deleted file mode 100644
index f140fbc9..00000000
--- a/src/admin/js/dedeajax.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * 
- * @version        $Id: dedeajax.js 1 22:28 2010年7月20日Z tianya $
- * @package        DedeBIZ.Administrator
- * @copyright      Copyright (c) 2022, DedeBIZ.COM
- * @license        https://www.dedebiz.com/license
- * @link           https://www.dedebiz.com
- */
-
-//xmlhttp和xmldom对象
-DedeXHTTP = null;
-DedeXDOM = null;
-DedeContainer = null;
-
-//获取指定ID的元素
-function $(eid) {
-  return document.getElementById(eid);
-}
-
-function $DE(id) {
-  return document.getElementById(id);
-}
-
-//参数 gcontainer 是保存下载完成的内容的容器
-
-function DedeAjax(gcontainer) {
-
-  DedeContainer = gcontainer;
-
-  //post或get发送数据的键值对
-  this.keys = Array();
-  this.values = Array();
-  this.keyCount = -1;
-
-  //http请求头
-  this.rkeys = Array();
-  this.rvalues = Array();
-  this.rkeyCount = -1;
-  //请求头类型
-  this.rtype = 'text';
-
-  //初始化xmlhttp
-  if (window.ActiveXObject) {//IE6、IE5
-    try { DedeXHTTP = new ActiveXObject("Msxml2.XMLHTTP"); } catch (e) { }
-    if (DedeXHTTP == null) try { DedeXHTTP = new ActiveXObject("Microsoft.XMLHTTP"); } catch (e) { }
-  }
-  else {
-    DedeXHTTP = new XMLHttpRequest();
-  }
-
-  DedeXHTTP.onreadystatechange = function () {
-    if (DedeXHTTP.readyState == 4) {
-      if (DedeXHTTP.status == 200) {
-        DedeContainer.innerHTML = DedeXHTTP.responseText;
-        DedeXHTTP = null;
-      } else DedeContainer.innerHTML = "下载数据失败";
-    } else DedeContainer.innerHTML = "正在下载数据...";
-  };
-
-  //增加一个POST或GET键值对
-  this.AddKey = function (skey, svalue) {
-    this.keyCount++;
-    this.keys[this.keyCount] = skey;
-    this.values[this.keyCount] = escape(svalue);
-  };
-
-  //增加一个Http请求头键值对
-  this.AddHead = function (skey, svalue) {
-    this.rkeyCount++;
-    this.rkeys[this.rkeyCount] = skey;
-    this.rvalues[this.rkeyCount] = svalue;
-  };
-
-  //清除当前对象的哈希表参数
-  this.ClearSet = function () {
-    this.keyCount = -1;
-    this.keys = Array();
-    this.values = Array();
-    this.rkeyCount = -1;
-    this.rkeys = Array();
-    this.rvalues = Array();
-  };
-
-  //发送http请求头
-  this.SendHead = function () {
-    if (this.rkeyCount != -1) { //发送用户自行设定的请求头
-      for (; i <= this.rkeyCount; i++) {
-        DedeXHTTP.setRequestHeader(this.rkeys[i], this.rvalues[i]);
-      }
-    }
-    if (this.rtype == 'binary') {
-      DedeXHTTP.setRequestHeader("Content-Type", "multipart/form-data");
-    } else {
-      DedeXHTTP.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-    }
-  };
-
-  //用Post方式发送数据
-  this.SendPost = function (purl) {
-    var pdata = "";
-    var i = 0;
-    this.state = 0;
-    DedeXHTTP.open("POST", purl, true);
-    this.SendHead();
-    if (this.keyCount != -1) { //post数据
-      for (; i <= this.keyCount; i++) {
-        if (pdata == "") pdata = this.keys[i] + '=' + this.values[i];
-        else pdata += "&" + this.keys[i] + '=' + this.values[i];
-      }
-    }
-    DedeXHTTP.send(pdata);
-  };
-
-  //用GET方式发送数据
-  this.SendGet = function (purl) {
-    var gkey = "";
-    var i = 0;
-    this.state = 0;
-    if (this.keyCount != -1) { //get参数
-      for (; i <= this.keyCount; i++) {
-        if (gkey == "") gkey = this.keys[i] + '=' + this.values[i];
-        else gkey += "&" + this.keys[i] + '=' + this.values[i];
-      }
-      if (purl.indexOf('?') == -1) purl = purl + '?' + gkey;
-      else purl = purl + '&' + gkey;
-    }
-    DedeXHTTP.open("GET", purl, true);
-    this.SendHead();
-    DedeXHTTP.send(null);
-  };
-
-} // End Class DedeAjax
-
-//初始化xmldom
-function InitXDom() {
-  if (DedeXDOM != null) return;
-  var obj = null;
-  if (typeof (DOMParser) != "undefined") { // Gecko、Mozilla、Firefox
-    var parser = new DOMParser();
-    obj = parser.parseFromString(xmlText, "text/xml");
-  } else { // IE
-    try { obj = new ActiveXObject("MSXML2.DOMDocument"); } catch (e) { }
-    if (obj == null) try { obj = new ActiveXObject("Microsoft.XMLDOM"); } catch (e) { }
-  }
-  DedeXDOM = obj;
-};
diff --git a/src/admin/js/dialog.js b/src/admin/js/dialog.js
index 749cd396..67d5bc79 100644
--- a/src/admin/js/dialog.js
+++ b/src/admin/js/dialog.js
@@ -9,9 +9,9 @@
 document.write("<style type=\"text/css\">.close{float:right;font-size:14px;cursor:pointer}</style>")
 function editTitle(aid) {
 	var show = document.getElementById("show_news");
-	var myajax = new DedeAjax(show, false, false, "", "", "");
-	myajax.SendGet2("catalog_edit.php?dopost=time&id=" + aid);
-	DedeXHTTP = null;
+	fetch("catalog_edit.php?dopost=time&id=" + aid).then(resp=>resp.text()).then((d)=>{
+		show.innerHTML = d;
+	});
 }
 function $Dede(id) { return document.getElementById(id) }
 function AlertMsg(title, id) {
diff --git a/src/admin/js/indexbody.js b/src/admin/js/indexbody.js
index 9e0d5086..efd584a7 100644
--- a/src/admin/js/indexbody.js
+++ b/src/admin/js/indexbody.js
@@ -10,8 +10,9 @@ function CloseTab(tb)
 
 function ListAll(){
     $DE('editTab').style.display = 'block';
-    var myajax = new DedeAjax($DE('editTabBody'));
-    myajax.SendGet('index_body.php?dopost=editshow');
+	fetch('index_body.php?dopost=editshow').then(resp=>resp.text()).then((d)=>{
+		$DE('editTabBody').innerHTML = d;
+	});
 }
 
 function ShowWaitDiv(){
@@ -21,6 +22,7 @@ function ShowWaitDiv(){
 
 window.onload = function()
 {
-    var myajax = new DedeAjax($DE('listCount'));
-    myajax.SendGet('index_body.php?dopost=getRightSide');
+	fetch('index_body.php?dopost=getRightSide').then(resp=>resp.text()).then((d)=>{
+		$DE('listCount').innerHTML = d;
+	});
 };
diff --git a/src/admin/js/leftmenu.js b/src/admin/js/leftmenu.js
index 7243eb3c..cc2c7196 100644
--- a/src/admin/js/leftmenu.js
+++ b/src/admin/js/leftmenu.js
@@ -120,17 +120,17 @@ function ShowMainMenu(n)
 		targetLink.className = 'mmac';
 		curitem = n;
 	} else {
-		var myajax = new DedeAjax(targetCt);
-		myajax.SendGet2("index_menu_load.php?openitem="+n);
-		if(targetCt.innerHTML!='')
-		{
-			curCt.style.display = 'none';
-			targetCt.style.display = 'block';
-			curLink.className = 'mm';
-			targetLink.className = 'mmac';
-			curitem = n;
-		}
-		DedeXHTTP = null;
+		fetch("index_menu_load.php?openitem="+n).then(resp=>resp.text()).then((d)=>{
+			targetCt.innerHTML = d;
+			if(targetCt.innerHTML!='')
+			{
+				curCt.style.display = 'none';
+				targetCt.style.display = 'block';
+				curLink.className = 'mm';
+				targetLink.className = 'mmac';
+				curitem = n;
+			}
+		});
 	}
 	// bindClick();
 }
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index c9fca6d6..1721074e 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -298,8 +298,7 @@ function LoadNewDiv(e, surl, oname) {
 		newobj.style.display = "block";
 	}
 	if (newobj.innerHTML.length < 10) {
-		var myajax = new DedeAjax(newobj);
-		myajax.SendGet(surl);
+		fetch(surl).then(resp=>resp.text()).then((d)=>{newobj.innerHTML = d});
 	}
 }
 
@@ -322,8 +321,9 @@ function LoadNewDiv2(e, surl, oname, dlgcls) {
 		document.body.appendChild(newobj);
 	}
 	newobj.innerHTML = '';
-	var myajax = new DedeAjax(newobj);
-	myajax.SendGet2(surl);
+	fetch(surl).then(resp=>resp.text()).then((d)=>{
+		newobj.innerHTML = d;
+	});
 	if (newobj.innerHTML == '') newobj.style.display = 'none';
 	else newobj.style.display = 'block';
 	jQuery(newobj).css('top', '50px').css('left', '300px');
@@ -391,8 +391,9 @@ function LoadQuickDiv(e, surl, oname, w, h) {
 	newobj.style.left = posLeft + "px";
 	newobj.innerHTML = '<div style="margin-top:10px;margin-left:10px;"><img src="images/loadinglit.gif"> Loading...</div>';
 	newobj.style.display = 'block';
-	var myajax = new DedeAjax(newobj);
-	myajax.SendGet(surl);
+	fetch(surl).then(resp=>resp.text()).then((d)=>{
+		newobj.innerHTML = d;
+	});
 	fixupPos = false;
 }
 
diff --git a/src/admin/templets/article_coonepage_rule.htm b/src/admin/templets/article_coonepage_rule.htm
index faff4050..a2829729 100644
--- a/src/admin/templets/article_coonepage_rule.htm
+++ b/src/admin/templets/article_coonepage_rule.htm
@@ -23,9 +23,9 @@
 		//编辑
 		function EditNode(nid) {
 			$DE('editNode').style.display = 'block';
-			var myajax = new DedeAjax($DE('editNodeBody'), false, true, "", "", "请稍候，正在载入");
-			myajax.SendGet2('article_coonepage_rule.php?action=editload&id=' + nid);
-			DedeXHTTP = null;
+			fetch('article_coonepage_rule.php?action=editload&id=' + nid).then(resp=>resp.text()).then((d)=>{
+				$DE('editNodeBody').innerHTML = d;
+			});
 		}
 
 		//获得选中文件的文件名
diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm
index 92731d0d..4831ba40 100644
--- a/src/admin/templets/catalog_main.htm
+++ b/src/admin/templets/catalog_main.htm
@@ -16,8 +16,9 @@ function LoadSuns(ctid,tid)
 { 
   if($DE(ctid).innerHTML.length < 10){
     $DE('img'+tid).src = 'images/dedecontract.gif';
-	  var myajax = new DedeAjax($DE(ctid));
-	  myajax.SendGet('catalog_do.php?dopost=GetSunLists&cid='+tid);
+    fetch('catalog_do.php?dopost=GetSunLists&cid='+tid).then(resp=>resp.text()).then((d)=>{
+      $DE(ctid).innerHTML = d;
+		});
   } else {
     showHide(ctid,tid); 
   }
diff --git a/src/admin/templets/catalog_menu.htm b/src/admin/templets/catalog_menu.htm
index c04b1bff..3f0296b8 100644
--- a/src/admin/templets/catalog_menu.htm
+++ b/src/admin/templets/catalog_menu.htm
@@ -11,8 +11,9 @@
 function LoadSuns(ctid,tid)
 {
 	if($DE(ctid).innerHTML.length < 10){
-	  var myajax = new DedeAjax($DE(ctid),true,true,'','x','');
-	  myajax.SendGet('catalog_do.php?dopost=GetSunListsMenu&cid='+tid);
+    fetch('catalog_do.php?dopost=GetSunListsMenu&cid='+tid).then(resp=>resp.text()).then((d)=>{
+      $DE(ctid).innerHTML = d;
+		});
   } else { if(document.all) showHide(ctid); }
 }
 function showHide(objname)
diff --git a/src/admin/templets/catalog_menu2.htm b/src/admin/templets/catalog_menu2.htm
index b003b8ba..e8ab4a31 100644
--- a/src/admin/templets/catalog_menu2.htm
+++ b/src/admin/templets/catalog_menu2.htm
@@ -13,8 +13,9 @@
 function LoadSuns(ctid,tid)
 {
     if($DE(ctid).innerHTML.length < 10){
-        var myajax = new DedeAjax($DE(ctid),true,true,'','x','');
-        myajax.SendGet('catalog_do.php?dopost=GetSunListsMenu&cid='+tid);
+        fetch('catalog_do.php?dopost=GetSunListsMenu&cid='+tid).then(resp=>resp.text()).then((d)=>{
+            $DE(ctid).innerHTML = d;
+		});
     }
     else{ if(document.all) showHide(ctid); }
 }
diff --git a/src/admin/templets/freelist_main.htm b/src/admin/templets/freelist_main.htm
index 51812efa..8f741d9a 100644
--- a/src/admin/templets/freelist_main.htm
+++ b/src/admin/templets/freelist_main.htm
@@ -20,8 +20,11 @@
 			orderby = ordertype;
 			var listArea = $Obj('rslist');
 			var errMsg = "网络通信出错<br>[<a href=\"javascript:ReloadPage('" + ordertype + "')\">点击此重新加载列表</a>]";
-			var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在加载");
-			myajax.SendGet("freelist_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype + addget);
+			fetch("freelist_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype + addget).then(resp=>resp.text()).then((d)=>{
+				listArea.innerHTML = d;
+			}).catch((error) => {
+				listArea.innerHTML = errMsg;
+			});
 		}
 		//载入指定页的列表
 		function LoadPage(npage) {
@@ -45,8 +48,17 @@
 			var pagenum = Math.ceil(totalrow / pagesize);
 			if (pagenum <= pageno) pageno = pagenum;
 			var errMsg = "网络通信出错<br>[<a href=\"javascript:LoadPage('" + pageno + "')\">点击此重新加载列表</a>]";
-			var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理");
-			myajax.SendGet("freelist_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno);
+			fetch("freelist_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno).then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error(errMsg);
+			}).then((d)=>{
+				listArea.innerHTML = d;
+			}).catch((error) => {
+				listArea.innerHTML = errMsg;
+			});
+
 			ReloadPageNum(pageno);
 		}
 		//重新加载分页列表
diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm
index 88ff44b2..c6116a19 100644
--- a/src/admin/templets/index.htm
+++ b/src/admin/templets/index.htm
@@ -4,6 +4,7 @@
 <meta charset="<?php echo $cfg_soft_lang; ?>">
 <meta name="robots" content="noindex,nofollow">
 <title><?php echo $cfg_webname; ?>后台管理</title>
+<link rel="shortcut icon" href="../static/img/favicon.ico">
 <link rel="stylesheet" href="css/frame.css">
 <script src="../static/js/jquery.js"></script>
 <script src="js/frame.js"></script>
diff --git a/src/admin/templets/module_help.htm b/src/admin/templets/module_help.htm
index 2981bde7..1ec37bde 100644
--- a/src/admin/templets/module_help.htm
+++ b/src/admin/templets/module_help.htm
@@ -8,23 +8,18 @@
       var tgobj = document.getElementById('modulcode');
       var email = document.form1.email.value;
       var modulname = document.form1.modulname.value;
-      var myajax = new DedeAjax(tgobj, false, true, '-', '-', '');
-   <? php
-   if (strtolower(substr($cfg_soft_lang, 0, 3)) == 'utf') {
-   ?>
-          myajax.AddKeyUtf8('action', 'gethash');
-        myajax.AddKeyUtf8('email', email);
-        myajax.AddKeyUtf8('modulname', modulname);
-        myajax.SendPost2('module_make.php');
-   <? php
-   }
-      elseif(strtolower(substr($cfg_soft_lang, 0, 2)) == 'gb') {
-        echo 'myajax.SendGet2("module_make.php?action=gethash&email="+email+"&modulname="+modulname);';
-      }
-   ?>
-
-        //myajax.SendGet2('module_make.php?action=gethash&email='+email+'&modulname='+modulname);
-        DedeXHTTP = null;
+      const formData = new FormData()
+      formData.append('action', 'gethash');
+      formData.append('email', email);
+      formData.append('modulname', modulname);
+      fetch('module_make.php', {
+        method: 'POST',
+        body: formData
+      })
+      .then(r => r.text())
+      .then(d => {
+        tgobj.innerHTML = d;
+      })
     }
   </script>
   <title>模块打包</title>
diff --git a/src/admin/templets/module_main.htm b/src/admin/templets/module_main.htm
index f12b930c..4f1b059c 100644
--- a/src/admin/templets/module_main.htm
+++ b/src/admin/templets/module_main.htm
@@ -12,10 +12,10 @@
   <script>
     function getmodule(action, hash) {
       $DE('status_' + hash).innerHTML = '<img src=\'images/loadinglit.gif\'>';
-      var myajax = new DedeAjax($DE('status_' + hash), false, true, '-', '-', '');
-      myajax.SendGet2('module_main.php?action=download&hash=' + hash);
+      fetch('module_main.php?action=download&hash=' + hash).then(resp=>resp.text()).then((d)=>{
+        $DE('status_' + hash).innerHTML = d;
+      });
       $DE('manager_' + hash).style.display = 'block';
-      DedeXHTTP = null;
     }
   </script>
 </head>
diff --git a/src/admin/templets/search_keywords_main.htm b/src/admin/templets/search_keywords_main.htm
index dde47fd1..7488eaba 100644
--- a/src/admin/templets/search_keywords_main.htm
+++ b/src/admin/templets/search_keywords_main.htm
@@ -21,8 +21,16 @@ function ReloadPage(ordertype) {
     orderby = ordertype;
     var listArea = $Obj('rslist');
     var errMsg = "网络通信出错<br>[<a href=\"javascript:ReloadPage('" + ordertype + "')\">点击此重新加载列表</a>]";
-    var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在加载");
-    myajax.SendGet("search_keywords_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype);
+    fetch("search_keywords_main.php?dopost=getlist&pageno=" + pageno + "&orderby=" + ordertype).then(resp=>{
+        if (resp.ok) {
+            return resp.text()
+        }
+        throw new Error(errMsg);
+    }).then((d)=>{
+        listArea.innerHTML = d;
+    }).catch((error) => {
+        listArea.innerHTML = errMsg;
+    });
 }
 //载入指定页的列表
 function LoadPage(npage) {
@@ -37,23 +45,34 @@ function UpdateNote(nid) {
     var kws = $Obj('spwords' + nid).value;
     var ct = $Obj('count' + nid).value;
     var errMsg = "网络通信出错<br>[<a href=\"javascript:LoadPage('" + pageno + "')\">点击此重新加载列表</a>]";
-    var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理");
     <?php
     if (strtolower(substr($cfg_soft_lang, 0, 3)) == 'utf') {
     ?>
-    myajax.AddKeyUtf8('dopost', 'update');
-    myajax.AddKeyUtf8('aid', nid);
-    myajax.AddKeyUtf8('keyword', kw);
-    myajax.AddKeyUtf8('spwords', kws);
-    myajax.AddKeyUtf8('count', ct);
-    myajax.AddKeyUtf8('pageno', pageno);
-    myajax.AddKeyUtf8('orderby', orderby);
-    myajax.SendPost2('search_keywords_main.php');
+    const formData = new FormData()
+    formData.append('dopost', 'update');
+    formData.append('aid', nid);
+    formData.append('keyword', kw);
+    formData.append('spwords', kws);
+    formData.append('count', ct);
+    formData.append('pageno', pageno);
+    formData.append('orderby', orderby);
+    fetch('search_keywords_main.php', {
+        method: 'POST',
+        body: formData
+    })
+    .then(r => {
+        if (r.ok) {
+            return r.text()
+        }
+        throw new Error(errMsg);
+    })
+    .then(d => {
+        listArea.innerHTML = d;
+    }).catch((error) => {
+        $DE('edsta').innerHTML = errMsg;
+    });
     <?php
     }
-    elseif(strtolower(substr($cfg_soft_lang, 0, 2)) == 'gb') {
-        echo 'myajax.SendGet2("search_keywords_main.php?dopost=update&aid="+nid+"&keyword="+kw+"&spwords="+kws+"&count="+ct+"&pageno="+pageno+"&orderby="+orderby);';
-    }
     ?>
     ShowMsg('成功更新关键词');
     //myajax.SendGet("search_keywords_main.php?dopost=update&aid="+nid+"&keyword="+kw+"&spwords="+kws+"&count="+ct+"&pageno="+pageno);
@@ -65,8 +84,16 @@ function DelNote(nid) {
     var pagenum = Math.ceil(totalrow / pagesize);
     if (pagenum <= pageno) pageno = pagenum;
     var errMsg = "网络通信出错<br>[<a href=\"javascript:LoadPage('" + pageno + "')\">点击此重新加载列表</a>]";
-    var myajax = new DedeAjax(listArea, true, true, "", errMsg, "正在处理");
-    myajax.SendGet("search_keywords_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno + "&orderby=" + orderby);
+    fetch("search_keywords_main.php?dopost=del&aid=" + nid + "&pageno=" + pageno + "&orderby=" + orderby).then(resp=>{
+        if (resp.ok) {
+            return resp.text()
+        }
+        throw new Error(errMsg);
+    }).then((d)=>{
+        listArea.innerHTML = d;
+    }).catch((error) => {
+        listArea.innerHTML = errMsg;
+    });
     ReloadPageNum(pageno);
 }
 //重新加载分页列表
diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm
index 74c04d51..9da06b83 100644
--- a/src/admin/templets/stepselect_main.htm
+++ b/src/admin/templets/stepselect_main.htm
@@ -55,9 +55,17 @@
         }
 
         function AddType() {
-            var myajax = new DedeAjax($DE('edsta'));
             $DE('edsta').style.display = 'block';
-            myajax.SendGet('stepselect_main.php?action=addnew', true, true, '', '系统错误，无法获取数据', loadhtml);
+            fetch('stepselect_main.php?action=addnew').then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('系统错误，无法获取数据');
+			}).then((d)=>{
+				$DE('edsta').innerHTML = d;
+			}).catch((error) => {
+				$DE('edsta').innerHTML = errMsg;
+			});
         }
 
         function AddEnum() {
@@ -66,9 +74,17 @@
                 ShowMsg("必须选择一个类别");
                 return false;
             }
-            var myajax = new DedeAjax($DE('edsta'));
+            fetch('stepselect_main.php?action=addenum&id=' + id).then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('系统错误，无法获取数据');
+			}).then((d)=>{
+				$DE('edsta').innerHTML = d;
+			}).catch((error) => {
+				$DE('edsta').innerHTML = errMsg;
+			});
             $DE('edsta').style.display = 'block';
-            myajax.SendGet('stepselect_main.php?action=addenum&id=' + id, true, true, '', '系统错误，无法获取数据', loadhtml);
         }
 
         function EditType() {
@@ -77,9 +93,17 @@
                 ShowMsg("必须选择一个类别");
                 return false;
             }
-            var myajax = new DedeAjax($DE('edsta'));
             $DE('edsta').style.display = 'block';
-            myajax.SendGet('stepselect_main.php?action=edit&id=' + id, true, true, '', '系统错误，无法获取数据', loadhtml);
+            fetch('stepselect_main.php?action=edit&id=' + id).then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('系统错误，无法获取数据');
+			}).then((d)=>{
+				$DE('edsta').innerHTML = d;
+			}).catch((error) => {
+				$DE('edsta').innerHTML = errMsg;
+			});
         }
 
         function ViewType() {
@@ -88,9 +112,17 @@
                 ShowMsg("必须选择一个类别");
                 return false;
             }
-            var myajax = new DedeAjax($DE('edsta'));
             $DE('edsta').style.display = 'block';
-            myajax.SendGet('stepselect_main.php?action=view&id=' + id, true, true, '', '系统错误，无法获取数据', loadhtml);
+            fetch('stepselect_main.php?action=view&id=' + id).then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('系统错误，无法获取数据');
+			}).then((d)=>{
+				$DE('edsta').innerHTML = d;
+			}).catch((error) => {
+				$DE('edsta').innerHTML = errMsg;
+			});
         }
 
         function DelType() {
diff --git a/src/admin/templets/sys_admin_user_tj.htm b/src/admin/templets/sys_admin_user_tj.htm
index db3655f4..7c248436 100644
--- a/src/admin/templets/sys_admin_user_tj.htm
+++ b/src/admin/templets/sys_admin_user_tj.htm
@@ -13,8 +13,16 @@
 	{
 		var loadhtml = $DE('loaddiv').innerHTML;
 		var ajaxdiv = $DE('userct'+uid);
-		var myajax = new DedeAjax(ajaxdiv, true, true, '载入失败', loadhtml);
-		myajax.SendGet2('sys_admin_user_tj.php?dopost=getone&uid='+uid);
+		fetch('sys_admin_user_tj.php?dopost=getone&uid='+uid).then(resp=>{
+			if (resp.ok) {
+				return resp.text()
+			}
+			throw new Error('载入失败');
+		}).then((d)=>{
+			ajaxdiv.innerHTML = d;
+		}).catch((error) => {
+			ajaxdiv.innerHTML = errMsg;
+		});
 	}
 </script>
 <style>
diff --git a/src/admin/templets/sys_data.htm b/src/admin/templets/sys_data.htm
index 2239bdce..9c04b275 100644
--- a/src/admin/templets/sys_data.htm
+++ b/src/admin/templets/sys_data.htm
@@ -8,7 +8,6 @@
   <link rel='stylesheet' href='css/base.css'>
   <script language="javascript" src="../static/js/webajax.js"></script>
   <script language="javascript">
-    var myajax;
     var newobj;
     var posLeft = 200;
     var posTop = 150;
@@ -25,8 +24,16 @@
       } else {
         newobj.style.display = "block";
       }
-      myajax = new DedeAjax(newobj);
-      myajax.SendGet("sys_data.php?" + surl);
+      fetch("sys_data.php?" + surl).then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('x');
+			}).then((d)=>{
+				newobj.innerHTML = d;
+			}).catch((error) => {
+				newobj.innerHTML = errMsg;
+			});
     }
     function HideObj(objname) {
       var obj = document.getElementById(objname);
diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm
index 554ffad9..527c5571 100644
--- a/src/admin/templets/sys_data_replace.htm
+++ b/src/admin/templets/sys_data_replace.htm
@@ -11,8 +11,17 @@
     function ShowFields() {
       var exptable = $DE('exptable').options[$DE('exptable').selectedIndex].value;
       var queryUrl = "sys_data_replace.php?exptable=" + exptable + "&action=getfields";
-      var myajax = new DedeAjax($DE('fields'), true, true, '', 'x', '');
-      myajax.SendGet(queryUrl);
+      fetch(queryUrl).then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('x');
+			}).then((d)=>{
+				$DE('fields').innerHTML = d;
+			}).catch((error) => {
+				$DE('fields').innerHTML = errMsg;
+			});
+
     }
     function CheckSubmit() {
       if ($DE('rpfield').value == "") {
diff --git a/src/admin/templets/sys_info.htm b/src/admin/templets/sys_info.htm
index 5270da62..cc22032f 100644
--- a/src/admin/templets/sys_info.htm
+++ b/src/admin/templets/sys_info.htm
@@ -34,8 +34,16 @@ function backSearch() {
 function getSearch() {
   var searchKeywords = $Obj('keywds').value;
   searchKeywords = searchKeywords.replace(/^cfg_/, "");
-  var myajax = new DedeAjax($Obj('_search'));
-  myajax.SendGet('sys_info.php?dopost=search&keywords=' + searchKeywords)
+  fetch('sys_info.php?dopost=search&keywords=' + searchKeywords).then(resp=>{
+    if (resp.ok) {
+      return resp.text()
+    }
+    throw new Error('系统错误，无法获取数据');
+  }).then((d)=>{
+    $Obj('_search').innerHTML = d;
+  }).catch((error) => {
+    $Obj('_search').innerHTML = errMsg;
+  });
   $Obj('_searchback').innerHTML = '<button class="btn btn-success btn-sm" name="searchbackBtn" type="button" id="searchbackBtn" onclick="backSearch()">返回</button>'
   $Obj('_mainsearch').innerHTML = '';
   searchconfig = true;
diff --git a/src/admin/templets/sys_safetest.htm b/src/admin/templets/sys_safetest.htm
index d1155863..81eeee51 100644
--- a/src/admin/templets/sys_safetest.htm
+++ b/src/admin/templets/sys_safetest.htm
@@ -20,15 +20,33 @@
       var filetype = $Obj('filetype').value;
       var info = $Obj('info').value;
       $Obj('loaddiv').style.display = 'block';
-      var myajax = new DedeAjax($DE('messagetd'));
-      myajax.SendGet2('sys_safetest.php?action=test&filetype=' + filetype + "&info=" + info);
-      $Obj('loaddiv').style.display = 'none';
+
+      fetch('sys_safetest.php?action=test&filetype=' + filetype + "&info=" + info).then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('系统错误，无法获取数据');
+			}).then((d)=>{
+				$DE('messagetd').innerHTML = d;
+        $Obj('loaddiv').style.display = 'none';
+			}).catch((error) => {
+				$DE('messagetd').innerHTML = errMsg;
+			});
     }
     function LoadCtClear() {
       $Obj('loaddiv').style.display = 'block';
-      var myajax = new DedeAjax($DE('messagetd'));
-      myajax.SendGet2('sys_safetest.php?action=clear');
-      $Obj('loaddiv').style.display = 'none';
+
+      fetch('sys_safetest.php?action=clear').then(resp=>{
+				if (resp.ok) {
+					return resp.text()
+				}
+				throw new Error('系统错误，无法获取数据');
+			}).then((d)=>{
+				$DE('messagetd').innerHTML = d;
+        $Obj('loaddiv').style.display = 'none';
+			}).catch((error) => {
+				$DE('messagetd').innerHTML = errMsg;
+			});
     }
   </script>
 </head>
diff --git a/src/static/js/member_album.js b/src/static/js/member_album.js
index fb9924f9..ee4b2ab2 100644
--- a/src/static/js/member_album.js
+++ b/src/static/js/member_album.js
@@ -106,19 +106,19 @@ function LoadTestDiv()
 	else{
 		newobj.style.display = "block";
 	}
-	var myajax = new DedeAjax(newobj,false,true,'-','-','...');
-	var v = document.getElementById('imagebody').value;
-	vcc++;
 
-	//utf8
-	myajax.AddKeyUtf8('myhtml',v);
-	myajax.AddKeyUtf8('vcc',vcc);
-	myajax.SendPost2('album_testhtml.php');
-
-	//gbk
-	//myajax.SendGet2("album_testhtml.php?vcc="+vcc+"&myhtml="+v);
-
-	DedeXHTTP = null;
+	const formData = new FormData()
+	formData.append('myhtml', v);
+	formData.append('vcc', vcc);
+	fetch('album_testhtml.php', {
+		method: 'POST',
+		body: formData
+	})
+	.then(r => r.text())
+	.then(d => {
+		newobj.innerHTML = d;
+		vcc++;
+	})
 }
 
 function checkMuList(psid,cmid)
diff --git a/src/static/js/webajax.js b/src/static/js/webajax.js
index 310c929a..63775718 100644
--- a/src/static/js/webajax.js
+++ b/src/static/js/webajax.js
@@ -1,255 +1,9 @@
 // 建议采用现代浏览器内置的fetch替换现有的webajax.js
-//xmlhttp和xmldom对象
-var DedeXHTTP = null;
-var DedeXDOM = null;
-var DedeContainer = null;
-var DedeShowError = false;
-var DedeShowWait = false;
-var DedeErrCon = "";
-var DedeErrDisplay = "下载数据失败";
-var DedeWaitDisplay = "正在下载数据...";
-
-//获取指定ID的元素
 
 function $DE(id) {
     return document.getElementById(id);
 }
 
-//gcontainer 是保存下载完成的内容的容器
-//mShowError 是否提示错误信息
-//DedeShowWait 是否提示等待信息
-//mErrCon 服务器返回什么字符串视为错误
-//mErrDisplay 发生错误时显示的信息
-//mWaitDisplay 等待时提示信息
-//默认调用 DedeAjax('divid',false,false,'','','')
-
-function DedeAjax(gcontainer,mShowError,mShowWait,mErrCon,mErrDisplay,mWaitDisplay)
-{
-
-    DedeContainer = gcontainer;
-    DedeShowError = mShowError;
-    DedeShowWait = mShowWait;
-    if(mErrCon!="") DedeErrCon = mErrCon;
-    if(mErrDisplay!="") DedeErrDisplay = mErrDisplay;
-    if(mErrDisplay=="x") DedeErrDisplay = "";
-    if(mWaitDisplay!="") DedeWaitDisplay = mWaitDisplay;
-
-
-    //post或get发送数据的键值对
-    this.keys = Array();
-    this.values = Array();
-    this.keyCount = -1;
-    this.sendlang = 'gb2312';
-
-    //请求头类型
-    this.rtype = 'text';
-
-    //初始化xmlhttp
-    //IE6、IE5
-    if(window.ActiveXObject) {
-        try { DedeXHTTP = new ActiveXObject("Msxml2.XMLHTTP");} catch (e) { }
-        if (DedeXHTTP == null) try { DedeXHTTP = new ActiveXObject("Microsoft.XMLHTTP");} catch (e) { }
-    }
-    else {
-        DedeXHTTP = new XMLHttpRequest();
-    }
-
-    //增加一个POST或GET键值对
-    this.AddKeyN = function(skey,svalue) {
-        if(this.sendlang=='utf-8') this.AddKeyUtf8(skey, svalue);
-        else this.AddKey(skey, svalue);
-    };
-    
-    this.AddKey = function(skey,svalue) {
-        this.keyCount++;
-        this.keys[this.keyCount] = skey;
-        svalue = svalue+'';
-        if(svalue != '') svalue = svalue.replace(/\+/g,'$#$');
-        this.values[this.keyCount] = escape(svalue);
-    };
-
-    //增加一个POST或GET键值对
-    this.AddKeyUtf8 = function(skey,svalue) {
-        this.keyCount++;
-        this.keys[this.keyCount] = skey;
-        svalue = svalue+'';
-        if(svalue != '') svalue = svalue.replace(/\+/g,'$#$');
-        this.values[this.keyCount] = encodeURI(svalue);
-    };
-
-    //增加一个Http请求头键值对
-    this.AddHead = function(skey,svalue) {
-        this.rkeyCount++;
-        this.rkeys[this.rkeyCount] = skey;
-        this.rvalues[this.rkeyCount] = svalue;
-    };
-
-    //清除当前对象的哈希表参数
-    this.ClearSet = function() {
-        this.keyCount = -1;
-        this.keys = Array();
-        this.values = Array();
-        this.rkeyCount = -1;
-        this.rkeys = Array();
-        this.rvalues = Array();
-    };
-
-
-    DedeXHTTP.onreadystatechange = function() {
-        //在IE6中不管阻断或异步模式都会执行这个事件的
-        if(DedeXHTTP.readyState == 4){
-            if(DedeXHTTP.status == 200)
-            {
-                if(DedeXHTTP.responseText!=DedeErrCon) {
-                    DedeContainer.innerHTML = DedeXHTTP.responseText;
-                }
-                else {
-                    if(DedeShowError) DedeContainer.innerHTML = DedeErrDisplay;
-                }
-                DedeXHTTP = null;
-            }
-            else { if(DedeShowError) DedeContainer.innerHTML = DedeErrDisplay; }
-        }
-        else { if(DedeShowWait) DedeContainer.innerHTML = DedeWaitDisplay; }
-    };
-
-    //检测阻断模式的状态
-    this.BarrageStat = function() {
-        if(DedeXHTTP==null) return;
-        if(typeof(DedeXHTTP.status)!=undefined && DedeXHTTP.status == 200)
-        {
-            if(DedeXHTTP.responseText!=DedeErrCon) {
-                DedeContainer.innerHTML = DedeXHTTP.responseText;
-            }
-            else {
-                if(DedeShowError) DedeContainer.innerHTML = DedeErrDisplay;
-            }
-        }
-    };
-
-    //发送http请求头
-    this.SendHead = function()
-    {
-        //发送用户自行设定的请求头
-        if(this.rkeyCount!=-1)
-        { 
-            for(var i = 0;i<=this.rkeyCount;i++)
-            {
-                DedeXHTTP.setRequestHeader(this.rkeys[i],this.rvalues[i]);
-            }
-        }
-        　if(this.rtype=='binary'){
-        　DedeXHTTP.setRequestHeader("Content-Type","multipart/form-data");
-    }else{
-        DedeXHTTP.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
-    }
-};
-
-//用Post方式发送数据
-this.SendPost = function(purl) {
-    var pdata = "";
-    var i=0;
-    this.state = 0;
-    DedeXHTTP.open("POST", purl, true);
-    this.SendHead();
-    //post数据
-    if(this.keyCount!=-1)
-    {
-        for(;i<=this.keyCount;i++)
-        {
-            if(pdata=="") pdata = this.keys[i]+'='+this.values[i];
-            else pdata += "&"+this.keys[i]+'='+this.values[i];
-        }
-    }
-    DedeXHTTP.send(pdata);
-};
-
-//用GET方式发送数据
-this.SendGet = function(purl) {
-    var gkey = "";
-    var i=0;
-    this.state = 0;
-    //get参数
-    if(this.keyCount!=-1)
-    { 
-        for(;i<=this.keyCount;i++)
-        {
-            if(gkey=="") gkey = this.keys[i]+'='+this.values[i];
-            else gkey += "&"+this.keys[i]+'='+this.values[i];
-        }
-        if(purl.indexOf('?')==-1) purl = purl + '?' + gkey;
-        else  purl = purl + '&' + gkey;
-    }
-    DedeXHTTP.open("GET", purl, true);
-    this.SendHead();
-    DedeXHTTP.send(null);
-};
-
-//用GET方式发送数据，阻塞模式
-this.SendGet2 = function(purl) {
-    var gkey = "";
-    var i=0;
-    this.state = 0;
-    //get参数
-    if(this.keyCount!=-1)
-    { 
-        for(;i<=this.keyCount;i++)
-        {
-            if(gkey=="") gkey = this.keys[i]+'='+this.values[i];
-            else gkey += "&"+this.keys[i]+'='+this.values[i];
-        }
-        if(purl.indexOf('?')==-1) purl = purl + '?' + gkey;
-        else  purl = purl + '&' + gkey;
-    }
-    DedeXHTTP.open("GET", purl, true);
-    this.SendHead();
-    DedeXHTTP.send(null);
-    //firefox中直接检测XHTTP状态
-    this.BarrageStat();
-};
-
-//用Post方式发送数据
-this.SendPost2 = function(purl) {
-    var pdata = "";
-    var i=0;
-    this.state = 0;
-    DedeXHTTP.open("POST", purl, true);
-    this.SendHead();
-    //post数据
-    if(this.keyCount!=-1)
-    {
-        for(;i<=this.keyCount;i++)
-        {
-            if(pdata=="") pdata = this.keys[i]+'='+this.values[i];
-            else pdata += "&"+this.keys[i]+'='+this.values[i];
-        }
-    }
-    DedeXHTTP.send(pdata);
-    //firefox中直接检测XHTTP状态
-    this.BarrageStat();
-};
-
-
-} // End Class DedeAjax
-
-//初始化xmldom
-function InitXDom() {
-    if(DedeXDOM!=null) return;
-    var obj = null;
-    // Gecko、Mozilla、Firefox
-    if (typeof(DOMParser) != "undefined") { 
-        var parser = new DOMParser();
-        obj = parser.parseFromString(xmlText, "text/xml");
-    }
-    // IE
-    else { 
-        try { obj = new ActiveXObject("MSXML2.DOMDocument");} catch (e) { }
-        if (obj == null) try { obj = new ActiveXObject("Microsoft.XMLDOM"); } catch (e) { }
-    }
-    DedeXDOM = obj;
-};
-
-
 
 //读写cookie函数
 function GetCookie(c_name)
diff --git a/src/theme/templets/article_article.htm b/src/theme/templets/article_article.htm
index a8ae7a4a..b1333ead 100644
--- a/src/theme/templets/article_article.htm
+++ b/src/theme/templets/article_article.htm
@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/article_default.htm b/src/theme/templets/article_default.htm
index e0a6b2ce..92e34bb2 100644
--- a/src/theme/templets/article_default.htm
+++ b/src/theme/templets/article_default.htm
@@ -11,7 +11,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/article_default_sg.htm b/src/theme/templets/article_default_sg.htm
index e2e11b99..8e62fa14 100644
--- a/src/theme/templets/article_default_sg.htm
+++ b/src/theme/templets/article_default_sg.htm
@@ -11,7 +11,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/article_image.htm b/src/theme/templets/article_image.htm
index 0857a45c..9d0733f3 100644
--- a/src/theme/templets/article_image.htm
+++ b/src/theme/templets/article_image.htm
@@ -11,7 +11,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/article_infos.htm b/src/theme/templets/article_infos.htm
index 31105df3..eae95f1a 100644
--- a/src/theme/templets/article_infos.htm
+++ b/src/theme/templets/article_infos.htm
@@ -10,7 +10,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/article_shop.htm b/src/theme/templets/article_shop.htm
index edeeb75c..e51b898a 100644
--- a/src/theme/templets/article_shop.htm
+++ b/src/theme/templets/article_shop.htm
@@ -10,7 +10,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/article_soft.htm b/src/theme/templets/article_soft.htm
index 63504b97..bc776550 100644
--- a/src/theme/templets/article_soft.htm
+++ b/src/theme/templets/article_soft.htm
@@ -10,7 +10,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/article_spec.htm b/src/theme/templets/article_spec.htm
index d68dd094..0079c8bd 100644
--- a/src/theme/templets/article_spec.htm
+++ b/src/theme/templets/article_spec.htm
@@ -11,7 +11,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/index.htm b/src/theme/templets/index.htm
index 003edba9..8da35a6f 100644
--- a/src/theme/templets/index.htm
+++ b/src/theme/templets/index.htm
@@ -7,7 +7,7 @@
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
     <title>{dede:global.cfg_webname/}</title>
     <meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/index_article.htm b/src/theme/templets/index_article.htm
index 7a444a7b..8da2fe4d 100644
--- a/src/theme/templets/index_article.htm
+++ b/src/theme/templets/index_article.htm
@@ -7,7 +7,7 @@
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
     <title>{dede:global.cfg_webname/}</title>
     <meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/index_default.htm b/src/theme/templets/index_default.htm
index 647aca7b..30459add 100644
--- a/src/theme/templets/index_default.htm
+++ b/src/theme/templets/index_default.htm
@@ -7,7 +7,7 @@
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
     <title>{dede:global.cfg_webname/}</title>
     <meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/index_default_sg.htm b/src/theme/templets/index_default_sg.htm
index f0e879a7..740704d4 100644
--- a/src/theme/templets/index_default_sg.htm
+++ b/src/theme/templets/index_default_sg.htm
@@ -7,7 +7,7 @@
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
 	<title>{dede:global.cfg_webname/}</title>
 	<meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/index_image.htm b/src/theme/templets/index_image.htm
index a4e4326a..90a6af6a 100644
--- a/src/theme/templets/index_image.htm
+++ b/src/theme/templets/index_image.htm
@@ -7,7 +7,7 @@
   <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
   <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
   <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
   <title>{dede:global.cfg_webname/}</title>
   <meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/index_infos.htm b/src/theme/templets/index_infos.htm
index d6c40eab..b4526e0f 100644
--- a/src/theme/templets/index_infos.htm
+++ b/src/theme/templets/index_infos.htm
@@ -7,7 +7,7 @@
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
     <title>{dede:global.cfg_webname/}</title>
     <meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/index_shop.htm b/src/theme/templets/index_shop.htm
index 7ec1d421..7824862b 100644
--- a/src/theme/templets/index_shop.htm
+++ b/src/theme/templets/index_shop.htm
@@ -7,7 +7,7 @@
   <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
   <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
   <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
   <title>{dede:global.cfg_webname/}</title>
   <meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/index_soft.htm b/src/theme/templets/index_soft.htm
index 7ec1d421..7824862b 100644
--- a/src/theme/templets/index_soft.htm
+++ b/src/theme/templets/index_soft.htm
@@ -7,7 +7,7 @@
   <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
   <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/index.css">
-  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+  <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
   <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
   <title>{dede:global.cfg_webname/}</title>
   <meta name="keywords" content="{dede:global.cfg_keywords/}">
diff --git a/src/theme/templets/list_article.htm b/src/theme/templets/list_article.htm
index 52ceb36d..bcb6a842 100644
--- a/src/theme/templets/list_article.htm
+++ b/src/theme/templets/list_article.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_default.htm b/src/theme/templets/list_default.htm
index 5cb1c7dc..bc13ec43 100644
--- a/src/theme/templets/list_default.htm
+++ b/src/theme/templets/list_default.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_default_sg.htm b/src/theme/templets/list_default_sg.htm
index 9df7ab0c..887e20b5 100644
--- a/src/theme/templets/list_default_sg.htm
+++ b/src/theme/templets/list_default_sg.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_free.htm b/src/theme/templets/list_free.htm
index 6ed31998..b125dd76 100644
--- a/src/theme/templets/list_free.htm
+++ b/src/theme/templets/list_free.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_image.htm b/src/theme/templets/list_image.htm
index 031f2bae..17dae364 100644
--- a/src/theme/templets/list_image.htm
+++ b/src/theme/templets/list_image.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_infos.htm b/src/theme/templets/list_infos.htm
index 4964cc24..36c45d4f 100644
--- a/src/theme/templets/list_infos.htm
+++ b/src/theme/templets/list_infos.htm
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
 	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
 	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
 	<title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
 	<meta name="keywords" content="{dede:field.keywords/}" />
 	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_shop.htm b/src/theme/templets/list_shop.htm
index 8267ffd5..64903f44 100644
--- a/src/theme/templets/list_shop.htm
+++ b/src/theme/templets/list_shop.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_soft.htm b/src/theme/templets/list_soft.htm
index 61bf64cb..123ad7b7 100644
--- a/src/theme/templets/list_soft.htm
+++ b/src/theme/templets/list_soft.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/list_spec.htm b/src/theme/templets/list_spec.htm
index c7ed7537..0a70e3e1 100644
--- a/src/theme/templets/list_spec.htm
+++ b/src/theme/templets/list_spec.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>专题_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/search.htm b/src/theme/templets/search.htm
index 5839edc3..4f926e19 100644
--- a/src/theme/templets/search.htm
+++ b/src/theme/templets/search.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>搜索页_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field name='keywords'/}" />
     <meta name="description" content="{dede:field name='description' function='html2text(@me)'/}" />
diff --git a/src/theme/templets/tag.htm b/src/theme/templets/tag.htm
index 4cfd1998..62d89fe6 100644
--- a/src/theme/templets/tag.htm
+++ b/src/theme/templets/tag.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
diff --git a/src/theme/templets/taglist.htm b/src/theme/templets/taglist.htm
index 4b66e8d5..d1b6d2b7 100644
--- a/src/theme/templets/taglist.htm
+++ b/src/theme/templets/taglist.htm
@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
     <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/style.css">
-    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.ico">
     <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
     <meta name="keywords" content="{dede:field.keywords/}" />
     <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />