diff --git a/src/admin/api.php b/src/admin/api.php index 28bbfd5c..8a6f0d05 100644 --- a/src/admin/api.php +++ b/src/admin/api.php @@ -88,6 +88,22 @@ if ($action === 'is_need_check_code') { require_once(DEDEINC.'/libraries/dedehttpdown.class.php'); checkLogin(); //是否存在更新版本 + $phpv = phpversion(); + $sp_os = PHP_OS; + $mysql_ver = $dsql->GetVersion(); + $nurl = $_SERVER['HTTP_HOST']; + if (preg_match("#[a-z\-]{1,}\.[a-z]{2,}#i", $nurl)) { + $nurl = urlencode($nurl); + } else { + $nurl = "test"; + } + $add_query = ''; + $query = "SELECT COUNT(*) AS dd FROM `#@__member` "; + $row1 = $dsql->GetOne($query); + if ($row1) $add_query .= "&mcount={$row1['dd']}"; + $query = "SELECT COUNT(*) AS dd FROM `#@__arctiny` "; + $row2 = $dsql->GetOne($query); + if ($row2) $add_query .= "&acount={$row2['dd']}"; $offUrl = DEDEBIZURL."/version?version={$cfg_version_detail}&formurl={$nurl}&phpver={$phpv}&os={$sp_os}&mysqlver={$mysql_ver}{$add_query}&json=1"; $dhd = new DedeHttpDown(); $dhd->OpenUrl($offUrl); diff --git a/src/install/sql-dfdata.txt b/src/install/sql-dfdata.txt index c2c47a1f..c4d275c2 100755 --- a/src/install/sql-dfdata.txt +++ b/src/install/sql-dfdata.txt @@ -4082,7 +4082,8 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin ('146', 'cfg_bizcore_port', 'DedeBIZ Core端口', 1, 'number', '8181'), ('147', 'cfg_bizcore_appid', 'DedeBIZ Core应用ID', 1, 'string', ''), ('148', 'cfg_bizcore_key', 'DedeBIZ Core通信密钥', 1, 'string', ''), -('149', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'); +('149', 'cfg_tags_dir', '标签生成目录', 7, 'string', '{cmspath}/a/tags'), +('150', 'cfg_bizcore_api', 'DedeBIZ Core接口服务器', 1, 'string', 'http://localhost:8087'); INSERT INTO `#@__sys_module` VALUES(1, '1f35620fb42d452fa2bdc1dee1690f92', '文件管理器', '', '', 0, ''), (2, 'b437d85a7a7bc778c9c79b5ec36ab9aa', '友情链接', '', '', 0, ''), diff --git a/src/install/update.txt b/src/install/update.txt index 02992770..d25a9bc2 100644 --- a/src/install/update.txt +++ b/src/install/update.txt @@ -104,4 +104,7 @@ DELETE FROM `#@__sysconfig` WHERE `#@__sysconfig`.`varname` = 'cfg_vdcode_member ALTER TABLE `#@__arctype` CHANGE COLUMN `iscross` `cross` tinyint(1) NOT NULL DEFAULT 0 AFTER `ishidden`; ALTER TABLE `#@__admin` ADD COLUMN `loginerr` tinyint NULL DEFAULT 0 AFTER `loginip`; ALTER TABLE `#@__member` ADD COLUMN `loginerr` tinyint NULL DEFAULT 0 AFTER `checkmail`; -ALTER TABLE `#@__member` ADD COLUMN `send_max` int NULL DEFAULT 0 AFTER `loginerr`; \ No newline at end of file +ALTER TABLE `#@__member` ADD COLUMN `send_max` int NULL DEFAULT 0 AFTER `loginerr`; + +-- 6.2.3 +INSERT INTO `#@__sysconfig` (`varname`, `info`, `groupid`, `type`, `value`) VALUES ('cfg_bizcore_api', 'DedeBIZ Core接口服务器', 1, 'string', 'http://localhost:8087'); \ No newline at end of file diff --git a/src/system/dedetag.class.php b/src/system/dedetag.class.php index f382d841..9693d7c4 100755 --- a/src/system/dedetag.class.php +++ b/src/system/dedetag.class.php @@ -814,8 +814,9 @@ class DedeTagParse } else { return $DedeFieldValue; } - } catch (Exception $e) { + } catch (Throwable $e) { //or die("$functionname"); + echo DedeAlert('模板存在无法解析的标签,请检查模板标签后更新网站,错误提示:'.$e->getMessage(),ALERT_WARNING); return ''; } }