yangy
f3e3e82f52
- 新增设备持久化定时任务，每5分钟将Redis中采集的设备信息同步数据库 - 新增UserDevice和UserActive模型及相应数据库表和操作接口 - 设备信息上报中获取客户端公网IP，替代原X-Forwarded-For头部 - 新建OTA功能模块，实现OTA固件升级信息查询接口 - 支持OTA黑名单过滤与定向升级设备判断 - 设计OTA相关数据库结构：ota、black_list、ota_target_device表 - 缓存预热新增按品牌分组预热型号缓存 - 依赖注入新增OTA Repository及Handler路由配置 - 实现客户端公网IP提取逻辑，支持多种代理头部优先级识别
83 lines
1.6 KiB
Go
83 lines
1.6 KiB
Go
package handler
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/luxsin/app-api/pkg/encode"
|
|
"github.com/redis/go-redis/v9"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
type DeviceHandler struct {
|
|
redis *redis.Client
|
|
log *zap.Logger
|
|
}
|
|
|
|
func NewDeviceHandler(redis *redis.Client, log *zap.Logger) *DeviceHandler {
|
|
return &DeviceHandler{
|
|
redis: redis,
|
|
log: log,
|
|
}
|
|
}
|
|
|
|
func (h *DeviceHandler) ReportDevInfo(c *gin.Context) {
|
|
mac := strings.TrimSpace(c.Query("mac"))
|
|
model := strings.TrimSpace(c.Query("model"))
|
|
ver := strings.TrimSpace(c.Query("ver"))
|
|
clientIP := encode.ClientPublicIP(c)
|
|
|
|
if mac == "" || model == "" {
|
|
c.JSON(http.StatusOK, gin.H{
|
|
"code": 400,
|
|
"msg": "参数校验失败",
|
|
})
|
|
return
|
|
}
|
|
|
|
if ver == "" {
|
|
ver = ""
|
|
}
|
|
|
|
h.log.Info("report dev info",
|
|
zap.String("remote_ip", clientIP),
|
|
zap.String("time", time.Now().Format("2006-01-02 15:04:05")),
|
|
)
|
|
|
|
deviceInfo := map[string]string{
|
|
"mac_addr": mac,
|
|
"model": model,
|
|
"active_date": time.Now().Format("2006-01-02"),
|
|
"ip_addr": clientIP,
|
|
"ver": ver,
|
|
}
|
|
|
|
jsonData, err := json.Marshal(deviceInfo)
|
|
if err != nil {
|
|
h.log.Error("marshal device info failed", zap.Error(err))
|
|
c.JSON(http.StatusOK, gin.H{
|
|
"code": 500,
|
|
"msg": "系统错误",
|
|
})
|
|
return
|
|
}
|
|
|
|
ctx := c.Request.Context()
|
|
if err := h.redis.HSet(ctx, "devices", mac, jsonData).Err(); err != nil {
|
|
h.log.Error("redis hset failed", zap.Error(err))
|
|
c.JSON(http.StatusOK, gin.H{
|
|
"code": 500,
|
|
"msg": "系统错误",
|
|
})
|
|
return
|
|
}
|
|
|
|
c.JSON(http.StatusOK, gin.H{
|
|
"code": 200,
|
|
"msg": "操作成功",
|
|
})
|
|
}
|