From 30a901b13d982988be4baf545afedcf3659a4646 Mon Sep 17 00:00:00 2001 From: redbotu Date: Mon, 18 May 2026 20:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A4=E8=AF=81=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc_scripts/PAM智能部署 Agent Skill 文档.md.md | 2 +- doc_scripts/PAM智能部署 Shell & Bat 脚本实现.md.md | 8 ++++---- doc_scripts/deploy.ps1 | 4 ++-- doc_scripts/deploy.sh | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc_scripts/PAM智能部署 Agent Skill 文档.md.md b/doc_scripts/PAM智能部署 Agent Skill 文档.md.md index 040735b..8b5e91f 100644 --- a/doc_scripts/PAM智能部署 Agent Skill 文档.md.md +++ b/doc_scripts/PAM智能部署 Agent Skill 文档.md.md @@ -70,7 +70,7 @@ description: 基于 PAM HOME/NODE 流程执行软件发布、下载、升级、 调用 NODE 侧接口时，始终携带： -- `Authorization: Basic {TOKEN}` +- `Authorization: Bearer {TOKEN}` - `Target-Node: {NODE_URL}` - `airport-code: {airportCode}`，仅在下载到 NODE 等需要时携带 diff --git a/doc_scripts/PAM智能部署 Shell & Bat 脚本实现.md.md b/doc_scripts/PAM智能部署 Shell & Bat 脚本实现.md.md index 5bfc994..b9f6659 100644 --- a/doc_scripts/PAM智能部署 Shell & Bat 脚本实现.md.md +++ b/doc_scripts/PAM智能部署 Shell & Bat 脚本实现.md.md @@ -165,7 +165,7 @@ http_request() { local curl_cmd="curl -X ${method} '${url}'" # 添加认证头 - curl_cmd="${curl_cmd} -H 'Authorization: Basic ${TOKEN}'" + curl_cmd="${curl_cmd} -H 'Authorization: Bearer ${TOKEN}'" # 添加额外 headers if [ -n "$headers" ]; then @@ -190,7 +190,7 @@ upload_file() { local file_path=$2 local form_data=$3 - local curl_cmd="curl -X POST '${url}' -H 'Authorization: Basic ${TOKEN}'" + local curl_cmd="curl -X POST '${url}' -H 'Authorization: Bearer ${TOKEN}'" # 添加 form 字段 IFS='&' read -ra FORM_ARRAY <<< "$form_data" @@ -609,11 +609,11 @@ if defined EXTRA_HEADERS ( :: 对于 HTTP 请求，如果数据中包含特殊字符，直接使用 PowerShell 的 Invoke-RestMethod 或 Invoke-WebRequest 更可靠 :: 这里为了保持与 Batch 逻辑的一致性，我们使用 curl 但通过 PowerShell 调用 curl 以保留 stderr if defined OUTPUT_FILE ( - powershell -Command "curl.exe -X '%METHOD%' '%URL%' -H 'Authorization: Basic %TOKEN%'" > "%OUTPUT_FILE%" 2>"%ERROR_FILE%" + powershell -Command "curl.exe -X '%METHOD%' '%URL%' -H 'Authorization: Bearer %TOKEN%'" > "%OUTPUT_FILE%" 2>"%ERROR_FILE%" :: 注意：如果 DATA 非空，需要重新构造命令。为了简化，我们假设大部分 POST 数据是简单的 form-urlencoded，且不含极端特殊字符，或者使用 PowerShell 内部变量传递。 :: **更安全的做法**：对于包含复杂 Data 的请求，直接使用 PowerShell。 ) else ( - curl -X %METHOD% '%URL%' -H 'Authorization: Basic %TOKEN%' 2>&1 + curl -X %METHOD% '%URL%' -H 'Authorization: Bearer %TOKEN%' 2>&1 ) :: *修正*：为了确保所有请求（特别是带 DATA 的）都能正确处理特殊字符，我们将核心请求逻辑交给 PowerShell 执行，或者确保 curl 命令被正确转义。 diff --git a/doc_scripts/deploy.ps1 b/doc_scripts/deploy.ps1 index e8302b0..ab85833 100644 --- a/doc_scripts/deploy.ps1 +++ b/doc_scripts/deploy.ps1 @@ -204,7 +204,7 @@ function Invoke-PamWebRequest { $allHeaders = @{} if ($Token) { - $allHeaders['Authorization'] = "Basic $Token" + $allHeaders['Authorization'] = "Bearer $Token" } foreach ($key in $Headers.Keys) { $allHeaders[$key] = $Headers[$key] @@ -258,7 +258,7 @@ function Invoke-PamMultipartUpload { $client = [System.Net.Http.HttpClient]::new() try { $client.DefaultRequestHeaders.Authorization = - [System.Net.Http.Headers.AuthenticationHeaderValue]::new('Basic', $Token) + [System.Net.Http.Headers.AuthenticationHeaderValue]::new('Bearer', $Token) $content = [System.Net.Http.MultipartFormDataContent]::new() foreach ($entry in $Fields.GetEnumerator()) { diff --git a/doc_scripts/deploy.sh b/doc_scripts/deploy.sh index 1457074..c1c72d3 100644 --- a/doc_scripts/deploy.sh +++ b/doc_scripts/deploy.sh @@ -84,7 +84,7 @@ mask_sensitive_text() { text="$(printf '%s' "$text" | sed -E \ -e 's/(client_secret=)[^&[:space:]]+/\1***MASKED***/g' \ - -e 's/(Authorization: Basic )[^\r\n]+/\1***MASKED***/g' \ + -e 's/(Authorization: (Basic|Bearer) )[^\r\n]+/\1***MASKED***/g' \ -e 's/("access_token"[[:space:]]*:[[:space:]]*")[^"]+/\1***MASKED***/g' \ -e 's/("client_secret"[[:space:]]*:[[:space:]]*")[^"]+/\1***MASKED***/g')" @@ -428,8 +428,8 @@ http_request() { cmd=(curl -sS -X "$method" "$url") if [[ -n "$TOKEN" ]]; then - cmd+=(-H "Authorization: Basic ${TOKEN}") - headers_text+="Authorization: Basic ${TOKEN}"$'\n' + cmd+=(-H "Authorization: Bearer ${TOKEN}") + headers_text+="Authorization: Bearer ${TOKEN}"$'\n' fi if [[ -n "$content_type" ]]; then @@ -493,8 +493,8 @@ upload_file() { cmd=(curl -sS -X POST "$url") if [[ -n "$TOKEN" ]]; then - cmd+=(-H "Authorization: Basic ${TOKEN}") - fields_text+="Authorization: Basic ${TOKEN}"$'\n' + cmd+=(-H "Authorization: Bearer ${TOKEN}") + fields_text+="Authorization: Bearer ${TOKEN}"$'\n' fi cmd+=(-F "file=@${file_path}") @@ -738,11 +738,11 @@ download_log() { mkdir -p "$logs_dir" next_trace_id request_id="$CURRENT_TRACE_ID" - trace_request "$request_id" "GET" "$trace_url" "Authorization: Basic ${TOKEN}"$'\n'"Target-Node: ${NODE_URL}" "" + trace_request "$request_id" "GET" "$trace_url" "Authorization: Bearer ${TOKEN}"$'\n'"Target-Node: ${NODE_URL}" "" if curl -sS -X GET \ "$trace_url" \ - -H "Authorization: Basic ${TOKEN}" \ + -H "Authorization: Bearer ${TOKEN}" \ -H "Target-Node: ${NODE_URL}" \ -o "$log_file" \ -w '%{http_code}' > "${err_file}.code" 2>"$err_file"; then