From b7ccbf3692ca580d4999a77cf3103d1722d1a042 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?= Date: Sun, 29 Dec 2024 23:40:40 +0800 Subject: [PATCH 1/8] Update common.func.php --- src/system/common.func.php | 58 ++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/src/system/common.func.php b/src/system/common.func.php index 2366a912..6fce0396 100755 --- a/src/system/common.func.php +++ b/src/system/common.func.php @@ -607,36 +607,31 @@ function GetMimeTypeOrExtension($str, $t = 0) { return "dedebiz"; } } -// 用于实际请求接口并返回处理结果 +//用于实际请求接口并返回处理结果 function DedeSearchDo($action, $parms=array()) { if ($action === 'update') { DedeSearchDo('delete', $parms); return DedeSearchDo('add', $parms); } - // 生成完整请求 URL + //生成完整请求URL $url = DedeSearchAPIURL($action, $parms); - - // 初始化 cURL + //初始化cURL $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $url); // 设置请求 URL - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // 返回结果而不是直接输出 - curl_setopt($ch, CURLOPT_TIMEOUT, 10); // 设置超时时间(秒) - curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 设置连接超时(秒) - curl_setopt($ch, CURLOPT_USERAGENT, 'DedeSearchAPI/1.0'); // 设置 User-Agent - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // 支持https连接 - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // 支持https连接 - - // 执行请求 + curl_setopt($ch, CURLOPT_URL, $url); //设置请求URL + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); //返回结果而不是直接输出 + curl_setopt($ch, CURLOPT_TIMEOUT, 10); //设置超时时间(秒) + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); //设置连接超时(秒) + curl_setopt($ch, CURLOPT_USERAGENT, 'DedeSearchAPI/1.0'); //设置User-Agent + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); //支持https连接 + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); //支持https连接 + //执行请求 $response = curl_exec($ch); - - // 获取 HTTP 状态码和错误信息 + //获取HTTP状态码和错误信息 $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); $curlError = curl_error($ch); - - // 关闭 cURL 资源 + //关闭cURL资源 curl_close($ch); - - // 处理 HTTP 错误 + //处理HTTP错误 if ($response === false || $httpCode !== 200) { return array( 'code' => -1, @@ -644,8 +639,7 @@ function DedeSearchDo($action, $parms=array()) { 'data' => null, ); } - - // 解析返回的 JSON 数据 + //解析返回的JSON数据 $result = json_decode($response, true); if (json_last_error() !== JSON_ERROR_NONE) { return array( @@ -654,8 +648,7 @@ function DedeSearchDo($action, $parms=array()) { 'data' => null, ); } - - // 检查返回的业务逻辑中的 code + //检查返回的业务逻辑中的code if (!isset($result['code']) || $result['code'] !== 0) { return array( 'code' => isset($result['code'])? $result['code'] : -3, @@ -663,21 +656,19 @@ function DedeSearchDo($action, $parms=array()) { 'data' => null, ); } - - // 返回成功结果 + //返回成功结果 return array( 'code' => 0, 'message' => 'Success', 'data' => isset($result['data'])? $result['data'] : null, ); } -// 获取接口地址 +//获取接口地址 function DedeSearchAPIURL($action, $parms=array()) { - $baseUrl = DEDEBIZSEARCHHOST."/api/$action"; // 替换为实际的 API 地址 - - // 添加公共参数 - $timestamp = time(); // 当前时间戳 + $baseUrl = DEDEBIZSEARCHHOST."/api/$action"; //替换为实际的API地址 + //添加公共参数 + $timestamp = time(); //当前时间戳 $parms['timestamp'] = $timestamp; $parms['pageSize'] = isset($parms['pageSize'])? $parms['pageSize']:10; $parms['page'] = isset($parms['page'])? $parms['page']:1; @@ -687,16 +678,15 @@ function DedeSearchAPIURL($action, $parms=array()) $parms['page'] = 0; $parms['q'] = isset($parms['id'])? $parms['id']:""; } - - // 生成签名字符串 + //生成签名字符串 $signBaseString = "key=" . DEDEBIZSEARCHKEY . "&q=".$parms['q']. "&pageSize=".$parms['pageSize']. "&page=".$parms['page']. "×tamp=".$parms['timestamp']; - $parms['sign'] = md5($signBaseString); // 使用 MD5 生成签名 + $parms['sign'] = md5($signBaseString); //使用MD5生成签名 if ($action == "delete" || $action == "add") { unset($parms['q']); unset($parms['pageSize']); unset($parms['page']); } - // 拼接完整 URL + //拼接完整URL $finalQueryString = http_build_query($parms); $finalUrl = $baseUrl . '?' . $finalQueryString; From 442bf12aa27c5ea5804f15796e2e975b6b228bb3 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?= Date: Mon, 30 Dec 2024 00:11:02 +0800 Subject: [PATCH 2/8] 1 --- src/admin/sys_admin_user_add.php | 2 +- src/admin/sys_admin_user_edit.php | 2 +- src/admin/templets/sys_info.htm | 8 ++++---- src/static/web/css/admin.css | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/admin/sys_admin_user_add.php b/src/admin/sys_admin_user_add.php index 4be80f23..1d1464cc 100644 --- a/src/admin/sys_admin_user_add.php +++ b/src/admin/sys_admin_user_add.php @@ -71,7 +71,7 @@ $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); $typeOptions = ''; //递归获取分类 -function getTypeOptions($id=0,$sep="└") +function getTypeOptions($id=0,$sep="└─") { global $dsql,$typeOptions; $dsql->SetQuery("SELECT id,typename,ispart FROM `#@__arctype` WHERE reid={$id} AND (ispart=0 OR ispart=1 OR ispart=2) ORDER BY sortrank"); diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php index d8783a60..b8c1e176 100644 --- a/src/admin/sys_admin_user_edit.php +++ b/src/admin/sys_admin_user_edit.php @@ -111,7 +111,7 @@ if ($dopost == 'saveedit') { $randcode = mt_rand(10000, 99999); $safecode = substr(md5($cfg_cookie_encode.$randcode), 0, 24); //递归获取分类 -function getTypeOptions($id=0,$sep="└") +function getTypeOptions($id=0,$sep="└─") { global $dsql,$typeOptions,$typeids; $dsql->SetQuery("SELECT id,typename,ispart FROM `#@__arctype` WHERE reid={$id} AND (ispart=0 OR ispart=1 OR ispart=2) ORDER BY sortrank"); diff --git a/src/admin/templets/sys_info.htm b/src/admin/templets/sys_info.htm index ea4a451f..27045f8b 100644 --- a/src/admin/templets/sys_info.htm +++ b/src/admin/templets/sys_info.htm @@ -55,10 +55,10 @@ 变量说明 - 变量名称 - 变量值 + 变量名称 + 变量类型 @@ -143,9 +143,9 @@ } else if ($row['type']=='img') { echo " "; if ($row['value']) { - echo " "; + echo " "; } else { - echo " "; + echo " "; } } else { $addstr=''; diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index bd0e8317..0779bbd6 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -718,7 +718,7 @@ span.page-link { color:var(--white); background:var(--green) } -input,select,textarea,button,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,#edsta,.cke_chrome,.cke_inner,.card,.form-control,.btn,.alert,.rounded { +input,select,textarea,.colordlg,.pubdlg,.quickselitem .topcat,.mysource,.mywriter,#edsta,.cke_chrome,.cke_inner,.card,.form-control,.btn,.alert,.rounded { border-radius:var(--b-radius)!important } .cke_top { From 1e077c694fa0800f4208ff70c235e38c43014261 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?= Date: Mon, 30 Dec 2024 00:20:28 +0800 Subject: [PATCH 3/8] Update admin.css --- src/static/web/css/admin.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 0779bbd6..45b3df86 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -203,8 +203,7 @@ textarea { .admin-head .logo .version { padding:0 0.15rem; font-size:12px; - color:var(--white); - vertical-align:top + color:var(--white) } .admin-head .nav-item { position:relative From 69e082f8a4d196f70bad93e48702a7d525b7c900 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?= Date: Mon, 30 Dec 2024 11:32:03 +0800 Subject: [PATCH 4/8] 2 --- src/admin/templets/index.htm | 2 +- src/static/web/css/admin.css | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 40cfb104..e8d05977 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -46,7 +46,7 @@ -
+