feat(device): 增加设备信息持久化和OTA升级功能
- 新增设备持久化定时任务,每5分钟将Redis中采集的设备信息同步数据库 - 新增UserDevice和UserActive模型及相应数据库表和操作接口 - 设备信息上报中获取客户端公网IP,替代原X-Forwarded-For头部 - 新建OTA功能模块,实现OTA固件升级信息查询接口 - 支持OTA黑名单过滤与定向升级设备判断 - 设计OTA相关数据库结构:ota、black_list、ota_target_device表 - 缓存预热新增按品牌分组预热型号缓存 - 依赖注入新增OTA Repository及Handler路由配置 - 实现客户端公网IP提取逻辑,支持多种代理头部优先级识别
This commit is contained in:
+26
-1
@@ -14,9 +14,11 @@ import (
|
||||
"github.com/luxsin/app-api/internal/cache"
|
||||
"github.com/luxsin/app-api/internal/config"
|
||||
"github.com/luxsin/app-api/internal/database"
|
||||
"github.com/luxsin/app-api/internal/model"
|
||||
"github.com/luxsin/app-api/internal/repository"
|
||||
"github.com/luxsin/app-api/internal/router"
|
||||
"github.com/luxsin/app-api/internal/search"
|
||||
"github.com/luxsin/app-api/internal/task"
|
||||
"github.com/luxsin/app-api/pkg/logger"
|
||||
"github.com/redis/go-redis/v9"
|
||||
"go.uber.org/zap"
|
||||
@@ -67,6 +69,11 @@ func main() {
|
||||
// 启动时预热缓存
|
||||
warmUpCache(log, db, rdb)
|
||||
|
||||
// 启动定时刷入任务:每 5 分钟从 Redis 刷入数据库
|
||||
deviceRepo := repository.NewDeviceRepository(db)
|
||||
devicePersistTask := task.NewDevicePersistTask(rdb, deviceRepo, log)
|
||||
devicePersistTask.Start(5 * time.Minute)
|
||||
|
||||
engine := router.New(log, db, searchClient, rdb)
|
||||
|
||||
srv := &http.Server{
|
||||
@@ -119,12 +126,30 @@ func warmUpCache(log *zap.Logger, db *sql.DB, rdb *redis.Client) {
|
||||
log.Info("brand cache warmed up", zap.Int("count", len(brands)))
|
||||
}
|
||||
|
||||
// 预热 model:all
|
||||
// 预热 model:all + model:brand:{brandName}
|
||||
if allModels, err := modelRepo.ListAllFromDB(ctx); err != nil {
|
||||
log.Warn("model warm-up failed", zap.Error(err))
|
||||
} else if err := modelCache.SetAll(ctx, allModels); err != nil {
|
||||
log.Warn("model cache set failed", zap.Error(err))
|
||||
} else {
|
||||
log.Info("model cache warmed up", zap.Int("count", len(allModels)))
|
||||
|
||||
// 按品牌分组预热 model:brand:{brandName}
|
||||
grouped := groupModelsByBrand(allModels)
|
||||
for brandName, models := range grouped {
|
||||
if err := modelCache.SetByBrand(ctx, brandName, models); err != nil {
|
||||
log.Warn("model brand cache set failed", zap.String("brand", brandName), zap.Error(err))
|
||||
}
|
||||
}
|
||||
log.Info("model brand cache warmed up", zap.Int("brands", len(grouped)))
|
||||
}
|
||||
}
|
||||
|
||||
// groupModelsByBrand 按品牌分组型号列表
|
||||
func groupModelsByBrand(models []model.Model) map[string][]model.Model {
|
||||
result := make(map[string][]model.Model)
|
||||
for _, m := range models {
|
||||
result[m.BrandName] = append(result[m.BrandName], m)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user