修复 journal 包的 log 参数名问题

This commit is contained in:
2025-08-19 11:29:35 +08:00
parent 0c32337168
commit 95c1a34ea4
2 changed files with 12 additions and 17 deletions

View File

@@ -2,10 +2,11 @@ package actions
import (
"fmt"
"gorm.io/gorm"
"log/slog"
"zzman/clients/jd"
"zzman/model"
"gorm.io/gorm"
)
// Sync 同步城市节点数据
@@ -20,11 +21,11 @@ func Sync() (err error) {
if err != nil {
return fmt.Errorf("获取所有城市失败: %w", err)
}
slog.Info("成功获取城市列表", slog.Int("城市数量", len(cities)))
slog.Info(fmt.Sprintf("成功获取城市列表,城市数量%d", len(cities)))
// 获取所有城市的节点数据
for i, city := range cities {
slog.Info("正在同步城市", slog.String("城市", city.Name), slog.String("哈希", city.Hash))
slog.Info(fmt.Sprintf("正在同步城市,城市:%s哈希%s", city.Name, city.Hash))
// 新节点信息
resp, err := jd.EdgeDevice(jd.EdgeDeviceReq{
@@ -36,7 +37,7 @@ func Sync() (err error) {
return fmt.Errorf("获取城市 %s:%s 的边缘设备失败: %w", city.Name, city.Hash, err)
}
var newEdges = resp.Edges
slog.Info("获取节点数据完成", slog.String("城市", city.Name), slog.Int("节点数量", len(newEdges)))
slog.Info(fmt.Sprintf("获取节点数据完成,城市:%s节点数%d", city.Name, len(newEdges)))
err = model.DB.Transaction(func(tx *gorm.DB) error {
// 旧节点信息
@@ -79,13 +80,7 @@ func Sync() (err error) {
return fmt.Errorf("通过MAC地址删除边缘节点失败: %w", err)
}
slog.Info("城市同步完成",
slog.Int("新节点", len(newEdges)),
slog.Int("旧节点", len(oldEdges)),
slog.Int("移除", len(oldEdgesMacs)),
slog.Int("同步", len(edgeSaves)),
slog.String("进度", fmt.Sprintf("%d/%d", i+1, len(cities))),
)
slog.Info(fmt.Sprintf("城市同步完成,新节点:%d旧节点%d移除%d同步%d进度%d/%d", len(newEdges), len(oldEdges), len(oldEdgesMacs), len(edgeSaves), i+1, len(cities)))
return nil
})
if err != nil {