juip/jh-zz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 journal 包的 log 参数名问题

Browse Source
This commit is contained in:
luorijun
2025-08-19 11:29:35 +08:00
parent 0c32337168
commit 95c1a34ea4
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
actions/sync.go
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 {

12
actions/update.go
View File

@@ -89,7 +89,7 @@ func update(tx *gorm.DB, arg UpdateArgs) error {
count := len(gateways2Update)
if count > city.EdgesCount {
slog.Warn("城市节点数量不足，跳过本次更新", "城市", city.Name, "节点数", city.EdgesCount, "网关数", count)
slog.Warn(fmt.Sprintf("城市节点数量不足，跳过本次更新，城市：%s，节点数：%d，网关数：%d", city.Name, city.EdgesCount, count))
continue
}
@@ -98,7 +98,7 @@ func update(tx *gorm.DB, arg UpdateArgs) error {
return fmt.Errorf("查询城市 %s 可用节点失败：%w", city.Name, err)
}
if len(edges) < count {
slog.Debug("城市节点不足，将循环使用节点", "城市", city.Name, "节点数", city.EdgesCount, "网关数", count)
slog.Debug(fmt.Sprintf("城市节点不足，将循环使用节点，城市：%s，节点数：%d，网关数：%d", city.Name, city.EdgesCount, count))
edges, err = SliceActiveEdges(tx, city.Id, 0, count)
if err != nil {
return fmt.Errorf("查询城市 %s 可用节点失败：%w", city.Name, err)
@@ -117,7 +117,7 @@ func update(tx *gorm.DB, arg UpdateArgs) error {
newConfig := edges[iGateway]
if exists {
slog.Debug("网关配置变更", "网关", gateway.Macaddr, "旧节点", oldConfig.Macaddr, "新节点", newConfig.Macaddr)
slog.Debug(fmt.Sprintf("网关配置变更，网关：%s，旧节点：%s，新节点：%s", gateway.Macaddr, oldConfig.Macaddr, newConfig.Macaddr))
configs2Update = append(configs2Update, model.ConfigUpdate{
Id: oldConfig.Id,
@@ -133,7 +133,7 @@ func update(tx *gorm.DB, arg UpdateArgs) error {
},
}
} else {
slog.Debug("网关配置新增", "网关", gateway.Macaddr, "新节点", newConfig.Macaddr)
slog.Debug(fmt.Sprintf("网关配置新增，网关：%s，新节点：%s", gateway.Macaddr, newConfig.Macaddr))
configs2Create = append(configs2Create, model.Config{
Cityhash: city.Hash,
@@ -184,11 +184,11 @@ func update(tx *gorm.DB, arg UpdateArgs) error {
setup++
}
}
slog.Info("提交网关配置", "网关", gateway.Macaddr, "变更", change, "新增", setup)
slog.Info(fmt.Sprintf("提交网关配置，网关：%s，变更数：%d，新增数：%d", gateway.Macaddr, change, setup))
// 提交配置到云端：配置版本 gateway.ConfigVersion
if arg.Mock {
slog.Info("[MOCK] 配置网关", "网关", gateway.Macaddr, "配置", edges)
slog.Info(fmt.Sprintf("[MOCK] 配置网关，网关：%s，配置：%v", gateway.Macaddr, edges))
} else {
err := jd.GatewayConfigSet(gateway.ConfigVersion, gateway.Macaddr, edges)
if err != nil {