调整官网500后台卡问题

调整官网500后台卡问题，admin.update.移除文档加载完执行hasNewVersion();

src/admin/api.php

@@ -128,8 +128,8 @@ if ($action === 'is_need_check_code') {
     $data = $dhd->GetHtml();
     if (empty($data)) {
         echo json_encode(array(
-            "code"=>-1,
-            "msg"=>'获取版本信息失败',
+            "code" => -1,
+            "msg" => '获取版本信息失败',
         ));
     } else {
         echo $data;
@@ -144,8 +144,8 @@ if ($action === 'is_need_check_code') {
     $data = $dhd->GetJSON();
     if (empty($data)) {
         echo json_encode(array(
-            "code"=>-1,
-            "msg"=>'获取版本信息失败',
+            "code" => -1,
+            "msg" => '获取版本信息失败',
         ));
         exit();
     }
@@ -175,8 +175,8 @@ if ($action === 'is_need_check_code') {
     $data = $dhd->GetJSON();
     if (empty($data)) {
         echo json_encode(array(
-            "code"=>-1,
-            "msg"=>'获取版本信息失败',
+            "code" => -1,
+            "msg" => '获取版本信息失败',
         ));
         exit;
     }
@@ -212,8 +212,8 @@ if ($action === 'is_need_check_code') {
     $data = $dhd->GetHtml();
     if (empty($data)) {
         echo json_encode(array(
-            "code"=>-1,
-            "msg"=>'获取版本信息失败',
+            "code" => -1,
+            "msg" => '获取版本信息失败',
         ));
         exit;
     }
@@ -426,6 +426,5 @@ if ($action === 'is_need_check_code') {
         "msg" => "上传成功",
         "data" => $activepath."/".$filename,
     ));
-
 }
 ?>

src/admin/tpl.php

@@ -159,8 +159,7 @@ if (!defined('DEDEINC')) {
 function lib_demotag(\$ctag, \$refObj)
 {
     global \$dsql, \$envs;
-    //属性处理
-    \$attlist = \"row|12,titlelen|30\";
+    \$attlist = \"row|10,titlelen|30\";
     FillAttsDefault(\$ctag->CAttribute->Items,\$attlist);
     extract(\$ctag->CAttribute->Items, EXTR_SKIP);
     \$revalue = '';

src/static/web/js/admin.update.js

@@ -19,7 +19,7 @@ function update() {
 			if (rs.data.finish === false) {
 				setTimeout(() => {
 					update();
-				}, 500);
+				}, 1000);
 			} else {
 				currentStep++
 				$("#_msgInfo").html('');
@@ -50,7 +50,6 @@ function hasNewVersion() {
 	});
 }
 $(document).ready(function() {
-	hasNewVersion();
 	$("#btnCancel").click(function() {
 		currentStep = 1;
 		$("#_fileList").html(``);

src/system/libraries/dedehttpdown.class.php

@@ -130,7 +130,6 @@ class DedeHttpDown
         $this->m_httphead = array();
         $this->m_html = '';
         $this->Close();
-
         //初始化系统
         $this->PrivateInit($url);
         $this->PrivateStartSession('GET');
@@ -429,8 +428,7 @@ class DedeHttpDown
             fputs($this->m_fp, "Content-Type: application/x-www-form-urlencoded\r\n");
             fputs($this->m_fp, "Content-Length: $plen\r\n");
         }
-        //发送固定的结束请求头
-        //HTTP1.1协议必须指定文档结束后关闭链接,否则读取文档时无法使用feof判断结束
+        //发送固定的结束请求头HTTP1.1协议必须指定文档结束后关闭链接，否则读取文档时无法使用feof判断结束
         if ($httpv == "HTTP/1.1") {
             fputs($this->m_fp, "Connection: Close\r\n\r\n");
         } else {

src/system/taglib/cattree.lib.php

@@ -10,7 +10,11 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_cattree(&$ctag, &$refObj)
 {
     global $dsql;
+<<<<<<< Updated upstream
     $attlist = "showall|,catid|0"; //处理showall在空或不存在时，强制用产品模型id。如果是yes刚显示整个语言区栏目树，为其它数字则是这个数字的模型的id；typeid指定顶级树id，指定后的前一个属性无效
+=======
+    $attlist = "showall|,catid|0"; //showall在空或不存在时，强制用产品模型id；如果是yes刚显示整个语言区栏目树，为其它数字则是这个数字的模型的id；typeid指定顶级树id，指定后，前一个属性无效
+>>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $revalue = '';

src/system/taglib/demotag.lib.php

@@ -12,7 +12,11 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_demotag(&$ctag, &$refObj)
 {
     global $dsql, $envs;
+<<<<<<< Updated upstream
     $attlist = "row|10,titlelen|24";
+=======
+    $attlist = "row|10,titlelen|30";
+>>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $revalue = '';

src/system/taglib/feedback.lib.php

@@ -12,7 +12,11 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_feedback(&$ctag, &$refObj)
 {
     global $dsql;
+<<<<<<< Updated upstream
     $attlist = "row|10,titlelen|30,infolen|160,orderby|";
+=======
+    $attlist = "row|10,titlelen|30,infolen|150,orderby|";
+>>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $innertext = trim($ctag->GetInnerText());

src/system/taglib/infolink.lib.php

@@ -26,7 +26,11 @@ function is_str_float($value){
 function lib_infolink(&$ctag, &$refObj)
 {
     global $dsql, $nativeplace, $infotype, $cfg_rewrite, $cfg_mainsite, $em_nativeplaces, $em_infotypes;
+<<<<<<< Updated upstream
     //$attlist="row|10,titlelen|30";
+=======
+    //$attlist="row|12,titlelen|30";
+>>>>>>> Stashed changes
     //FillAttsDefault($ctag->CAttribute->Items,$attlist);
     //extract($ctag->CAttribute->Items, EXTR_SKIP);
     $baseurl = preg_replace("#\/$#", '', $cfg_mainsite);

src/system/taglib/likearticle.lib.php

@@ -12,7 +12,11 @@ if (!defined('DEDEINC')) exit ('dedebiz');
 function lib_likearticle(&$ctag, &$refObj)
 {
     global $dsql;
+<<<<<<< Updated upstream
     $attlist = "row|10,titlelen|30,infolen|160,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90";
+=======
+    $attlist = "row|10,titlelen|30,infolen|150,col|1,tablewidth|100,mytypeid|0,byabs|0,imgwidth|120,imgheight|90";
+>>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     $revalue = '';

src/system/taglib/relation.lib.php

@@ -9,11 +9,14 @@ if (!defined('DEDEINC')) exit ('dedebiz');
  * @license        GNU GPL v2 (https://www.dedebiz.com/license)
  * @link           https://www.dedebiz.com
  */
-//关联文档
 function lib_relation(&$ctag, &$refObj)
 {
     global $dsql;
+<<<<<<< Updated upstream
     $attlist = "row|10,titlelen|30,infolen|160,name|default,orderby|";
+=======
+    $attlist = "row|10,titlelen|30,infolen|150,name|default,orderby|";
+>>>>>>> Stashed changes
     FillAttsDefault($ctag->CAttribute->Items, $attlist);
     extract($ctag->CAttribute->Items, EXTR_SKIP);
     if (get_class($refObj) != "Archives") {