This commit is contained in:
2025-08-04 10:49:24 +08:00
parent 84ccaa56de
commit 4b1eb11986
11 changed files with 194 additions and 72 deletions

View File

@@ -2,13 +2,14 @@ package api
import (
"ZhenTuLocalPassiveAdapter/dto"
"ZhenTuLocalPassiveAdapter/logger"
"bytes"
"context"
"fmt"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.uber.org/zap"
"io"
"log"
"net/http"
"os"
)
@@ -20,7 +21,7 @@ func UploadTaskFile(ctx context.Context, task dto.Task, file dto.FileObject) err
if err != nil {
return err
}
log.Printf("开始上传文件, URL:【%s】\n", url)
logger.Info("开始上传文件", zap.String("url", url))
if err := OssUpload(subCtx, url, file.URL); err != nil {
return err
}

View File

@@ -3,11 +3,12 @@ package api
import (
"ZhenTuLocalPassiveAdapter/config"
"ZhenTuLocalPassiveAdapter/dto"
"ZhenTuLocalPassiveAdapter/logger"
"bytes"
"encoding/json"
"fmt"
"go.uber.org/zap"
"io"
"log"
"net/http"
)
@@ -19,24 +20,24 @@ func SyncTask() ([]dto.Task, error) {
}
jsonData, err := json.Marshal(requestBody)
if err != nil {
log.Println("Error marshaling JSON:", err)
logger.Error("序列化JSON失败", zap.Error(err))
return nil, err
}
req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
if err != nil {
log.Println("Error creating request:", err)
logger.Error("创建请求失败", zap.Error(err))
return nil, err
}
req.Header.Set("Content-Type", "application/json")
resp, err := GetAPIClient().Do(req)
if err != nil {
log.Println("Error sending request:", err)
logger.Error("发送请求失败", zap.Error(err))
return nil, err
}
defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
if err != nil {
log.Println("Error reading response body:", err)
logger.Error("读取响应体失败", zap.Error(err))
return nil, err
}
@@ -44,12 +45,13 @@ func SyncTask() ([]dto.Task, error) {
var response dto.TaskListResponse
err = json.Unmarshal(body, &response)
if err != nil {
log.Println("->:", string(body))
log.Println("Error unmarshaling response body:", err)
logger.Error("解析响应体失败",
zap.String("responseBody", string(body)),
zap.Error(err))
return nil, err
}
if response.Code != 200 {
log.Println("Error response code:", response.Code)
logger.Error("响应错误码", zap.Int("code", response.Code))
return nil, fmt.Errorf(response.Msg)
}
return response.Data, nil

View File

@@ -3,13 +3,14 @@ package api
import (
"ZhenTuLocalPassiveAdapter/config"
"ZhenTuLocalPassiveAdapter/dto"
"ZhenTuLocalPassiveAdapter/logger"
"bytes"
"context"
"encoding/json"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.uber.org/zap"
"io"
"log"
"net/http"
)
@@ -23,14 +24,14 @@ func QueryUploadUrlForTask(ctx context.Context, taskId string) (string, error) {
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "创建请求失败")
log.Println("Error creating request:", err)
logger.Error("创建请求失败", zap.Error(err))
return "", err
}
resp, err := GetAPIClient().Do(req)
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "发送请求失败")
log.Println("Error sending request:", err)
logger.Error("发送请求失败", zap.Error(err))
return "", err
}
span.SetAttributes(attribute.String("http.status", resp.Status))
@@ -40,7 +41,7 @@ func QueryUploadUrlForTask(ctx context.Context, taskId string) (string, error) {
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "读取响应体失败")
log.Println("Error reading response body:", err)
logger.Error("读取响应体失败", zap.Error(err))
return "", err
}
return string(body), nil
@@ -57,7 +58,7 @@ func ReportTaskFailure(ctx context.Context, taskId string) bool {
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "创建请求失败")
log.Println("Error creating request:", err)
logger.Error("创建请求失败", zap.Error(err))
return false
}
@@ -65,7 +66,7 @@ func ReportTaskFailure(ctx context.Context, taskId string) bool {
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "发送请求失败")
log.Println("Error sending request:", err)
logger.Error("发送请求失败", zap.Error(err))
return false
}
defer resp.Body.Close()
@@ -92,7 +93,7 @@ func ReportTaskSuccess(ctx context.Context, taskId string, file *dto.FileObject)
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "序列化JSON失败")
log.Println("Error marshaling JSON:", err)
logger.Error("序列化JSON失败", zap.Error(err))
return false
}
@@ -100,7 +101,7 @@ func ReportTaskSuccess(ctx context.Context, taskId string, file *dto.FileObject)
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "创建请求失败")
log.Println("Error creating request:", err)
logger.Error("创建请求失败", zap.Error(err))
return false
}
req.Header.Set("Content-Type", "application/json")
@@ -109,7 +110,7 @@ func ReportTaskSuccess(ctx context.Context, taskId string, file *dto.FileObject)
if err != nil {
span.SetAttributes(attribute.String("error", err.Error()))
span.SetStatus(codes.Error, "发送请求失败")
log.Println("Error sending request:", err)
logger.Error("发送请求失败", zap.Error(err))
return false
}
defer resp.Body.Close()