From 61e5f4a1bf032e4edb0b37748b9b4051a59bec3f 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: Thu, 1 May 2025 01:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=92=8C=E4=BB=A3=E7=A0=81=E7=BE=8E=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/ai_dialog.php | 6 +++--- src/admin/api.php | 29 ++++++++++++++--------------- src/admin/sys_data.php | 10 +++++----- src/admin/sys_info.php | 17 +++++++---------- src/admin/sys_sql_query.php | 18 +++++++----------- src/system/common.func.php | 12 ++++++------ src/system/taglib/jsonq.lib.php | 2 +- 7 files changed, 43 insertions(+), 51 deletions(-) diff --git a/src/admin/ai_dialog.php b/src/admin/ai_dialog.php index 15114643..fef5e336 100644 --- a/src/admin/ai_dialog.php +++ b/src/admin/ai_dialog.php @@ -8,7 +8,7 @@ * @license GNU GPL v2 (https://www.dedebiz.com/license) * @link https://www.dedebiz.com */ -require_once(dirname(__FILE__) . "/config.php"); +require_once(dirname(__FILE__)."/config.php"); if (empty($f)) { $f = 'form1.enclosure'; } @@ -17,10 +17,10 @@ if (empty($comeback)) { } $addparm = ''; if (!empty($CKEditor)) { - $addparm = '&CKEditor=' . $CKEditor; + $addparm = '&CKEditor='.$CKEditor; } if (!empty($CKEditorFuncNum)) { - $addparm .= '&CKEditorFuncNum=' . $CKEditorFuncNum; + $addparm .= '&CKEditorFuncNum='.$CKEditorFuncNum; } if (!empty($noeditor)) { $addparm .= '&noeditor=yes'; diff --git a/src/admin/api.php b/src/admin/api.php index 0048dbb0..dc8624c0 100644 --- a/src/admin/api.php +++ b/src/admin/api.php @@ -455,15 +455,14 @@ if ($action === 'is_need_check_code') { $params = $_GET; unset($params['action']); checkLogin(); - $params['timestamp'] = time(); // 加入时间戳 + $params['timestamp'] = time(); //加入时间戳 $cuserLogin = new userLogin(); - $params['adminid'] = $cuserLogin->getUserID(); // 加入时间戳 - $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; // 获取客户端IP - - ksort($params); // 按字典序排序 - $queryString = http_build_query($params); // 生成查询字符串 - $params['sign'] = md5($queryString . $cfg_ai_apikey); // 计算MD5签名 - $url = $cfg_ai_server . '/ai?' . http_build_query($params); + $params['adminid'] = $cuserLogin->getUserID(); //加入时间戳 + $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; //获取客户端IP + ksort($params); //按字典序排序 + $queryString = http_build_query($params); //生成查询字符串 + $params['sign'] = md5($queryString.$cfg_ai_apikey); //计算MD5签名 + $url = $cfg_ai_server.'/ai?'.http_build_query($params); echo json_encode(array( "code" => 0, "data" => $url, @@ -472,14 +471,14 @@ if ($action === 'is_need_check_code') { $params = $_GET; unset($params['action']); checkLogin(); - $params['timestamp'] = time(); // 加入时间戳 + $params['timestamp'] = time(); //加入时间戳 $cuserLogin = new userLogin(); - $params['adminid'] = $cuserLogin->getUserID(); // 加入时间戳 - $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; // 获取客户端IP - ksort($params); // 按字典序排序 - $queryString = http_build_query($params); // 生成查询字符串 - $params['sign'] = md5($queryString . $cfg_ai_apikey); // 计算MD5签名 - $url = $cfg_ai_server . '/api/setbody?' . http_build_query($params); + $params['adminid'] = $cuserLogin->getUserID(); //加入时间戳 + $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; //获取客户端IP + ksort($params); //按字典序排序 + $queryString = http_build_query($params); //生成查询字符串 + $params['sign'] = md5($queryString.$cfg_ai_apikey); //计算MD5签名 + $url = $cfg_ai_server.'/api/setbody?'.http_build_query($params); echo json_encode(array( "code" => 0, "data" => $url, diff --git a/src/admin/sys_data.php b/src/admin/sys_data.php index b0b62e3f..233b75f2 100644 --- a/src/admin/sys_data.php +++ b/src/admin/sys_data.php @@ -25,21 +25,21 @@ if ($dopost == "viewinfo") { if (empty($tablename)) { echo "没有指定表名"; } else { - // 获取创建表的 SQL 语句 + //获取创建表的SQL语句 $dsql->SetQuery("SELECT sql FROM sqlite_master WHERE type='table' AND name='$tablename'"); $dsql->Execute('me'); $row = $dsql->GetArray('me', SQLITE3_ASSOC); if ($row) { $createTableSql = $row['sql']; echo "创建表的 SQL 语句:\n"; - echo trim($createTableSql) . "\n\n"; + echo trim($createTableSql)."\n\n"; } - // 获取表的列信息 + //获取表的列信息 $dsql->SetQuery("PRAGMA table_info($tablename)"); $dsql->Execute('cols'); echo "表的列信息:\n"; while ($colRow = $dsql->GetArray('cols', SQLITE3_ASSOC)) { - echo "列名: " . $colRow['name'] . ", 类型: " . $colRow['type'] . ", 是否为主键: " . ($colRow['pk'] ? '是' : '否') . "\n"; + echo "列名: ".$colRow['name'].", 类型: ".$colRow['type'].", 是否为主键: ".($colRow['pk'] ? '是' : '否')."\n"; } } echo ''; @@ -70,7 +70,7 @@ else if ($dopost == "opimize") { if ($rs) { echo "执行优化表 {$tablename} 完成
"; } else { - echo "执行优化表 {$tablename} 失败,原因是:" . $dsql->GetError(); + echo "执行优化表 {$tablename} 失败,原因是:".$dsql->GetError(); } } else { $rs = $dsql->ExecuteNoneQuery("OPTIMIZE TABLE `$tablename`"); diff --git a/src/admin/sys_info.php b/src/admin/sys_info.php index e0a13c1e..c506ec28 100644 --- a/src/admin/sys_info.php +++ b/src/admin/sys_info.php @@ -171,16 +171,14 @@ exit; unset($params['dopost']); unset($params['apikey']); unset($params['server']); - $params['timestamp'] = time(); // 加入时间戳 + $params['timestamp'] = time(); //加入时间戳 $cuserLogin = new userLogin(); - $params['adminid'] = $cuserLogin->getUserID(); // 加入时间戳 - $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; // 获取客户端IP - - ksort($params); // 按字典序排序 - $queryString = http_build_query($params); // 生成查询字符串 - $params['sign'] = md5($queryString . $apikey); // 计算MD5签名 - $url = $server . '/api/ping?' . http_build_query($params); - + $params['adminid'] = $cuserLogin->getUserID(); //加入时间戳 + $params['ip'] = $_SERVER['REMOTE_ADDR'] ?? '127.0.0.1'; //获取客户端IP + ksort($params); //按字典序排序 + $queryString = http_build_query($params); //生成查询字符串 + $params['sign'] = md5($queryString.$apikey); //计算MD5签名 + $url = $server.'/api/ping?'.http_build_query($params); $dhd = new DedeHttpDown(); $dhd->OpenUrl($url); $data = $dhd->GetJSON(); @@ -190,7 +188,6 @@ exit; echo 'error'; } } - exit(); } include DedeInclude('templets/sys_info.htm'); diff --git a/src/admin/sys_sql_query.php b/src/admin/sys_sql_query.php index 07c842dd..71ffd71f 100644 --- a/src/admin/sys_sql_query.php +++ b/src/admin/sys_sql_query.php @@ -27,7 +27,7 @@ if ($dopost == "viewinfo") { $dsql->Execute('me'); $row = $dsql->GetArray('me', SQLITE3_ASSOC); if ($row) { - $createTableSql = str_replace(" ", "\r\n", $row['sql']); + $createTableSql = str_replace(" ", "\r\n", $row['sql']); echo trim($createTableSql)."\n\n"; } } @@ -224,7 +224,7 @@ else if ($dopost == "query") { DedeBIZ数据库文档 - +
@@ -235,10 +235,8 @@ else if ($dopost == "query") { '; while ($row = $dsql->GetArray('t', MYSQL_BOTH)) { $tableName = $row[0]; - $output .= '
-
- 表名: '.$tableName.' -
+ $output .= '
+
表名: '.$tableName.'
'; //获取表的注释 $dsql->SetQuery("SELECT TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '$tableName'"); @@ -251,7 +249,7 @@ else if ($dopost == "query") { //获取表的字段信息 $dsql->SetQuery("SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_DEFAULT, COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = '$tableName'"); $dsql->Execute('col'); - $output .= ' + $output .= '
@@ -282,10 +280,8 @@ else if ($dopost == "query") { '; } - $output .= ' -
-

版权所有 © '.date('Y').' DedeBIZ 保留所有权利。

-
+ $output .= '

版权所有 © '.date('Y').' DedeBIZ 保留所有权利。

+ '; //输出网页文档 diff --git a/src/system/common.func.php b/src/system/common.func.php index 314c349d..328c249a 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -692,7 +692,7 @@ function DedeSearchAPIURL($action, $parms=array()) $parms['q'] = isset($parms['id'])? $parms['id']:""; } //生成签名字符串 - $signBaseString = "key=" . DEDEBIZSEARCHKEY . "&q=".$parms['q']. "&pageSize=".$parms['pageSize']. "&page=".$parms['page']. "×tamp=".$parms['timestamp']; + $signBaseString = "key=".DEDEBIZSEARCHKEY."&q=".$parms['q']. "&pageSize=".$parms['pageSize']. "&page=".$parms['page']. "×tamp=".$parms['timestamp']; $parms['sign'] = md5($signBaseString); //使用MD5生成签名 if ($action == "delete" || $action == "add") { unset($parms['q']); @@ -701,7 +701,7 @@ function DedeSearchAPIURL($action, $parms=array()) } //拼接完整URL $finalQueryString = http_build_query($parms); - $finalUrl = $baseUrl . '?' . $finalQueryString; + $finalUrl = $baseUrl.'?'.$finalQueryString; return $finalUrl; } function ConvertMysqlToSqlite($mysqlQuery) { @@ -738,8 +738,8 @@ function ConvertMysqlToSqlite($mysqlQuery) { //处理PRIMARY KEY只能用于INTEGER if (preg_match('/PRIMARY KEY \(`(\w+)`\)/', $query, $matches)) { $primaryKeyColumn = $matches[1]; - $query = preg_replace('/,?\s*PRIMARY KEY\s*\(`' . $primaryKeyColumn . '`\)/i', '', $query); - $query = preg_replace('/(`' . $primaryKeyColumn . '`\s+INTEGER)/i', '$1 PRIMARY KEY', $query); + $query = preg_replace('/,?\s*PRIMARY KEY\s*\(`'.$primaryKeyColumn.'`\)/i', '', $query); + $query = preg_replace('/(`'.$primaryKeyColumn.'`\s+INTEGER)/i', '$1 PRIMARY KEY', $query); } //处理CONCAT替换为SQLite兼容形式 if (preg_match('/CONCAT\(([^)]*?)\)/i', $query, $matches)) { @@ -754,7 +754,7 @@ function ConvertMysqlToSqlite($mysqlQuery) { "/FIND_IN_SET\s*\(\s*'([^']+)'\s*,\s*([a-zA-Z0-9_`\.]+)\s*\)/i", function ($matches) { //返回SQLite兼容的LIKE语法 - return "(',' || " . $matches[2] . " || ',' LIKE '%," . $matches[1] . ",%')"; + return "(',' || ".$matches[2]." || ',' LIKE '%,".$matches[1].",%')"; }, $query ); @@ -772,7 +772,7 @@ function ConvertMysqlToSqlite($mysqlQuery) { $cases[] = "WHEN $field = $value THEN $position"; $position++; } - return "(CASE " . implode(' ', $cases) . " ELSE 0 END)"; + return "(CASE ".implode(' ', $cases)." ELSE 0 END)"; }, $query ); diff --git a/src/system/taglib/jsonq.lib.php b/src/system/taglib/jsonq.lib.php index 57d837e4..74d1cbcd 100644 --- a/src/system/taglib/jsonq.lib.php +++ b/src/system/taglib/jsonq.lib.php @@ -9,7 +9,7 @@ if (!defined('DEDEINC')) exit('dedebiz'); * @license GNU GPL v2 (https://www.dedebiz.com/license) * @link https://www.dedebiz.com */ -require_once(DEDEINC . "/libraries/jsonq/Jsonq.php"); +require_once(DEDEINC."/libraries/jsonq/Jsonq.php"); helper('cache'); function lib_jsonq(&$ctag, &$refObj) {
字段名