audio/app-api
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分享码日志新增 model 字段，记录操作的设备的型号 X8/X9

Browse Source
This commit is contained in:
eafonyang
2026-06-17 13:52:11 +08:00
parent 1e7dc01b22
commit 7687e6a0d9
12 changed files with 214 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cache/share_code_cache.go
Vendored
+17 -9
View File
@@ -5,6 +5,7 @@
// share:{code} Hash, TTL = SHARE_CODE_TTL_MIN — 分享码主数据
// mac_addr 创建者 MAC 地址
// ip_addr 创建者 IP
// model 操作设备型号
// eq_data EQ 参数 JSON
// expire_at 过期时间 (RFC3339)
// persisted 是否已刷入 DB ("0"/"1")
@@ -57,6 +58,7 @@ const (
fieldMacAddr = "mac_addr"
fieldIPAddr = "ip_addr"
fieldModel = "model"
fieldEqData = "eq_data"
fieldExpireAt = "expire_at"
fieldPersisted = "persisted"
@@ -69,21 +71,23 @@ end
redis.call('HSET', KEYS[1],
'mac_addr', ARGV[1],
'ip_addr', ARGV[2],
'eq_data', ARGV[3],
'expire_at', ARGV[4],
'model', ARGV[3],
'eq_data', ARGV[4],
'expire_at', ARGV[5],
'persisted', '0'
)
redis.call('EXPIRE', KEYS[1], tonumber(ARGV[5]))
redis.call('SADD', KEYS[2], ARGV[6])
redis.call('EXPIRE', KEYS[1], tonumber(ARGV[6]))
redis.call('SADD', KEYS[2], ARGV[7])
-- ZSET: score = expire_at unix timestamp, member = share code
redis.call('ZADD', KEYS[3], tonumber(ARGV[7]), ARGV[6])
redis.call('EXPIRE', KEYS[3], tonumber(ARGV[8]))
redis.call('ZADD', KEYS[3], tonumber(ARGV[8]), ARGV[7])
redis.call('EXPIRE', KEYS[3], tonumber(ARGV[9]))
return 1
`)
type ShareImportPendingLog struct {
MacAddr string `json:"mac_addr"`
ShareCode string `json:"share_code"`
Model string `json:"model"`
IpAddr string `json:"ip_addr"`
EqData string `json:"eq_data"`
ExpireAt string `json:"expire_at"`
@@ -93,6 +97,7 @@ type ShareCodeData struct {
ShareCode string
MacAddr string
IpAddr string
Model string
EqData string
ExpireAt time.Time
Persisted bool
@@ -112,7 +117,7 @@ func (c *ShareCodeCache) ShareCodeTTL() time.Duration {
return c.codeTTL
}
func (c *ShareCodeCache) Create(ctx context.Context, macAddr, ipAddr string, eqData []byte) (*ShareCodeData, error) {
func (c *ShareCodeCache) Create(ctx context.Context, macAddr, ipAddr, model string, eqData []byte) (*ShareCodeData, error) {
expireAt := time.Now().Add(c.codeTTL)
eqJSON := string(eqData)
@@ -125,7 +130,7 @@ func (c *ShareCodeCache) Create(ctx context.Context, macAddr, ipAddr string, eqD
key := shareCodeKey(code)
macIdxKey := shareMacIndexKey(macAddr)
ok, err := shareCreateScript.Run(ctx, c.rdb, []string{key, sharePendingSet, macIdxKey},
macAddr, ipAddr, eqJSON, expireAt.Format(time.RFC3339), int(c.codeTTL.Seconds()), code, expireAt.Unix(), int(c.codeTTL.Seconds()),
macAddr, ipAddr, model, eqJSON, expireAt.Format(time.RFC3339), int(c.codeTTL.Seconds()), code, expireAt.Unix(), int(c.codeTTL.Seconds()),
).Int()
if err != nil {
return nil, fmt.Errorf("create share code in redis: %w", err)
@@ -135,6 +140,7 @@ func (c *ShareCodeCache) Create(ctx context.Context, macAddr, ipAddr string, eqD
ShareCode: code,
MacAddr: macAddr,
IpAddr: ipAddr,
Model: model,
EqData: eqJSON,
ExpireAt: expireAt,
Persisted: false,
@@ -164,6 +170,7 @@ func (c *ShareCodeCache) Get(ctx context.Context, shareCode string) (*ShareCodeD
ShareCode: shareCode,
MacAddr: values[fieldMacAddr],
IpAddr: values[fieldIPAddr],
Model: values[fieldModel],
EqData: values[fieldEqData],
ExpireAt: expireAt,
Persisted: values[fieldPersisted] == "1",
@@ -208,11 +215,12 @@ func (c *ShareCodeCache) MarkPersisted(ctx context.Context, shareCode string) er
return c.rdb.SRem(ctx, sharePendingSet, shareCode).Err()
}
func (c *ShareCodeCache) EnqueueImportLog(ctx context.Context, macAddr, shareCode, ipAddr, eqData string, expireAt time.Time) error {
func (c *ShareCodeCache) EnqueueImportLog(ctx context.Context, macAddr, shareCode, model, ipAddr, eqData string, expireAt time.Time) error {
field := fmt.Sprintf("%s:%s", macAddr, shareCode) // 同 MAC+code 幂等，避免重复导入产生多条记录
payload, err := json.Marshal(ShareImportPendingLog{
MacAddr: macAddr,
ShareCode: shareCode,
Model: model,
IpAddr: ipAddr,
EqData: eqData,
ExpireAt: expireAt.Format(time.RFC3339),
internal/handler/share_code.go
+28 -7
View File
@@ -7,6 +7,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/luxsin/app-api/internal/cache"
"github.com/luxsin/app-api/internal/model"
"github.com/luxsin/app-api/pkg/encode"
"go.uber.org/zap"
)
@@ -28,17 +29,18 @@ func NewShareCodeHandler(shareCache *cache.ShareCodeCache, log *zap.Logger, maxP
// @Tags ShareCode
// @Accept json
// @Produce json
// @Param body body object{mac=string,eq_data=object} true "分享请求"
// @Param body body object{mac=string,model=string,eq_data=object} true "分享请求，model 取值 Luxsin-X9 或 Luxsin-X8"
// @Success 200 {object} map[string]any "成功返回 share_code、expire_at、eq_data"
// @Failure 400 {object} map[string]any "参数校验失败"
// @Failure 500 {object} map[string]any "系统错误"
// @Router /audio/shareCreate [post]
//
// POST /audio/shareCreate
// Body: {"mac": "xx", "eq_data": {...}}
// Body: {"mac": "xx", "model": "Luxsin-X9", "eq_data": {...}}
func (h *ShareCodeHandler) ExportShareCode(c *gin.Context) {
var req struct {
Mac string `json:"mac"`
Model string `json:"model"`
EqData json.RawMessage `json:"eq_data"`
}
if err := c.ShouldBindJSON(&req); err != nil {
@@ -50,10 +52,11 @@ func (h *ShareCodeHandler) ExportShareCode(c *gin.Context) {
}
mac := strings.TrimSpace(req.Mac)
deviceModel := strings.TrimSpace(req.Model)
eqDataRaw := strings.TrimSpace(string(req.EqData))
clientIP := encode.ClientPublicIP(c)
if mac == "" || eqDataRaw == "" {
if mac == "" || deviceModel == "" || eqDataRaw == "" {
c.JSON(http.StatusOK, gin.H{
"code": 400,
"msg": "参数校验失败",
@@ -61,6 +64,14 @@ func (h *ShareCodeHandler) ExportShareCode(c *gin.Context) {
return
}
if !model.IsValidShareDeviceModel(deviceModel) {
c.JSON(http.StatusOK, gin.H{
"code": 400,
"msg": "model 参数无效",
})
return
}
if !json.Valid([]byte(eqDataRaw)) {
c.JSON(http.StatusOK, gin.H{
"code": 400,
@@ -89,7 +100,7 @@ func (h *ShareCodeHandler) ExportShareCode(c *gin.Context) {
return
}
data, err := h.cache.Create(ctx, mac, clientIP, []byte(eqDataRaw))
data, err := h.cache.Create(ctx, mac, clientIP, deviceModel, []byte(eqDataRaw))
if err != nil {
h.log.Error("create share code failed", zap.Error(err))
c.JSON(http.StatusOK, gin.H{
@@ -205,19 +216,21 @@ func (h *ShareCodeHandler) QueryShareCode(c *gin.Context) {
// @Tags ShareCode
// @Produce json
// @Param mac query string true "设备 MAC 地址"
// @Param model query string true "操作设备型号，取值 Luxsin-X9 或 Luxsin-X8"
// @Param shareCode query string true "5 位分享码"
// @Success 200 {object} map[string]any "成功返回 eq_data"
// @Failure 400 {object} map[string]any "参数校验失败"
// @Failure 500 {object} map[string]any "系统错误"
// @Router /audio/shareAccept [get]
//
// GET /audio/shareAccept?mac=xx&shareCode=ABC12
// GET /audio/shareAccept?mac=xx&model=Luxsin-X9&shareCode=ABC12
func (h *ShareCodeHandler) ImportShareCode(c *gin.Context) {
mac := strings.TrimSpace(c.Query("mac"))
deviceModel := strings.TrimSpace(c.Query("model"))
shareCode := strings.TrimSpace(c.Query("shareCode"))
clientIP := encode.ClientPublicIP(c)
if mac == "" || shareCode == "" {
if mac == "" || deviceModel == "" || shareCode == "" {
c.JSON(http.StatusOK, gin.H{
"code": 400,
"msg": "参数校验失败",
@@ -225,13 +238,21 @@ func (h *ShareCodeHandler) ImportShareCode(c *gin.Context) {
return
}
if !model.IsValidShareDeviceModel(deviceModel) {
c.JSON(http.StatusOK, gin.H{
"code": 400,
"msg": "model 参数无效",
})
return
}
data, ok := h.lookupShareCode(c, shareCode)
if !ok {
return
}
ctx := c.Request.Context()
if err := h.cache.EnqueueImportLog(ctx, mac, shareCode, clientIP, data.EqData, data.ExpireAt); err != nil {
if err := h.cache.EnqueueImportLog(ctx, mac, shareCode, deviceModel, clientIP, data.EqData, data.ExpireAt); err != nil {
h.log.Error("enqueue share import log failed",
zap.String("share_code", shareCode),
zap.Error(err),
internal/model/share_code.go
+10
View File
@@ -2,11 +2,21 @@ package model
import "time"
const (
ShareDeviceModelX9 = "Luxsin-X9"
ShareDeviceModelX8 = "Luxsin-X8"
)
func IsValidShareDeviceModel(model string) bool {
return model == ShareDeviceModelX9 || model == ShareDeviceModelX8
}
type ShareCodeLog struct {
ID int
MacAddr string
ShareCode string
Action string // export | import
Model string
IpAddr string
EqData []byte
ExpireAt *time.Time
internal/repository/share_code.go
+3 -3
View File
@@ -18,8 +18,8 @@ func NewShareCodeRepository(db *sql.DB) *ShareCodeRepository {
}
func (r *ShareCodeRepository) InsertLog(ctx context.Context, log model.ShareCodeLog) error {
const query = `INSERT INTO share_code_log (mac_addr, share_code, action, ip_addr, eq_data, expire_at)
VALUES (?, ?, ?, ?, ?, ?)`
const query = `INSERT INTO share_code_log (mac_addr, share_code, action, model, ip_addr, eq_data, expire_at)
VALUES (?, ?, ?, ?, ?, ?, ?)`
var expireAt any
if log.ExpireAt != nil {
@@ -27,7 +27,7 @@ func (r *ShareCodeRepository) InsertLog(ctx context.Context, log model.ShareCode
}
_, err := r.db.ExecContext(ctx, query,
log.MacAddr, log.ShareCode, log.Action, log.IpAddr, log.EqData, expireAt,
log.MacAddr, log.ShareCode, log.Action, log.Model, log.IpAddr, log.EqData, expireAt,
)
if err != nil {
return fmt.Errorf("insert share_code_log: %w", err)
internal/task/share_code_persist.go
+2
View File
@@ -158,6 +158,7 @@ func (t *ShareCodePersistTask) persistExportOne(ctx context.Context, shareCode s
MacAddr: data.MacAddr,
ShareCode: data.ShareCode,
Action: "export",
Model: data.Model,
IpAddr: data.IpAddr,
EqData: []byte(data.EqData),
ExpireAt: repository.ParseShareExpireAt(data.ExpireAt),
@@ -207,6 +208,7 @@ func (t *ShareCodePersistTask) persistImportOne(ctx context.Context, field, payl
MacAddr: pending.MacAddr,
ShareCode: pending.ShareCode,
Action: "import",
Model: pending.Model,
IpAddr: pending.IpAddr,
EqData: []byte(pending.EqData),
ExpireAt: repository.ParseShareExpireAt(expireAt),