From ccab61c7e2b9de3d67f26ef7bb1095e651a495ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Tue, 8 Nov 2022 17:39:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/article_description_main.php | 4 ++-- src/admin/makehtml_all.php | 16 ++++++++-------- src/admin/makehtml_archives_action.php | 14 +++++++------- src/admin/makehtml_freelist_action.php | 10 +++++----- src/admin/makehtml_list_action.php | 18 +++++++++--------- src/admin/makehtml_spec.php | 2 +- src/admin/makehtml_taglist_action.php | 10 +++++----- src/admin/templets/sys_cache_up.htm | 2 +- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index 112deed9..0622f14b 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -80,7 +80,7 @@ if ($dojob == '') { } $dvlen = $tjlen * 1; $tjsta = "
"; - $tjsta .= "
完成处理文档总数 $tjlen %"; + $tjsta .= "
完成处理文档总数$tjlen%"; $nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); exit(); @@ -140,7 +140,7 @@ if ($dojob == '') { } $dvlen = $tjlen * 1; $tjsta = "
"; - $tjsta .= "
完成处理文档总数 $tjlen %"; + $tjsta .= "
完成处理文档总数$tjlen%"; if ($tjnum < $totalnum) { $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); diff --git a/src/admin/makehtml_all.php b/src/admin/makehtml_all.php index 5455771f..0e81bb2a 100644 --- a/src/admin/makehtml_all.php +++ b/src/admin/makehtml_all.php @@ -1,6 +1,6 @@ SaveToHtml($homeFile); $pv->Close(); } else { - if (file_exists($homeFile)) echo "启用静态生成，建议删除"+$homeFile; + if (file_exists($homeFile)) echo "启用静态更新，建议删除"+$homeFile; } - ShowMsg("完成更新所有文档，现在开始更新栏目页", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成所有文档更新，开始更新栏目", "makehtml_all.php?action=make&step=4&uptype=$uptype&mkvalue=$mkvalue"); exit(); } //更新栏目 @@ -68,7 +68,7 @@ else if ($step == 4) { $adminID = $cuserLogin->getUserID(); $mkcachefile = DEDEDATA."/mkall_cache_{$adminID}.php"; if ($uptype == 'all' || empty($mkvalue)) { - ShowMsg("不需要进行初处理，现更新所有栏目", "makehtml_list_action.php?gotype=mkallct"); + ShowMsg("不需要进行初处理，开始更新所有栏目", "makehtml_list_action.php?gotype=mkallct"); exit(); } else { if ($uptype == 'time') { @@ -106,11 +106,11 @@ else if ($step == 4) { } fwrite($fp, "?".">"); fclose($fp); - ShowMsg("完成栏目缓存处理，现转向更新栏目", "makehtml_list_action.php?gotype=mkall"); + ShowMsg("完成栏目缓存处理，开始更新栏目", "makehtml_list_action.php?gotype=mkall"); exit(); } else { fclose($fp); - ShowMsg("没有可更新的栏目，现在作最后数据优化", "makehtml_all.php?action=make&step=10"); + ShowMsg("没有可更新的栏目，最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } @@ -123,7 +123,7 @@ else if ($step == 10) { $mkcachefile = DEDEDATA."/mkall_cache_{$adminID}.php"; @unlink($mkcachefile); OptimizeData($dsql); - ShowMsg("完成所有文件的更新", "javascript:;"); + ShowMsg("完成所有栏目文档更新", "javascript:;"); exit(); }//make step diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php index 40c1c06a..88e4cb12 100644 --- a/src/admin/makehtml_archives_action.php +++ b/src/admin/makehtml_archives_action.php @@ -1,6 +1,6 @@ ExecuteNoneQuery("DELETE FROM `#@__arccache` "); } -//获取记录，并生成网页 +//获取记录，并更新网页 if ($totalnum > $startdd + $pagesize) { $limitSql = " LIMIT $startdd,$pagesize"; } else { @@ -61,7 +61,7 @@ if ($totalnum > $startdd + $pagesize) { } $tjnum = $startdd; if (empty($sstime)) $sstime = time(); -//如果生成数量大于500，并且没选栏目，按栏目排序生成 +//如果更新数量大于500，并且没选栏目，按栏目排序更新 if ($totalnum > 500 && empty($typeid)) { $dsql->Execute('out', "SELECT id FROM `#@__arctiny` $idsql ORDER BY typeid ASC $limitSql"); } else { @@ -80,7 +80,7 @@ $ttime = number_format(($ttime / 60), 2); //返回提示信息 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100; $tjsta = "
"; -$tjsta .= "
到达位置：".($startdd + $pagesize)."，用时：$ttime 分钟
完成更新文档总数 $tjlen %"; +$tjsta .= "
到达位置".($startdd + $pagesize)."，用时{$ttime}分钟
完成更新文档总数$tjlen%"; //速度测试 if ($tjnum < $totalnum) { $nurl = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid"; @@ -90,12 +90,12 @@ if ($tjnum < $totalnum) { exit(); } else { if ($typeid != '') { - ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); + ShowMsg("更新文档$totalnum，用时{$ttime}分钟，开始更新栏目", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); } else { if ($uptype == '') { - ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，完成所有所有任务", "javascript:;"); + ShowMsg("更新文档$totalnum，用时{$ttime}分钟，完成所有文档更新", "javascript:;"); } else { - ShowMsg("完成更新文档任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成所有文档更新，开始更新主页", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); } } } diff --git a/src/admin/makehtml_freelist_action.php b/src/admin/makehtml_freelist_action.php index c139f3d0..9489a3d5 100644 --- a/src/admin/makehtml_freelist_action.php +++ b/src/admin/makehtml_freelist_action.php @@ -1,6 +1,6 @@ Close(); $nextpage = $pageno + 1; if ($nextpage == $totalpage) { - ShowMsg("完成所有文件创建", 'javascript:;'); + ShowMsg("完成所有文件更新", 'javascript:;'); } else { if ($finishType) { $gourl = "makehtml_freelist_action.php?maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$nextpage"; - ShowMsg("创建列表：".$tid."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新列表".$tid."，继续执行任务", $gourl, 0, 100); } else { $gourl = "makehtml_freelist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$pageno"; - ShowMsg("创建列表：".$tid."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新列表".$tid."，继续执行任务", $gourl, 0, 100); } } $dsql->ExecuteNoneQuery("UPDATE `#@__freelist` SET nodefault='1' where aid='$startid';"); diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 70bb7c81..2b5ac3a4 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -1,6 +1,6 @@ getUserID(); //检测获取所有栏目id -//普通生成或一键更新时更新所有栏目 +//普通更新或一键更新时更新所有栏目 if ($gotype == '' || $gotype == 'mkallct') { if ($upnext == 1 || $typeid == 0) { if ($typeid > 0) { @@ -48,10 +48,10 @@ if (isset($idArray[$pageno])) { $tid = $idArray[$pageno]; } else { if ($gotype == '') { - ShowMsg("完成所有列表更新", "javascript:;"); + ShowMsg("完成所有栏目更新", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目列表更新，现在作最后数据优化", "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } @@ -63,7 +63,7 @@ $reurl = ''; //更新数组所记录的栏目 if (!empty($tid)) { if (!isset($cfg_Cs[$tid])) { - ShowMsg('没有该栏目数据, 可能缓存文件没有更新, 请检查是否有写入权限', 'javascript:;'); + ShowMsg('没有该栏目数据，可能缓存文件没有更新，请检查是否有写入权限', 'javascript:;'); exit(); } if ($cfg_Cs[$tid][1] > 0) { @@ -95,20 +95,20 @@ if ($nextpage >= $totalpage && $finishType) { if (empty($reurl)) { $reurl = '../apps/list.php?tid='.$tid; } - ShowMsg("完成所有栏目列表更新，浏览栏目", "javascript:;"); + ShowMsg("完成所有栏目更新，浏览栏目", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { - ShowMsg("完成所有栏目列表更新，现在作最后数据优化", "makehtml_all.php?action=make&step=10"); + ShowMsg("完成所有栏目更新，最后数据优化", "makehtml_all.php?action=make&step=10"); exit(); } } else { if ($finishType) { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage"; - ShowMsg("创建栏目：".$tid."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新栏目".$tid."，继续执行任务", $gourl, 0, 100); exit(); } else { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; - ShowMsg("创建栏目：".$tid."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新栏目".$tid."，继续执行任务", $gourl, 0, 100); exit(); } } diff --git a/src/admin/makehtml_spec.php b/src/admin/makehtml_spec.php index f379def6..32cf7e63 100644 --- a/src/admin/makehtml_spec.php +++ b/src/admin/makehtml_spec.php @@ -16,7 +16,7 @@ if ($dopost == "ok") { $sp = new SpecView(); $rurl = $sp->MakeHtml(0); echo ""; - echo "
成功生成所有专题列表 预览
"; + echo "
完成所有专题更新，浏览专题
"; exit(); } include DedeInclude('templets/makehtml_spec.htm'); diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index 76689eca..f0b11c4e 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -60,7 +60,7 @@ if (is_array($tag) && count($tag) > 0) { if ($ntotalpage <= $maxpagesize) { $dlist->MakeHtml(); - $finishType = TRUE; //生成一个TAG完成 + $finishType = TRUE; //生成一个标签完成 } else { $reurl = $dlist->MakeHtml($mkpage, $maxpagesize); $finishType = FALSE; @@ -75,12 +75,12 @@ if (is_array($tag) && count($tag) > 0) { $dlist->MakeHtml(1, 10); $reurl = '..'.$tagsdir; if ($upall == 1) { - ShowMsg("更新标签完成，浏览标签", "javascript:;"); + ShowMsg("完成所有标签更新，浏览标签页", "javascript:;"); } else { $query = "UPDATE `#@__tagindex` SET mktime=uptime WHERE id='$ctagid' "; $dsql->ExecuteNoneQuery($query); $reurl .= '/'.$ctagid; - ShowMsg("更新标签：".$tag['tag']."，浏览标签", "javascript:;"); + ShowMsg("更新标签".$tag['tag']."，浏览标签", "javascript:;"); } exit(); } else { @@ -93,12 +93,12 @@ if (is_array($tag) && count($tag) > 0) { $nextpage = 0; } $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg("成功生成标签：".$tag['tag']."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新标签".$tag['tag']."，继续执行任务", $gourl, 0, 100); exit(); } else { //继续当前这个 $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg("成功生成标签：".$tag['tag']."，继续执行任务", $gourl, 0, 100); + ShowMsg("更新标签".$tag['tag']."，继续执行任务", $gourl, 0, 100); exit(); } } diff --git a/src/admin/templets/sys_cache_up.htm b/src/admin/templets/sys_cache_up.htm index 56f3e081..bb055ec5 100644 --- a/src/admin/templets/sys_cache_up.htm +++ b/src/admin/templets/sys_cache_up.htm @@ -19,7 +19,7 @@
本程序作默认会执行下面的操作：1、更新栏目缓存 2、更新枚举缓存 3、清理arclist调用缓存 4、清理过期会员访问历史 5、删除过期短信
- 该项操作很占资源，如果没有出现页码不正确、无法解析文档等情况，不要执行本操作： +