diff --git a/server-rs/crates/preview-deployer-server/src/jenkins.rs b/server-rs/crates/preview-deployer-server/src/jenkins.rs index 19d9e8be3..74cf27217 100644 --- a/server-rs/crates/preview-deployer-server/src/jenkins.rs +++ b/server-rs/crates/preview-deployer-server/src/jenkins.rs @@ -52,9 +52,7 @@ pub struct PreviewResult { #[serde(alias = "id")] pub deployment_id: Option, pub project_name: Option, - #[serde(alias = "sourceBranch")] pub branch: Option, - #[serde(alias = "sourceCommit")] pub resolved_commit: Option, pub status: Option, pub health: Option, @@ -273,10 +271,11 @@ impl JenkinsClient { if !response.status().is_success() { return Err(format!("Jenkins 状态返回 HTTP {}", response.status())); } - response - .json() + let bytes = response + .bytes() .await - .map_err(|_| "Jenkins 状态响应格式无效".to_string()) + .map_err(|error| format!("Jenkins 状态响应正文读取失败: {error}"))?; + serde_json::from_slice(&bytes).map_err(|error| format!("Jenkins 状态响应格式无效: {error}")) } async fn get_json_with_retry(&self, url: Url) -> Result { diff --git a/server-rs/crates/preview-deployer-server/src/tests.rs b/server-rs/crates/preview-deployer-server/src/tests.rs index 615981c31..dc13bf960 100644 --- a/server-rs/crates/preview-deployer-server/src/tests.rs +++ b/server-rs/crates/preview-deployer-server/src/tests.rs @@ -130,7 +130,7 @@ async fn mock_artifact(axum::extract::Path(build): axum::extract::Path) -> "deploymentId": "preview-63d38d3da6bc9b06", "projectName": "genarrative-preview-63d38d3da6bc9b06", "branch": "feature/preview-ui", - "sourceCommit": "0123456789abcdef0123456789abcdef01234567", + "resolvedCommit": "0123456789abcdef0123456789abcdef01234567", "phase": "RUNNING", "healthStatus": "HEALTHY", "webUrl": "http://192.168.35.82:8400",