优化违禁词
This commit is contained in:
@@ -3,6 +3,7 @@ package handler
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"backend/internal/model"
|
||||
@@ -57,7 +58,23 @@ func (h *AdminReadHandler) Logs(c *gin.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
items, total, stats, err := h.admin.Logs(c.Request.Context(), limit, offset, kind, status, nil, since, "", "", c.Query("source"), false, false, false)
|
||||
// ?user= — server-side 用户搜索: resolve the term to matching user ids
|
||||
// (name/email/id contains, case-insensitive) and filter rows to those users.
|
||||
// A term that matches nobody must return zero rows, not the unfiltered list.
|
||||
var userIDs []string
|
||||
if term := strings.TrimSpace(c.Query("user")); term != "" {
|
||||
ids, uerr := h.admin.MatchUserIDs(c.Request.Context(), term)
|
||||
if uerr != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||
return
|
||||
}
|
||||
if len(ids) == 0 {
|
||||
ids = []string{"__no_match__"}
|
||||
}
|
||||
userIDs = ids
|
||||
}
|
||||
|
||||
items, total, stats, err := h.admin.Logs(c.Request.Context(), limit, offset, kind, status, nil, since, "", userIDs, strings.TrimSpace(c.Query("q")), "", c.Query("source"), false, false, false)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||
return
|
||||
|
||||
@@ -77,6 +77,30 @@ func (h *BannedWordsHandler) Import(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"added": added, "skipped": skipped})
|
||||
}
|
||||
|
||||
// Hits — 违禁词触发列表: who triggered which word and when, newest first,
|
||||
// with server-side pagination + ?q= search (违禁词/用户名/提示词, 跨页).
|
||||
func (h *BannedWordsHandler) Hits(c *gin.Context) {
|
||||
limit := parseInt(c.Query("limit"), 50)
|
||||
offset := parseInt(c.Query("offset"), 0)
|
||||
items, total, err := h.words.ListHits(c.Request.Context(), strings.TrimSpace(c.Query("q")), limit, offset)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load banned word hits"})
|
||||
return
|
||||
}
|
||||
out := make([]gin.H, 0, len(items))
|
||||
for _, hit := range items {
|
||||
out = append(out, gin.H{
|
||||
"id": hit.ID,
|
||||
"word": hit.Word,
|
||||
"user_id": hit.UserID,
|
||||
"user_name": hit.UserName,
|
||||
"prompt": hit.Prompt,
|
||||
"created_at": hit.CreatedAt,
|
||||
})
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"data": out, "total": total})
|
||||
}
|
||||
|
||||
func (h *BannedWordsHandler) Delete(c *gin.Context) {
|
||||
n, err := h.words.Delete(c.Request.Context(), c.Param("id"))
|
||||
if err != nil {
|
||||
|
||||
@@ -79,7 +79,7 @@ func (h *PaymentHandler) MyOrders(c *gin.Context) {
|
||||
}
|
||||
limit := parseInt(c.Query("limit"), 20)
|
||||
offset := parseInt(c.Query("offset"), 0)
|
||||
orders, total, err := h.pay.ListByUser(c.Request.Context(), user.ID, c.Query("status"), limit, offset)
|
||||
orders, total, err := h.pay.ListByUser(c.Request.Context(), user.ID, c.Query("status"), strings.TrimSpace(c.Query("q")), limit, offset)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load orders"})
|
||||
return
|
||||
@@ -129,7 +129,7 @@ func (h *PaymentHandler) AdminOrders(c *gin.Context) {
|
||||
status := c.Query("status")
|
||||
limit := parseInt(c.Query("limit"), 100)
|
||||
offset := parseInt(c.Query("offset"), 0)
|
||||
orders, total, err := h.pay.ListAll(c.Request.Context(), status, limit, offset)
|
||||
orders, total, err := h.pay.ListAll(c.Request.Context(), status, strings.TrimSpace(c.Query("q")), limit, offset)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load orders"})
|
||||
return
|
||||
|
||||
@@ -229,7 +229,21 @@ func (h *UserGenerationHandler) Logs(c *gin.Context) {
|
||||
// media=1 (画图台 grid): only pending rows or rows with a stored file, so a
|
||||
// deleted work's blanked row doesn't consume one of the grid's slots.
|
||||
mediaOnly := c.Query("media") == "1"
|
||||
items, total, stats, err := h.admin.Logs(c.Request.Context(), limit, offset, kind, status, statuses, nil, userID, excludeSource, source, hasFile, excludeShowcase, mediaOnly)
|
||||
// ?user= — admin-only 用户搜索 (the 日志管理 page with scope=all). Ignored for
|
||||
// normal users, whose rows are already pinned to their own userID.
|
||||
var userIDs []string
|
||||
if term := strings.TrimSpace(c.Query("user")); term != "" && userID == "" {
|
||||
ids, uerr := h.admin.MatchUserIDs(c.Request.Context(), term)
|
||||
if uerr != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||
return
|
||||
}
|
||||
if len(ids) == 0 {
|
||||
ids = []string{"__no_match__"}
|
||||
}
|
||||
userIDs = ids
|
||||
}
|
||||
items, total, stats, err := h.admin.Logs(c.Request.Context(), limit, offset, kind, status, statuses, nil, userID, userIDs, strings.TrimSpace(c.Query("q")), excludeSource, source, hasFile, excludeShowcase, mediaOnly)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load logs"})
|
||||
return
|
||||
@@ -264,13 +278,18 @@ func (h *UserGenerationHandler) Logs(c *gin.Context) {
|
||||
} else {
|
||||
userName = item.UserID
|
||||
}
|
||||
var accountName any
|
||||
if item.AccountID != "" {
|
||||
if label, ok := accountByID[item.AccountID]; ok {
|
||||
accountName = label
|
||||
} else {
|
||||
accountName = item.AccountID
|
||||
// Provider account identity is admin-only: normal users must not see
|
||||
// which upstream account (email) fulfilled their generation.
|
||||
var accountName, accountID any
|
||||
if userID == "" {
|
||||
if item.AccountID != "" {
|
||||
if label, ok := accountByID[item.AccountID]; ok {
|
||||
accountName = label
|
||||
} else {
|
||||
accountName = item.AccountID
|
||||
}
|
||||
}
|
||||
accountID = emptyStringNil(item.AccountID)
|
||||
}
|
||||
out = append(out, gin.H{
|
||||
"id": item.ID,
|
||||
@@ -287,7 +306,7 @@ func (h *UserGenerationHandler) Logs(c *gin.Context) {
|
||||
"source": emptyStringNil(item.Source),
|
||||
"user_id": emptyStringNil(item.UserID),
|
||||
"user_name": userName,
|
||||
"account_id": emptyStringNil(item.AccountID),
|
||||
"account_id": accountID,
|
||||
"account": accountName,
|
||||
"cost": item.Cost,
|
||||
"elapsed_ms": item.ElapsedMS,
|
||||
|
||||
@@ -144,6 +144,7 @@ func New(cfg *config.Config, auth *service.AuthService, handlers Handlers) *gin.
|
||||
authed.POST("/banned-words", handlers.BannedWords.Create)
|
||||
authed.POST("/banned-words/import", handlers.BannedWords.Import)
|
||||
authed.DELETE("/banned-words/:id", handlers.BannedWords.Delete)
|
||||
authed.GET("/banned-word-hits", handlers.BannedWords.Hits)
|
||||
authed.GET("/refresh/profiles", handlers.ProviderAdmin.RefreshProfiles)
|
||||
authed.POST("/refresh/profiles/:profile_id/refresh-now", handlers.ProviderAdmin.RefreshNow)
|
||||
authed.PATCH("/refresh/profiles/:profile_id", handlers.ProviderAdmin.RefreshUpdate)
|
||||
|
||||
@@ -45,6 +45,18 @@ type BannedWord struct {
|
||||
UpdatedAt time.Time
|
||||
}
|
||||
|
||||
// BannedWordHit records one blocked request: which word matched, who sent it,
|
||||
// and when. Feeds the admin 违禁词触发列表.
|
||||
type BannedWordHit struct {
|
||||
ID string `gorm:"primaryKey;size:32"`
|
||||
WordID string `gorm:"size:32;index"`
|
||||
Word string `gorm:"size:255;index;not null"`
|
||||
UserID string `gorm:"size:32;index"`
|
||||
UserName string `gorm:"size:255"` // snapshot of name/email at hit time
|
||||
Prompt string `gorm:"type:text"`
|
||||
CreatedAt time.Time `gorm:"index"`
|
||||
}
|
||||
|
||||
type APIKey struct {
|
||||
ID string `gorm:"primaryKey;size:32"`
|
||||
UserID string `gorm:"size:32;index;not null"`
|
||||
@@ -219,6 +231,7 @@ func AutoMigrateModels() []any {
|
||||
return []any{
|
||||
&User{},
|
||||
&BannedWord{},
|
||||
&BannedWordHit{},
|
||||
&APIKey{},
|
||||
&ShowcaseItem{},
|
||||
&EventLog{},
|
||||
|
||||
@@ -84,13 +84,43 @@ func (r *BannedWordRepository) Delete(ctx context.Context, id string) (int64, er
|
||||
return res.RowsAffected, res.Error
|
||||
}
|
||||
|
||||
// RecordHit bumps the word's block counter and, when userID is set, the user's
|
||||
// 违禁词触发次数 shown on the admin users table. Best-effort bookkeeping.
|
||||
func (r *BannedWordRepository) RecordHit(ctx context.Context, wordID, userID string) {
|
||||
// RecordHit bumps the word's block counter, the user's 违禁词触发次数 (when userID
|
||||
// is set), and appends a BannedWordHit row for the admin 违禁词触发列表.
|
||||
// Best-effort bookkeeping.
|
||||
func (r *BannedWordRepository) RecordHit(ctx context.Context, wordID, word, userID, userName, prompt string) {
|
||||
_ = r.db.WithContext(ctx).Model(&model.BannedWord{}).Where("id = ?", wordID).
|
||||
UpdateColumn("hits", gorm.Expr("hits + 1")).Error
|
||||
if userID != "" {
|
||||
_ = r.db.WithContext(ctx).Model(&model.User{}).Where("id = ?", userID).
|
||||
UpdateColumn("banned_word_hits", gorm.Expr("banned_word_hits + 1")).Error
|
||||
}
|
||||
_ = r.db.WithContext(ctx).Create(&model.BannedWordHit{
|
||||
ID: strings.ReplaceAll(uuid.NewString(), "-", "")[:32],
|
||||
WordID: wordID,
|
||||
Word: word,
|
||||
UserID: userID,
|
||||
UserName: userName,
|
||||
Prompt: prompt,
|
||||
CreatedAt: time.Now(),
|
||||
}).Error
|
||||
}
|
||||
|
||||
// ListHits returns trigger records newest first, with pagination + total.
|
||||
// query — server-side search over 违禁词 / 用户名 / 提示词 (跨页).
|
||||
func (r *BannedWordRepository) ListHits(ctx context.Context, query string, limit, offset int) ([]model.BannedWordHit, int64, error) {
|
||||
var out []model.BannedWordHit
|
||||
var total int64
|
||||
q := r.db.WithContext(ctx).Model(&model.BannedWordHit{})
|
||||
if term := strings.TrimSpace(query); term != "" {
|
||||
like := "%" + term + "%"
|
||||
q = q.Where("(word ILIKE ? OR user_name ILIKE ? OR user_id ILIKE ? OR prompt ILIKE ?)", like, like, like, like)
|
||||
}
|
||||
if err := q.Count(&total).Error; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
err := q.Order("created_at desc").Limit(limit).Offset(offset).Find(&out).Error
|
||||
return out, total, err
|
||||
}
|
||||
|
||||
@@ -22,6 +22,8 @@ type EventListFilter struct {
|
||||
Statuses []string // multiple statuses (status IN (?)) — used by the 画图台 grid
|
||||
Since *time.Time
|
||||
UserID string
|
||||
UserIDs []string // when set, keep ONLY rows whose user_id is in this list (admin 用户搜索)
|
||||
Query string // free-text search over prompt / model / error (server-side, 跨页)
|
||||
ExcludeSource string // when set, omit rows with this source (e.g. hide API-key "v1" usage from the customer logs page)
|
||||
Source string // when set, keep ONLY rows with this source (admin 来源 filter): "v1" (API key) / "user" (前台) / "admin" (测试模型)
|
||||
HasFile bool // when true, keep ONLY rows with a non-empty file (the 创作记录 gallery — paginates over real media)
|
||||
@@ -59,6 +61,13 @@ func (r *EventRepository) List(ctx context.Context, filter EventListFilter) ([]m
|
||||
if filter.UserID != "" {
|
||||
q = q.Where("user_id = ?", filter.UserID)
|
||||
}
|
||||
if len(filter.UserIDs) > 0 {
|
||||
q = q.Where("user_id IN ?", filter.UserIDs)
|
||||
}
|
||||
if term := strings.TrimSpace(filter.Query); term != "" {
|
||||
like := "%" + term + "%"
|
||||
q = q.Where("(prompt ILIKE ? OR model ILIKE ? OR error ILIKE ?)", like, like, like)
|
||||
}
|
||||
if filter.ExcludeSource != "" {
|
||||
q = q.Where("(source IS NULL OR source <> ?)", filter.ExcludeSource)
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package repo
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"backend/internal/model"
|
||||
@@ -29,13 +30,18 @@ func (r *OrderRepository) Update(ctx context.Context, id string, patch map[strin
|
||||
}
|
||||
|
||||
// ListByUser returns a user's own orders, newest first, with pagination + total.
|
||||
func (r *OrderRepository) ListByUser(ctx context.Context, userID, status string, limit, offset int) ([]model.Order, int64, error) {
|
||||
// query — server-side search over 订单号 / 支付方式 / 金额 (跨页).
|
||||
func (r *OrderRepository) ListByUser(ctx context.Context, userID, status, query string, limit, offset int) ([]model.Order, int64, error) {
|
||||
var out []model.Order
|
||||
var total int64
|
||||
q := r.db.WithContext(ctx).Model(&model.Order{}).Where("user_id = ?", userID)
|
||||
if status != "" {
|
||||
q = q.Where("status = ?", status)
|
||||
}
|
||||
if term := strings.TrimSpace(query); term != "" {
|
||||
like := "%" + term + "%"
|
||||
q = q.Where("(id ILIKE ? OR method ILIKE ? OR CAST(amount AS TEXT) LIKE ?)", like, like, like)
|
||||
}
|
||||
if err := q.Count(&total).Error; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
@@ -47,13 +53,23 @@ func (r *OrderRepository) ListByUser(ctx context.Context, userID, status string,
|
||||
}
|
||||
|
||||
// List returns all orders (admin) with optional status filter + pagination.
|
||||
func (r *OrderRepository) List(ctx context.Context, status string, limit, offset int) ([]model.Order, int64, error) {
|
||||
// query — server-side search over 订单号 / 支付方式 / 金额; userIDs — additionally
|
||||
// match orders belonging to these users (resolved from a 用户名 search upstream).
|
||||
func (r *OrderRepository) List(ctx context.Context, status, query string, userIDs []string, limit, offset int) ([]model.Order, int64, error) {
|
||||
var out []model.Order
|
||||
var total int64
|
||||
q := r.db.WithContext(ctx).Model(&model.Order{})
|
||||
if status != "" {
|
||||
q = q.Where("status = ?", status)
|
||||
}
|
||||
if term := strings.TrimSpace(query); term != "" {
|
||||
like := "%" + term + "%"
|
||||
if len(userIDs) > 0 {
|
||||
q = q.Where("(id ILIKE ? OR method ILIKE ? OR CAST(amount AS TEXT) LIKE ? OR user_id IN ?)", like, like, like, userIDs)
|
||||
} else {
|
||||
q = q.Where("(id ILIKE ? OR method ILIKE ? OR CAST(amount AS TEXT) LIKE ?)", like, like, like)
|
||||
}
|
||||
}
|
||||
if err := q.Count(&total).Error; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ func (s *AdminReadService) ModelsView(ctx context.Context) ([]map[string]any, er
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (s *AdminReadService) Logs(ctx context.Context, limit, offset int, kind, status string, statuses []string, since *time.Time, userID, excludeSource, source string, hasFile, excludeShowcase, mediaOnly bool) ([]model.EventLog, int64, *repo.EventStats, error) {
|
||||
func (s *AdminReadService) Logs(ctx context.Context, limit, offset int, kind, status string, statuses []string, since *time.Time, userID string, userIDs []string, query, excludeSource, source string, hasFile, excludeShowcase, mediaOnly bool) ([]model.EventLog, int64, *repo.EventStats, error) {
|
||||
var excludeFiles []string
|
||||
if excludeShowcase {
|
||||
excludeFiles = s.showcaseFileList(ctx)
|
||||
@@ -125,6 +125,8 @@ func (s *AdminReadService) Logs(ctx context.Context, limit, offset int, kind, st
|
||||
Statuses: statuses,
|
||||
Since: since,
|
||||
UserID: userID,
|
||||
UserIDs: userIDs,
|
||||
Query: query,
|
||||
ExcludeSource: excludeSource,
|
||||
Source: source,
|
||||
HasFile: hasFile,
|
||||
@@ -147,6 +149,30 @@ func (s *AdminReadService) Logs(ctx context.Context, limit, offset int, kind, st
|
||||
return items, total, stats, nil
|
||||
}
|
||||
|
||||
// MatchUserIDs resolves an admin 用户搜索 term to the set of user ids whose
|
||||
// name, email or id contains the term (case-insensitive). Returns a non-nil,
|
||||
// possibly empty slice — an empty slice means "no user matched" and the caller
|
||||
// should return zero rows rather than dropping the filter.
|
||||
func (s *AdminReadService) MatchUserIDs(ctx context.Context, term string) ([]string, error) {
|
||||
term = strings.ToLower(strings.TrimSpace(term))
|
||||
if term == "" {
|
||||
return nil, nil
|
||||
}
|
||||
users, err := s.users.List(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out := []string{}
|
||||
for _, u := range users {
|
||||
if strings.Contains(strings.ToLower(u.Name), term) ||
|
||||
strings.Contains(strings.ToLower(u.Email), term) ||
|
||||
strings.Contains(strings.ToLower(u.ID), term) {
|
||||
out = append(out, u.ID)
|
||||
}
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// UserNameMap builds an id -> display name lookup (name, else email, else id)
|
||||
// used to annotate admin log rows with user_name (mirrors admin.py:584-596).
|
||||
func (s *AdminReadService) UserNameMap(ctx context.Context) (map[string]string, error) {
|
||||
|
||||
@@ -249,12 +249,26 @@ func (s *PaymentService) GetForUser(ctx context.Context, userID, orderID string)
|
||||
return o, nil
|
||||
}
|
||||
|
||||
func (s *PaymentService) ListByUser(ctx context.Context, userID, status string, limit, offset int) ([]model.Order, int64, error) {
|
||||
return s.orders.ListByUser(ctx, userID, status, limit, offset)
|
||||
func (s *PaymentService) ListByUser(ctx context.Context, userID, status, query string, limit, offset int) ([]model.Order, int64, error) {
|
||||
return s.orders.ListByUser(ctx, userID, status, query, limit, offset)
|
||||
}
|
||||
|
||||
func (s *PaymentService) ListAll(ctx context.Context, status string, limit, offset int) ([]model.Order, int64, error) {
|
||||
return s.orders.List(ctx, status, limit, offset)
|
||||
// ListAll — admin order list. A search query also matches 用户名/邮箱: resolve
|
||||
// the term to user ids first so "张三" finds that user's orders.
|
||||
func (s *PaymentService) ListAll(ctx context.Context, status, query string, limit, offset int) ([]model.Order, int64, error) {
|
||||
var userIDs []string
|
||||
if term := strings.ToLower(strings.TrimSpace(query)); term != "" {
|
||||
if users, err := s.users.List(ctx); err == nil {
|
||||
for _, u := range users {
|
||||
if strings.Contains(strings.ToLower(u.Name), term) ||
|
||||
strings.Contains(strings.ToLower(u.Email), term) ||
|
||||
strings.Contains(strings.ToLower(u.ID), term) {
|
||||
userIDs = append(userIDs, u.ID)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return s.orders.List(ctx, status, query, userIDs, limit, offset)
|
||||
}
|
||||
|
||||
// UserNames maps user id → display name (name, else email, else id) so the admin
|
||||
|
||||
@@ -268,11 +268,15 @@ func (s *V1Service) checkBannedPrompt(ctx context.Context, principal *APIPrincip
|
||||
if term == "" || !strings.Contains(lower, term) {
|
||||
continue
|
||||
}
|
||||
userID := ""
|
||||
userID, userName := "", ""
|
||||
if principal != nil && principal.User != nil {
|
||||
userID = principal.User.ID
|
||||
userName = principal.User.Name
|
||||
if userName == "" {
|
||||
userName = principal.User.Email
|
||||
}
|
||||
}
|
||||
s.banned.RecordHit(ctx, w.ID, userID)
|
||||
s.banned.RecordHit(ctx, w.ID, w.Word, userID, userName, prompt)
|
||||
return fmt.Errorf("%w: banned word \"%s\"", ErrBannedPrompt, w.Word)
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user