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/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),