fix: JSON_CONTAINS 参数类型修复 + API sync
- 修复 JSON_CONTAINS(node_group_ids, int64) 类型错误,改为传 JSON 字符串 - 添加 node_group_ids IS NOT NULL 兼容判断,防止 NULL 列报错 - 同步 apis/ 及 routes.go、compat_types.go 改动 Co-Authored-By: claude-flow <ruv@ruv.net>
This commit is contained in:
@@ -321,6 +321,9 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
|
||||
|
||||
// Query quota task pre-count
|
||||
adminMarketingGroupRouter.POST("/quota/pre-count", adminMarketing.QueryQuotaTaskPreCountHandler(serverCtx))
|
||||
|
||||
// Query quota task status
|
||||
adminMarketingGroupRouter.POST("/quota/status", adminMarketing.QueryQuotaTaskStatusHandler(serverCtx))
|
||||
}
|
||||
|
||||
adminOrderGroupRouter := router.Group("/v1/admin/order")
|
||||
@@ -808,6 +811,15 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
|
||||
|
||||
// Submit contact info
|
||||
commonGroupRouter.POST("/contact", common.SubmitContactHandler(serverCtx))
|
||||
|
||||
// Report log message
|
||||
commonGroupRouter.POST("/log/report", common.ReportLogMessageHandler(serverCtx))
|
||||
|
||||
// Check verification code (legacy v1)
|
||||
commonGroupRouter.POST("/check_code", auth.CheckCodeLegacyV1Handler(serverCtx))
|
||||
|
||||
// Check verification code (legacy v2, consume code)
|
||||
commonGroupRouter.POST("/check_code/v2", auth.CheckCodeLegacyV2Handler(serverCtx))
|
||||
}
|
||||
|
||||
publicAnnouncementGroupRouter := router.Group("/v1/public/announcement")
|
||||
@@ -923,6 +935,9 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
|
||||
|
||||
// Get user subscribe node info
|
||||
publicSubscribeGroupRouter.GET("/node/list", publicSubscribe.QueryUserSubscribeNodeListHandler(serverCtx))
|
||||
|
||||
// Get subscribe group list
|
||||
publicSubscribeGroupRouter.GET("/group/list", publicSubscribe.QuerySubscribeGroupListHandler(serverCtx))
|
||||
}
|
||||
|
||||
publicTicketGroupRouter := router.Group("/v1/public/ticket")
|
||||
@@ -957,11 +972,11 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
|
||||
|
||||
// Get Agent Downloads
|
||||
publicUserGroupRouter.GET("/agent_downloads", publicUser.GetAgentDownloadsHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/agent/downloads", publicUser.GetAgentDownloadsHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/agent/downloads", publicUser.GetAgentDownloadsHandler(serverCtx)) // alias: backward-compat
|
||||
|
||||
// Get Agent Realtime
|
||||
publicUserGroupRouter.GET("/agent_realtime", publicUser.GetAgentRealtimeHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/agent/realtime", publicUser.GetAgentRealtimeHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/agent/realtime", publicUser.GetAgentRealtimeHandler(serverCtx)) // alias: backward-compat
|
||||
|
||||
// Query User Balance Log
|
||||
publicUserGroupRouter.GET("/balance_log", publicUser.QueryUserBalanceLogHandler(serverCtx))
|
||||
@@ -1010,11 +1025,11 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
|
||||
|
||||
// Get Invite Sales
|
||||
publicUserGroupRouter.GET("/invite_sales", publicUser.GetInviteSalesHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/invite/sales", publicUser.GetInviteSalesHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/invite/sales", publicUser.GetInviteSalesHandler(serverCtx)) // alias: backward-compat
|
||||
|
||||
// Get User Invite Stats
|
||||
publicUserGroupRouter.GET("/invite_stats", publicUser.GetUserInviteStatsHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/invite/stats", publicUser.GetUserInviteStatsHandler(serverCtx))
|
||||
publicUserGroupRouter.GET("/invite/stats", publicUser.GetUserInviteStatsHandler(serverCtx)) // alias: backward-compat
|
||||
|
||||
// Get Login Log
|
||||
publicUserGroupRouter.GET("/login_log", publicUser.GetLoginLogHandler(serverCtx))
|
||||
|
||||
@@ -2,6 +2,7 @@ package subscribe
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/perfect-panel/server/pkg/tool"
|
||||
@@ -113,7 +114,9 @@ func (m *customSubscribeModel) FilterList(ctx context.Context, params *FilterPar
|
||||
}
|
||||
if params.NodeGroupId != nil {
|
||||
// Filter by node_group_ids using JSON_CONTAINS
|
||||
query = query.Where("JSON_CONTAINS(node_group_ids, ?)", *params.NodeGroupId)
|
||||
// JSON_CONTAINS requires a JSON string, not a bare integer
|
||||
jsonVal := fmt.Sprintf("%d", *params.NodeGroupId)
|
||||
query = query.Where("(node_group_ids IS NOT NULL AND JSON_CONTAINS(node_group_ids, ?))", jsonVal)
|
||||
}
|
||||
if lang != "" {
|
||||
query = query.Where("language = ?", lang)
|
||||
@@ -205,8 +208,10 @@ func (m *customSubscribeModel) FilterListByNodeGroups(ctx context.Context, param
|
||||
|
||||
// Condition 2: JSON_CONTAINS(node_group_ids, id) for each id
|
||||
for _, id := range params.NodeGroupIds {
|
||||
conditions = append(conditions, "JSON_CONTAINS(node_group_ids, ?)")
|
||||
args = append(args, id)
|
||||
// JSON_CONTAINS requires a JSON string value, not a bare integer
|
||||
jsonVal := fmt.Sprintf("%d", id)
|
||||
conditions = append(conditions, "node_group_ids IS NOT NULL AND JSON_CONTAINS(node_group_ids, ?)")
|
||||
args = append(args, jsonVal)
|
||||
}
|
||||
|
||||
// Combine with OR: (node_group_id IN (...) OR JSON_CONTAINS(node_group_ids, id1) OR ...)
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
package types
|
||||
|
||||
// compat_types.go — 手动补充的类型,已同步到 .api 定义
|
||||
// 下次用 goctl 重新生成 types.go 后,以下类型会自动包含在 types.go 中,届时可以删除本文件中对应的定义:
|
||||
// - ContactRequest (已加入 common.api)
|
||||
// - GetDownloadLinkRequest / GetDownloadLinkResponse (已加入 common.api)
|
||||
// - EmailLoginRequest (已更新 auth.api, 加入 form tag)
|
||||
// - ReportLogMessageRequest / ReportLogMessageResponse (已加入 common.api, 路由 POST /v1/common/log/report)
|
||||
// - LegacyCheckVerificationCodeRequest / LegacyCheckVerificationCodeResponse (已加入 common.api, 路由 POST /v1/common/check_code)
|
||||
|
||||
type ContactRequest struct {
|
||||
Name string `json:"name" validate:"required,max=100"`
|
||||
Email string `json:"email" validate:"required,email"`
|
||||
|
||||
Reference in New Issue
Block a user