新增删除分享码功能
This commit is contained in:
Vendored
+34
@@ -28,6 +28,7 @@
|
||||
// 创建: Lua 原子写入 hash + SADD pending + ZADD mac 索引
|
||||
// 查询: ZREMRANGEBYSCORE 清过期索引 → ZRANGE 取剩余 → HGETALL 兆底校验
|
||||
// 导入: HGETALL hash → HSET import:pending (幂等)
|
||||
// 删除: 校验 mac+code → DEL hash + SREM pending + ZREM mac 索引
|
||||
// 持久化: 每 5 分钟任务 SMEMBERS/HGETALL pending → INSERT DB → 移除 pending 条目
|
||||
package cache
|
||||
|
||||
@@ -84,6 +85,27 @@ redis.call('EXPIRE', KEYS[3], tonumber(ARGV[9]))
|
||||
return 1
|
||||
`)
|
||||
|
||||
var shareDeleteScript = redis.NewScript(`
|
||||
if redis.call('EXISTS', KEYS[1]) == 0 then
|
||||
return 0
|
||||
end
|
||||
if redis.call('HGET', KEYS[1], 'mac_addr') ~= ARGV[1] then
|
||||
return -1
|
||||
end
|
||||
redis.call('DEL', KEYS[1])
|
||||
redis.call('SREM', KEYS[2], ARGV[2])
|
||||
redis.call('ZREM', KEYS[3], ARGV[2])
|
||||
return 1
|
||||
`)
|
||||
|
||||
type ShareDeleteResult int
|
||||
|
||||
const (
|
||||
ShareDeleteNotFound ShareDeleteResult = 0
|
||||
ShareDeleteForbidden ShareDeleteResult = -1
|
||||
ShareDeleteOK ShareDeleteResult = 1
|
||||
)
|
||||
|
||||
type ShareImportPendingLog struct {
|
||||
MacAddr string `json:"mac_addr"`
|
||||
ShareCode string `json:"share_code"`
|
||||
@@ -296,6 +318,18 @@ func (c *ShareCodeCache) ListByMac(ctx context.Context, macAddr string) ([]*Shar
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (c *ShareCodeCache) Delete(ctx context.Context, macAddr, shareCode string) (ShareDeleteResult, error) {
|
||||
key := shareCodeKey(shareCode)
|
||||
macIdxKey := shareMacIndexKey(macAddr)
|
||||
ok, err := shareDeleteScript.Run(ctx, c.rdb, []string{key, sharePendingSet, macIdxKey},
|
||||
macAddr, shareCode,
|
||||
).Int()
|
||||
if err != nil {
|
||||
return ShareDeleteNotFound, fmt.Errorf("delete share code in redis: %w", err)
|
||||
}
|
||||
return ShareDeleteResult(ok), nil
|
||||
}
|
||||
|
||||
func shareMacIndexKey(macAddr string) string {
|
||||
return shareMacIndexPrefix + macAddr
|
||||
}
|
||||
|
||||
@@ -313,3 +313,70 @@ func (h *ShareCodeHandler) lookupShareCode(c *gin.Context, shareCode string) (*c
|
||||
}
|
||||
return data, true
|
||||
}
|
||||
|
||||
// DeleteShareCode 删除分享码
|
||||
//
|
||||
// @Summary 删除 EQ 分享码
|
||||
// @Description 根据 MAC 与分享码删除 Redis 中的分享码数据(仅创建者可删除)
|
||||
// @Tags ShareCode
|
||||
// @Produce json
|
||||
// @Param mac query string true "设备 MAC 地址"
|
||||
// @Param shareCode query string true "5 位分享码"
|
||||
// @Success 200 {object} map[string]any "删除成功"
|
||||
// @Failure 400 {object} map[string]any "参数校验失败"
|
||||
// @Failure 500 {object} map[string]any "系统错误"
|
||||
// @Router /audio/shareDelete [get]
|
||||
//
|
||||
// GET /audio/shareDelete?mac=xx&shareCode=ABC12
|
||||
func (h *ShareCodeHandler) DeleteShareCode(c *gin.Context) {
|
||||
mac := strings.TrimSpace(c.Query("mac"))
|
||||
shareCode := strings.TrimSpace(c.Query("shareCode"))
|
||||
|
||||
if mac == "" || shareCode == "" {
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"code": 400,
|
||||
"msg": "参数校验失败",
|
||||
})
|
||||
return
|
||||
}
|
||||
if len(shareCode) != 5 {
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"code": 0,
|
||||
"msg": "分享码无效或已过期",
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
ctx := c.Request.Context()
|
||||
result, err := h.cache.Delete(ctx, mac, shareCode)
|
||||
if err != nil {
|
||||
h.log.Error("delete share code failed",
|
||||
zap.String("mac", mac),
|
||||
zap.String("share_code", shareCode),
|
||||
zap.Error(err),
|
||||
)
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"code": 500,
|
||||
"msg": "系统错误",
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
switch result {
|
||||
case cache.ShareDeleteOK:
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"code": 200,
|
||||
"msg": "操作成功",
|
||||
})
|
||||
case cache.ShareDeleteForbidden:
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"code": 0,
|
||||
"msg": "无权删除该分享码",
|
||||
})
|
||||
default:
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"code": 0,
|
||||
"msg": "分享码无效或已过期",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,7 @@ func New(log *zap.Logger, db *sql.DB, searchClient *search.Client, rdb *redis.Cl
|
||||
audio.GET("/shareList", shareCode.ListShareCodesByMac)
|
||||
audio.GET("/shareQuery", shareCode.QueryShareCode)
|
||||
audio.GET("/shareAccept", shareCode.ImportShareCode)
|
||||
audio.GET("/shareDelete", shareCode.DeleteShareCode)
|
||||
}
|
||||
|
||||
return r
|
||||
|
||||
Reference in New Issue
Block a user