From 8ec4562f814485ad060590c14bbfe067d1444f3e Mon Sep 17 00:00:00 2001 From: chiyi Date: Wed, 1 Jul 2026 01:32:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=98=93=E6=94=AF=E4=BB=98=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E5=85=85=E5=80=BC=20+=20=E7=AB=99=E5=86=85=E5=85=AC?= =?UTF-8?q?=E5=91=8A=20+=20OpenAI=20=E8=A7=86=E9=A2=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20+=20grok/adobe=20=E5=A4=B1=E8=B4=A5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 充值/订单(易支付 mapi): - 订单表 + 30 分钟自动取消;支付弹窗(二维码/跳转监控、倒计时、轮询、5s 倒计时关闭) - 系统设置可配:开关/商户ID/密钥/支付地址(根地址拼 /mapi)/支付方式/最低额/积分比例(默认 1元=100积分) - 异步通知 MD5 验签、幂等到账;用户累计充值;前台/后台订单页(筛选+搜索+分页,前后台分风格);用户管理累计充值列 站内公告: - Markdown 公告,登录用户首次访问/刷新弹出;内容哈希做版本,改了就重新推;管理员不弹;空内容=下线 OpenAI 视频(/v1/videos)修复: - /content 拿不到视频:grok 资源 URL 需鉴权,改为用生成账号 token 取流;adobe/runway 公开 URL 直代理(不存 RustFS) - size→分辨率用短边判定(1280x720 = 720p,之前误判 1080p 被拒) 失败处理: - grok 429「Too many requests」/403 anti-bot 改判临时错误(不再误封号),真额度耗尽才算 quota - adobe 视频 408 / system under load 归为临时错误 → tempAsDead 封号 其它: - 充值默认关闭;签到格子浅色可见;登录验证码按钮浅色可读;并发/账户信息展示 - 创作记录/画图台只显示画图台作品(排除 API);日志页 API 视频预览显示 — - 视频去画中画/下载/投屏(全局);图片缩略图改背景图规避 Edge 视觉搜索 - 订单/兑换码/配置/日志菜单文案与图标;充值版块样式 Co-Authored-By: Claude Opus 4.8 --- backend/internal/bootstrap/app.go | 7 +- backend/internal/bootstrap/seed.go | 5 + backend/internal/http/handler/admin_read.go | 1 + backend/internal/http/handler/announcement.go | 65 ++++ backend/internal/http/handler/payment.go | 190 +++++++++++ backend/internal/http/handler/v1.go | 8 +- backend/internal/http/router/router.go | 17 + backend/internal/model/models.go | 22 ++ backend/internal/provider/adobe/client.go | 7 +- backend/internal/provider/epay/client.go | 142 ++++++++ backend/internal/provider/grok/video.go | 52 ++- backend/internal/repo/order_repo.go | 83 +++++ backend/internal/service/announcement.go | 62 ++++ backend/internal/service/auth.go | 1 + backend/internal/service/maintenance.go | 13 +- backend/internal/service/payment.go | 285 ++++++++++++++++ backend/internal/service/v1.go | 41 ++- frontend/package-lock.json | 323 +++++++++++++++++- frontend/package.json | 2 + frontend/src/App.vue | 20 +- frontend/src/announcement.js | 28 ++ frontend/src/components/AnnouncementModal.vue | 62 ++++ frontend/src/components/Icon.vue | 1 + frontend/src/components/LoginModal.vue | 9 +- frontend/src/components/PaymentModal.vue | 172 ++++++++++ frontend/src/layouts/AdminLayout.vue | 7 +- frontend/src/layouts/PublicLayout.vue | 3 +- frontend/src/main.js | 34 +- frontend/src/payment.js | 18 + frontend/src/style.css | 7 + frontend/src/views/AdminOrdersView.vue | 152 +++++++++ frontend/src/views/ConfigView.vue | 96 +++++- frontend/src/views/ImagesView.vue | 5 +- frontend/src/views/OrdersView.vue | 191 +++++++++++ frontend/src/views/PlaygroundView.vue | 58 ++-- frontend/src/views/SettingsView.vue | 100 +++++- frontend/src/views/UserLogsTableView.vue | 4 +- frontend/src/views/UserLogsView.vue | 6 +- frontend/src/views/UsersView.vue | 6 + 39 files changed, 2237 insertions(+), 68 deletions(-) create mode 100644 backend/internal/http/handler/announcement.go create mode 100644 backend/internal/http/handler/payment.go create mode 100644 backend/internal/provider/epay/client.go create mode 100644 backend/internal/repo/order_repo.go create mode 100644 backend/internal/service/announcement.go create mode 100644 backend/internal/service/payment.go create mode 100644 frontend/src/announcement.js create mode 100644 frontend/src/components/AnnouncementModal.vue create mode 100644 frontend/src/components/PaymentModal.vue create mode 100644 frontend/src/payment.js create mode 100644 frontend/src/views/AdminOrdersView.vue create mode 100644 frontend/src/views/OrdersView.vue diff --git a/backend/internal/bootstrap/app.go b/backend/internal/bootstrap/app.go index 942abb2..3d91b21 100644 --- a/backend/internal/bootstrap/app.go +++ b/backend/internal/bootstrap/app.go @@ -104,6 +104,9 @@ func NewApp(ctx context.Context) (*App, error) { } concSvc := service.NewConcurrencyService(rdb) cgroupSvc := service.NewConcurrencyGroupService(cgroupRepo, concSvc) + announcementSvc := service.NewAnnouncementService(siteRepo, userRepo) + orderRepo := repo.NewOrderRepository(db) + paymentSvc := service.NewPaymentService(orderRepo, userRepo, siteRepo) sessionSvc := service.NewSessionService(rdb, cfg.SessionTTL, cfg.SessionSlideAfter) emailCodeSvc := service.NewEmailCodeService(rdb) smtpSvc := service.NewSMTPService() @@ -150,11 +153,13 @@ func NewApp(ctx context.Context) (*App, error) { UserGen: handler.NewUserGenerationHandler(userGenSvc, adminReadSvc), ProviderAdmin: handler.NewProviderAdminHandler(tokenSvc, refreshSvc), ConcGroups: handler.NewConcurrencyGroupHandler(cgroupSvc), + Announcement: handler.NewAnnouncementHandler(announcementSvc), + Payment: handler.NewPaymentHandler(paymentSvc), }) // Background self-healing sweep (quota recovery, cookie refresh, stale-pending // cleanup, log retention) — the Go equivalent of the Python daemon thread. - maintenanceSvc := service.NewMaintenanceService(tokenRepo, tokenSvc, eventRepo, userRepo, refreshSvc, siteRepo, rustfsClient, v1Svc.Inflight(), showcaseRepo) + maintenanceSvc := service.NewMaintenanceService(tokenRepo, tokenSvc, eventRepo, userRepo, refreshSvc, siteRepo, rustfsClient, v1Svc.Inflight(), showcaseRepo, orderRepo) loopCtx, loopCancel := context.WithCancel(context.Background()) go maintenanceSvc.Run(loopCtx) diff --git a/backend/internal/bootstrap/seed.go b/backend/internal/bootstrap/seed.go index 839eca3..e35f83d 100644 --- a/backend/internal/bootstrap/seed.go +++ b/backend/internal/bootstrap/seed.go @@ -35,6 +35,11 @@ func seedDefaults(ctx context.Context, db *gorm.DB) error { {Key: "credits.invite_enabled", Value: "true"}, {Key: "credits.invite_reward", Value: "3"}, {Key: "credits.cdk_redeem_enabled", Value: "true"}, + {Key: "pay.enabled", Value: "false"}, + {Key: "pay.api_base", Value: "https://pay.v8jisu.cn/api/pay"}, + {Key: "pay.methods", Value: "wxpay,alipay"}, + {Key: "pay.min_amount", Value: "1"}, + {Key: "pay.points_ratio", Value: "100"}, {Key: "logs.retention_days", Value: "30"}, {Key: "media.retention_days", Value: "30"}, } diff --git a/backend/internal/http/handler/admin_read.go b/backend/internal/http/handler/admin_read.go index 33d6b15..e338a38 100644 --- a/backend/internal/http/handler/admin_read.go +++ b/backend/internal/http/handler/admin_read.go @@ -182,6 +182,7 @@ func userPublic(user model.User) gin.H { "status": user.Status, "credits": user.Credits, "notes": user.Notes, + "recharge_total": user.RechargeTotal, "concurrency_group_id": user.ConcurrencyGroupID, "created_at": unixSec(user.CreatedAt), "last_login_at": unixSecPtr(user.LastLoginAt), diff --git a/backend/internal/http/handler/announcement.go b/backend/internal/http/handler/announcement.go new file mode 100644 index 0000000..c0d29a4 --- /dev/null +++ b/backend/internal/http/handler/announcement.go @@ -0,0 +1,65 @@ +package handler + +import ( + "net/http" + + "backend/internal/service" + "github.com/gin-gonic/gin" +) + +type AnnouncementHandler struct { + svc *service.AnnouncementService +} + +func NewAnnouncementHandler(svc *service.AnnouncementService) *AnnouncementHandler { + return &AnnouncementHandler{svc: svc} +} + +// Get — logged-in user: the current announcement + whether THIS user has seen it. +func (h *AnnouncementHandler) Get(c *gin.Context) { + user := currentUser(c) + if user == nil { + c.JSON(http.StatusUnauthorized, gin.H{"detail": "未登录或会话已过期"}) + return + } + c.JSON(http.StatusOK, h.svc.ForUser(c.Request.Context(), user)) +} + +// MarkSeen — user dismissed the announcement of the given version. +func (h *AnnouncementHandler) MarkSeen(c *gin.Context) { + user := currentUser(c) + if user == nil { + c.JSON(http.StatusUnauthorized, gin.H{"detail": "未登录或会话已过期"}) + return + } + var body struct { + Version string `json:"version"` + } + _ = c.ShouldBindJSON(&body) + if err := h.svc.MarkSeen(c.Request.Context(), user.ID, body.Version); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to save"}) + return + } + c.JSON(http.StatusOK, gin.H{"ok": true}) +} + +// AdminGet — admin editor: the raw markdown. +func (h *AnnouncementHandler) AdminGet(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{"content": h.svc.Content(c.Request.Context())}) +} + +// AdminPut — admin saves new markdown (re-pops for everyone who hasn't seen it). +func (h *AnnouncementHandler) AdminPut(c *gin.Context) { + var body struct { + Content string `json:"content"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"detail": "invalid request body"}) + return + } + if err := h.svc.Save(c.Request.Context(), body.Content); err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to save"}) + return + } + c.JSON(http.StatusOK, gin.H{"ok": true}) +} diff --git a/backend/internal/http/handler/payment.go b/backend/internal/http/handler/payment.go new file mode 100644 index 0000000..273c17f --- /dev/null +++ b/backend/internal/http/handler/payment.go @@ -0,0 +1,190 @@ +package handler + +import ( + "errors" + "net/http" + "strings" + "time" + + "backend/internal/model" + "backend/internal/service" + "github.com/gin-gonic/gin" +) + +type PaymentHandler struct { + pay *service.PaymentService +} + +func NewPaymentHandler(pay *service.PaymentService) *PaymentHandler { + return &PaymentHandler{pay: pay} +} + +func orderJSON(o *model.Order) gin.H { + h := gin.H{ + "id": o.ID, + "amount": o.Amount, + "points": o.Points, + "pay_type": o.PayType, + "status": o.Status, + "pay_info": o.PayInfo, + "pay_info_type": o.PayInfoType, + "created_at": o.CreatedAt.Unix(), + "expires_at": o.ExpiresAt.Unix(), + "server_now": time.Now().Unix(), // lets the popup count down on server time + } + if o.PaidAt != nil { + h["paid_at"] = o.PaidAt.Unix() + } + return h +} + +// ---- user ---- + +// Config returns the recharge config for the user UI (enabled, methods, min, ratio). +func (h *PaymentHandler) Config(c *gin.Context) { + c.JSON(http.StatusOK, h.pay.Public(c.Request.Context())) +} + +func (h *PaymentHandler) Recharge(c *gin.Context) { + user := currentUser(c) + if user == nil { + c.JSON(http.StatusUnauthorized, gin.H{"detail": "未登录或会话已过期"}) + return + } + var body struct { + Amount float64 `json:"amount"` + Method string `json:"method"` + } + if err := c.ShouldBindJSON(&body); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"detail": "invalid request body"}) + return + } + order, err := h.pay.CreateOrder(c.Request.Context(), user, body.Amount, body.Method, requestBaseURL(c), clientIP(c)) + if err != nil { + h.writeErr(c, err) + return + } + c.JSON(http.StatusOK, orderJSON(order)) +} + +func (h *PaymentHandler) MyOrders(c *gin.Context) { + user := currentUser(c) + if user == nil { + c.JSON(http.StatusUnauthorized, gin.H{"detail": "未登录或会话已过期"}) + return + } + 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) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load orders"}) + return + } + out := make([]gin.H, 0, len(orders)) + for i := range orders { + out = append(out, orderJSON(&orders[i])) + } + c.JSON(http.StatusOK, gin.H{"data": out, "total": total}) +} + +func (h *PaymentHandler) OrderStatus(c *gin.Context) { + user := currentUser(c) + if user == nil { + c.JSON(http.StatusUnauthorized, gin.H{"detail": "未登录或会话已过期"}) + return + } + order, err := h.pay.GetForUser(c.Request.Context(), user.ID, c.Param("id")) + if err != nil { + c.JSON(http.StatusNotFound, gin.H{"detail": "订单不存在"}) + return + } + c.JSON(http.StatusOK, orderJSON(order)) +} + +func (h *PaymentHandler) ContinueOrder(c *gin.Context) { + user := currentUser(c) + if user == nil { + c.JSON(http.StatusUnauthorized, gin.H{"detail": "未登录或会话已过期"}) + return + } + order, err := h.pay.Continue(c.Request.Context(), user, c.Param("id"), requestBaseURL(c), clientIP(c)) + if err != nil { + h.writeErr(c, err) + return + } + c.JSON(http.StatusOK, orderJSON(order)) +} + +// ---- admin ---- + +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) + if err != nil { + c.JSON(http.StatusInternalServerError, gin.H{"detail": "failed to load orders"}) + return + } + names := h.pay.UserNames(c.Request.Context()) + out := make([]gin.H, 0, len(orders)) + for i := range orders { + row := orderJSON(&orders[i]) + row["user_name"] = names[orders[i].UserID] + out = append(out, row) + } + c.JSON(http.StatusOK, gin.H{"data": out, "total": total}) +} + +func (h *PaymentHandler) SettingsGet(c *gin.Context) { + c.JSON(http.StatusOK, h.pay.Settings(c.Request.Context())) +} + +func (h *PaymentHandler) SettingsSave(c *gin.Context) { + var in service.PaySettings + if err := c.ShouldBindJSON(&in); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"detail": "invalid request body"}) + return + } + if err := h.pay.SaveSettings(c.Request.Context(), in); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"detail": strings.TrimSpace(err.Error())}) + return + } + c.JSON(http.StatusOK, gin.H{"ok": true}) +} + +// ---- public async notify (no auth — called by the 易支付 server) ---- + +func (h *PaymentHandler) Notify(c *gin.Context) { + params := map[string]string{} + for k, v := range c.Request.URL.Query() { + if len(v) > 0 { + params[k] = v[0] + } + } + if _, err := h.pay.HandleNotify(c.Request.Context(), params); err != nil { + c.String(http.StatusOK, "fail") + return + } + // 易支付 expects the literal string "success" to stop re-notifying. + c.String(http.StatusOK, "success") +} + +func (h *PaymentHandler) writeErr(c *gin.Context, err error) { + switch { + case errors.Is(err, service.ErrPayDisabled): + c.JSON(http.StatusForbidden, gin.H{"detail": "充值已关闭"}) + case errors.Is(err, service.ErrPayNotConfig): + c.JSON(http.StatusServiceUnavailable, gin.H{"detail": "支付未配置"}) + case errors.Is(err, service.ErrPayMethod): + c.JSON(http.StatusBadRequest, gin.H{"detail": "不支持的支付方式"}) + case errors.Is(err, service.ErrPayAmount): + c.JSON(http.StatusBadRequest, gin.H{"detail": "金额低于最低充值额"}) + case errors.Is(err, service.ErrOrderNotFound): + c.JSON(http.StatusNotFound, gin.H{"detail": "订单不存在"}) + case errors.Is(err, service.ErrOrderPaid): + c.JSON(http.StatusBadRequest, gin.H{"detail": "订单已支付"}) + default: + c.JSON(http.StatusBadGateway, gin.H{"detail": strings.TrimSpace(err.Error())}) + } +} diff --git a/backend/internal/http/handler/v1.go b/backend/internal/http/handler/v1.go index f86480e..4bd0827 100644 --- a/backend/internal/http/handler/v1.go +++ b/backend/internal/http/handler/v1.go @@ -259,12 +259,10 @@ func videoSizeToInternal(size string) (ratio, resolution string) { if w == 0 || h == 0 { return "16:9", "720p" } - long := w - if h > long { - long = h - } + // The "p" resolution is the SHORT edge (720p = 1280×720, 1080p = 1920×1080), + // so a standard 1280×720 must read as 720p — not 1080p off the long edge. resolution = "720p" - if long >= 1080 { + if min(w, h) >= 1080 { resolution = "1080p" } return guessRatioWH(w, h), resolution diff --git a/backend/internal/http/router/router.go b/backend/internal/http/router/router.go index e05a13e..9fb91c9 100644 --- a/backend/internal/http/router/router.go +++ b/backend/internal/http/router/router.go @@ -26,6 +26,8 @@ type Handlers struct { UserGen *handler.UserGenerationHandler ProviderAdmin *handler.ProviderAdminHandler ConcGroups *handler.ConcurrencyGroupHandler + Announcement *handler.AnnouncementHandler + Payment *handler.PaymentHandler } func New(cfg *config.Config, auth *service.AuthService, handlers Handlers) *gin.Engine { @@ -62,6 +64,9 @@ func New(cfg *config.Config, auth *service.AuthService, handlers Handlers) *gin. publicAdmin.GET("/video-presets", handlers.UserGen.VideoPresets) publicAdmin.GET("/catalog", handlers.UserGen.Catalog) publicAdmin.GET("/models", handlers.UserGen.Models) + // 易支付 async notify — called server-to-server by the pay platform, no auth. + publicAdmin.GET("/pay/notify", handlers.Payment.Notify) + publicAdmin.POST("/pay/notify", handlers.Payment.Notify) } authGroup := engine.Group("/admin/api/auth") @@ -82,6 +87,13 @@ func New(cfg *config.Config, auth *service.AuthService, handlers Handlers) *gin. userAuthed.POST("/test", handlers.UserGen.Test) userAuthed.GET("/jobs/mine", handlers.UserGen.MyJobs) userAuthed.GET("/my-images", handlers.UserGen.MyImages) + userAuthed.GET("/announcement", handlers.Announcement.Get) + userAuthed.POST("/announcement/seen", handlers.Announcement.MarkSeen) + userAuthed.GET("/pay/config", handlers.Payment.Config) + userAuthed.POST("/pay/recharge", handlers.Payment.Recharge) + userAuthed.GET("/pay/orders", handlers.Payment.MyOrders) + userAuthed.GET("/pay/orders/:id", handlers.Payment.OrderStatus) + userAuthed.POST("/pay/orders/:id/continue", handlers.Payment.ContinueOrder) } authed := engine.Group("/admin/api") @@ -102,6 +114,7 @@ func New(cfg *config.Config, auth *service.AuthService, handlers Handlers) *gin. authed.PATCH("/concurrency-groups/:id", handlers.ConcGroups.Update) authed.POST("/concurrency-groups/:id/default", handlers.ConcGroups.SetDefault) authed.DELETE("/concurrency-groups/:id", handlers.ConcGroups.Delete) + authed.GET("/pay/admin/orders", handlers.Payment.AdminOrders) authed.GET("/cdks", handlers.CDK.List) authed.POST("/cdks", handlers.CDK.Create) authed.POST("/cdks/delete-bulk", handlers.CDK.DeleteBulk) @@ -158,6 +171,10 @@ func New(cfg *config.Config, auth *service.AuthService, handlers Handlers) *gin. settings.PUT("/logs", handlers.AppSettings.LogsPut) settings.GET("/media", handlers.AppSettings.MediaGet) settings.PUT("/media", handlers.AppSettings.MediaPut) + settings.GET("/announcement", handlers.Announcement.AdminGet) + settings.PUT("/announcement", handlers.Announcement.AdminPut) + settings.GET("/pay", handlers.Payment.SettingsGet) + settings.PUT("/pay", handlers.Payment.SettingsSave) } } diff --git a/backend/internal/model/models.go b/backend/internal/model/models.go index 5bc37e1..a34a5d5 100644 --- a/backend/internal/model/models.go +++ b/backend/internal/model/models.go @@ -16,6 +16,8 @@ type User struct { Credits float64 `gorm:"not null;default:0"` Notes string `gorm:"type:text"` ConcurrencyGroupID string `gorm:"size:32;index"` + AnnouncementSeen string `gorm:"size:32"` // version hash of the last announcement this user dismissed + RechargeTotal float64 `gorm:"not null;default:0"` // 累计充值金额(元) InviteCode string `gorm:"size:32;uniqueIndex"` InvitedBy *string `gorm:"size:32;index"` InviteRewardDone bool `gorm:"not null;default:false"` @@ -205,9 +207,29 @@ func AutoMigrateModels() []any { &SiteSetting{}, &StatCounter{}, &ConcurrencyGroup{}, + &Order{}, } } +// Order is a points-recharge order paid via 易支付 (epay). ID is our merchant +// order number (out_trade_no). Status: pending | paid | cancelled. Unpaid orders +// auto-cancel 30 min after creation (ExpiresAt). +type Order struct { + ID string `gorm:"primaryKey;size:40"` + UserID string `gorm:"size:32;index;not null"` + Amount float64 `gorm:"not null"` // 充值金额(元) + Points int `gorm:"not null"` // 到账积分 + PayType string `gorm:"size:16"` // wxpay | alipay + Status string `gorm:"size:16;index;not null"` // pending | paid | cancelled + TradeNo string `gorm:"size:64;index"` // 易支付平台订单号 + PayInfo string `gorm:"type:text"` // 二维码 url / 跳转 url + PayInfoType string `gorm:"size:16"` // qrcode | jump | html | ... + ExpiresAt time.Time `gorm:"index"` + PaidAt *time.Time + CreatedAt time.Time + UpdatedAt time.Time +} + // ConcurrencyGroup caps how many generations a member user may run AT ONCE // (across their API key + 画图台). MaxConcurrency 0 = unlimited. Exactly one // group is IsDefault — new users are bound to it and it can't be deleted. diff --git a/backend/internal/provider/adobe/client.go b/backend/internal/provider/adobe/client.go index 96fa00a..52df3e0 100644 --- a/backend/internal/provider/adobe/client.go +++ b/backend/internal/provider/adobe/client.go @@ -604,7 +604,12 @@ func (c *Client) submitVideo(ctx context.Context, client tlsclient.HttpClient, t // it's a bad token, a missing scope, or a WAF/fingerprint block. return respBody, "", fmt.Errorf("%w (%d %s: %s)", ErrAuth, resp.StatusCode, resp.Header.Get("x-access-error"), clip(respBody, 300)) } - if resp.StatusCode == 429 || resp.StatusCode == 451 || resp.StatusCode >= 500 { + if resp.StatusCode == 408 || resp.StatusCode == 429 || resp.StatusCode == 451 || resp.StatusCode >= 500 { + return respBody, "", ErrTemporaryUpstream + } + // "system under load" / timeout_error = adobe overload — treat as a temporary + // error so the tempAsDead policy retires the account (same as the image path). + if b := string(respBody); strings.Contains(b, "system under load") || strings.Contains(b, "timeout_error") { return respBody, "", ErrTemporaryUpstream } if resp.StatusCode != 200 { diff --git a/backend/internal/provider/epay/client.go b/backend/internal/provider/epay/client.go new file mode 100644 index 0000000..95a2bdd --- /dev/null +++ b/backend/internal/provider/epay/client.go @@ -0,0 +1,142 @@ +// Package epay implements the 易支付 mapi (API 下单) interface with MD5 signing. +// POST {api_base}/mapi → JSON {code, msg, trade_no, payurl, qrcode}. +// Docs: 请求字段 pid/type/out_trade_no/notify_url/name/money/sign/sign_type. +package epay + +import ( + "context" + "crypto/md5" + "encoding/hex" + "encoding/json" + "fmt" + "io" + "net/http" + "net/url" + "sort" + "strings" + "time" +) + +type Config struct { + APIBase string // 易支付 API 根地址,如 https://pay.v8jisu.cn/api/pay(自动拼 /mapi) + PID string // 商户ID + Key string // 商户密钥 +} + +type CreateRequest struct { + OutTradeNo string + Type string // wxpay | alipay | unionpay + Name string + Money string // "10.00" + NotifyURL string + ReturnURL string + ClientIP string // unused by mapi; kept for caller convenience +} + +type CreateResult struct { + TradeNo string // 平台订单号 + PayType string // qrcode | jump + PayInfo string // 二维码内容 或 跳转 url +} + +// mapiResp is the raw mapi response. code: 1 成功, -1 失败. +type mapiResp struct { + Code int `json:"code"` + Msg string `json:"msg"` + TradeNo string `json:"trade_no"` + PayURL string `json:"payurl"` + QRCode string `json:"qrcode"` +} + +var httpClient = &http.Client{Timeout: 20 * time.Second} + +// sign builds the MD5 signature: take all params except sign/sign_type and empty +// values, sort keys ASCII-ascending, join as k=v&k=v (raw values), append the +// merchant key, MD5, lowercase hex. +func sign(params map[string]string, key string) string { + keys := make([]string, 0, len(params)) + for k, v := range params { + if k == "sign" || k == "sign_type" || v == "" { + continue + } + keys = append(keys, k) + } + sort.Strings(keys) + var b strings.Builder + for i, k := range keys { + if i > 0 { + b.WriteByte('&') + } + b.WriteString(k) + b.WriteByte('=') + b.WriteString(params[k]) + } + b.WriteString(key) + sum := md5.Sum([]byte(b.String())) + return hex.EncodeToString(sum[:]) +} + +// Create places a mapi order and returns the payment info (qrcode preferred). +func (c *Config) Create(ctx context.Context, req CreateRequest) (*CreateResult, error) { + params := map[string]string{ + "pid": c.PID, + "type": req.Type, + "out_trade_no": req.OutTradeNo, + "notify_url": req.NotifyURL, + "name": req.Name, + "money": req.Money, + "sign_type": "MD5", + } + if req.ReturnURL != "" { + params["return_url"] = req.ReturnURL + } + params["sign"] = sign(params, c.Key) + + form := url.Values{} + for k, v := range params { + form.Set(k, v) + } + endpoint := strings.TrimRight(c.APIBase, "/") + "/mapi" + httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, strings.NewReader(form.Encode())) + if err != nil { + return nil, err + } + httpReq.Header.Set("Content-Type", "application/x-www-form-urlencoded") + resp, err := httpClient.Do(httpReq) + if err != nil { + return nil, err + } + defer resp.Body.Close() + body, _ := io.ReadAll(io.LimitReader(resp.Body, 1<<20)) + var out mapiResp + if err := json.Unmarshal(body, &out); err != nil { + return nil, fmt.Errorf("epay: bad response: %s", strings.TrimSpace(string(body))) + } + if out.Code != 1 { + msg := out.Msg + if msg == "" { + msg = "下单失败" + } + return nil, fmt.Errorf("epay: %s", msg) + } + result := &CreateResult{TradeNo: out.TradeNo} + if out.QRCode != "" { + result.PayType = "qrcode" + result.PayInfo = out.QRCode + } else if out.PayURL != "" { + result.PayType = "jump" + result.PayInfo = out.PayURL + } else { + return nil, fmt.Errorf("epay: 响应缺少 qrcode/payurl") + } + return result, nil +} + +// VerifyNotify validates an async-notify callback's MD5 signature. +func (c *Config) VerifyNotify(params map[string]string) bool { + got := strings.TrimSpace(params["sign"]) + if got == "" { + return false + } + return strings.EqualFold(got, sign(params, c.Key)) +} diff --git a/backend/internal/provider/grok/video.go b/backend/internal/provider/grok/video.go index 963a356..a9cf148 100644 --- a/backend/internal/provider/grok/video.go +++ b/backend/internal/provider/grok/video.go @@ -224,6 +224,46 @@ func (c *Client) doPost(ctx context.Context, client tlsclient.HttpClient, token, return raw, resp.StatusCode, nil } +// OpenAsset streams a grok asset (e.g. a generated video) authenticated with the +// account token — used by the async /v1/videos /content proxy. The caller MUST +// close the returned ReadCloser. +func (c *Client) OpenAsset(ctx context.Context, token, url string) (io.ReadCloser, string, error) { + token = strings.TrimSpace(strings.TrimPrefix(token, "Bearer ")) + if token == "" { + return nil, "", ErrAuth + } + client, err := c.newTLSClient() + if err != nil { + return nil, "", err + } + req, err := http.NewRequest(http.MethodGet, url, nil) + if err != nil { + return nil, "", err + } + req = req.WithContext(ctx) + req.Header = http.Header{ + "user-agent": {userAgent}, + "referer": {origin + "/"}, + "cookie": {"sso=" + token + "; sso-rw=" + token}, + } + resp, err := client.Do(req) + if err != nil { + return nil, "", fmt.Errorf("%w: %v", ErrTemporaryUpstream, err) + } + if resp.StatusCode < 200 || resp.StatusCode >= 300 { + resp.Body.Close() + if resp.StatusCode == 401 || resp.StatusCode == 403 { + return nil, "", fmt.Errorf("%w: asset %d", ErrAuth, resp.StatusCode) + } + return nil, "", fmt.Errorf("%w: asset %d", ErrTemporaryUpstream, resp.StatusCode) + } + ct := resp.Header.Get("Content-Type") + if ct == "" { + ct = "video/mp4" + } + return resp.Body, ct, nil +} + func (c *Client) download(ctx context.Context, client tlsclient.HttpClient, token, url string) ([]byte, error) { req, err := http.NewRequest(http.MethodGet, url, nil) if err != nil { @@ -258,10 +298,20 @@ func mapStatus(path string, status int, raw []byte) error { switch { case status == 200: return nil + case status == 403 && strings.Contains(strings.ToLower(string(raw)), "anti-bot"): + // grok bot-detection (proxy/TLS fingerprint), NOT a dead token — transient, + // so a good account isn't killed by an IP/anti-bot hiccup. + return fmt.Errorf("%w: %s 403 %s", ErrTemporaryUpstream, path, clip(raw, 160)) case status == 401 || status == 403: return fmt.Errorf("%w: %s %d %s", ErrAuth, path, status, clip(raw, 160)) case status == 429: - return fmt.Errorf("%w: %s 429 %s", ErrQuotaExhausted, path, clip(raw, 160)) + // 429 is grok RATE-LIMITING ("Too many requests") — a transient error that + // must NOT kill the account. Only a body that names a credit/usage-pool + // exhaustion is a real quota wall. + if isCreditError(string(raw)) { + return fmt.Errorf("%w: %s 429 %s", ErrQuotaExhausted, path, clip(raw, 160)) + } + return fmt.Errorf("%w: %s 429 %s", ErrTemporaryUpstream, path, clip(raw, 160)) case status >= 500: return fmt.Errorf("%w: %s %d %s", ErrTemporaryUpstream, path, status, clip(raw, 160)) default: diff --git a/backend/internal/repo/order_repo.go b/backend/internal/repo/order_repo.go new file mode 100644 index 0000000..b857bd6 --- /dev/null +++ b/backend/internal/repo/order_repo.go @@ -0,0 +1,83 @@ +package repo + +import ( + "context" + "time" + + "backend/internal/model" + "gorm.io/gorm" +) + +type OrderRepository struct{ db *gorm.DB } + +func NewOrderRepository(db *gorm.DB) *OrderRepository { return &OrderRepository{db: db} } + +func (r *OrderRepository) Create(ctx context.Context, o *model.Order) error { + return r.db.WithContext(ctx).Create(o).Error +} + +func (r *OrderRepository) Get(ctx context.Context, id string) (*model.Order, error) { + var o model.Order + if err := r.db.WithContext(ctx).Where("id = ?", id).First(&o).Error; err != nil { + return nil, err + } + return &o, nil +} + +func (r *OrderRepository) Update(ctx context.Context, id string, patch map[string]any) error { + return r.db.WithContext(ctx).Model(&model.Order{}).Where("id = ?", id).Updates(patch).Error +} + +// 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) { + 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 err := q.Count(&total).Error; err != nil { + return nil, 0, err + } + if limit <= 0 { + limit = 20 + } + err := q.Order("created_at desc").Limit(limit).Offset(offset).Find(&out).Error + return out, total, err +} + +// 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) { + var out []model.Order + var total int64 + q := r.db.WithContext(ctx).Model(&model.Order{}) + if status != "" { + q = q.Where("status = ?", status) + } + 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 +} + +// MarkPaid flips a pending order to paid atomically. Returns true only on the +// transition pending→paid, so a duplicate notify can never double-credit. +func (r *OrderRepository) MarkPaid(ctx context.Context, id, tradeNo string, paidAt time.Time) (bool, error) { + res := r.db.WithContext(ctx).Model(&model.Order{}). + Where("id = ? AND status = ?", id, "pending"). + Updates(map[string]any{"status": "paid", "paid_at": paidAt, "trade_no": tradeNo}) + return res.RowsAffected > 0, res.Error +} + +// ExpirePending cancels every still-pending order whose ExpiresAt has passed and +// returns how many it cancelled. +func (r *OrderRepository) ExpirePending(ctx context.Context, now time.Time) (int64, error) { + res := r.db.WithContext(ctx).Model(&model.Order{}). + Where("status = ? AND expires_at < ?", "pending", now). + Updates(map[string]any{"status": "cancelled"}) + return res.RowsAffected, res.Error +} diff --git a/backend/internal/service/announcement.go b/backend/internal/service/announcement.go new file mode 100644 index 0000000..80856b0 --- /dev/null +++ b/backend/internal/service/announcement.go @@ -0,0 +1,62 @@ +package service + +import ( + "context" + "crypto/sha256" + "encoding/hex" + "strings" + + "backend/internal/model" + "backend/internal/repo" +) + +// AnnouncementService serves the site-wide 公告 (markdown). It tracks, per user, +// the version they last dismissed so an updated announcement re-pops for everyone +// who hasn't seen the new text. The "version" is a hash of the content, so saving +// identical text doesn't re-notify; any edit does. +type AnnouncementService struct { + settings *repo.SiteSettingRepository + users *repo.UserRepository +} + +func NewAnnouncementService(settings *repo.SiteSettingRepository, users *repo.UserRepository) *AnnouncementService { + return &AnnouncementService{settings: settings, users: users} +} + +func announcementVersion(content string) string { + if strings.TrimSpace(content) == "" { + return "" + } + sum := sha256.Sum256([]byte(strings.TrimSpace(content))) + return hex.EncodeToString(sum[:8]) // 16 hex chars — plenty to detect a change +} + +// Content returns the raw markdown (admin editor). +func (s *AnnouncementService) Content(ctx context.Context) string { + v, _ := s.settings.GetValue(ctx, "announcement.content") + return v +} + +// ForUser returns {content, version, seen} for the logged-in user. +func (s *AnnouncementService) ForUser(ctx context.Context, user *model.User) map[string]any { + content := s.Content(ctx) + version := announcementVersion(content) + // Admins never get the popup — they author/preview it in 系统设置 instead. + seen := version == "" || (user != nil && (user.Role == "admin" || user.AnnouncementSeen == version)) + return map[string]any{ + "content": content, + "version": version, + "seen": seen, + } +} + +// MarkSeen records that the user has dismissed the given version. +func (s *AnnouncementService) MarkSeen(ctx context.Context, userID, version string) error { + _, err := s.users.Update(ctx, userID, map[string]any{"announcement_seen": version}) + return err +} + +// Save persists new announcement markdown (admin). An empty string clears it. +func (s *AnnouncementService) Save(ctx context.Context, content string) error { + return s.settings.UpsertValue(ctx, "announcement.content", content) +} diff --git a/backend/internal/service/auth.go b/backend/internal/service/auth.go index 4d92f8b..64e50c9 100644 --- a/backend/internal/service/auth.go +++ b/backend/internal/service/auth.go @@ -456,6 +456,7 @@ func (s *AuthService) PublicUser(ctx context.Context, user *model.User) (map[str "role": user.Role, "status": user.Status, "credits": user.Credits, + "recharge_total": user.RechargeTotal, "concurrency_group": concName, "concurrency_limit": concMax, "checkin_last": user.CheckinLast, diff --git a/backend/internal/service/maintenance.go b/backend/internal/service/maintenance.go index 64dca3d..0ce70e9 100644 --- a/backend/internal/service/maintenance.go +++ b/backend/internal/service/maintenance.go @@ -28,13 +28,14 @@ type MaintenanceService struct { store *storage.Client inflight *InflightRegistry showcase *repo.ShowcaseRepository + orders *repo.OrderRepository interval time.Duration stalePending time.Duration mediaPruneEvery time.Duration lastMediaPrune time.Time } -func NewMaintenanceService(tokens *repo.TokenRepository, tokenSvc *TokenService, events *repo.EventRepository, users *repo.UserRepository, refresh *RefreshProfileService, settings *repo.SiteSettingRepository, store *storage.Client, inflight *InflightRegistry, showcase *repo.ShowcaseRepository) *MaintenanceService { +func NewMaintenanceService(tokens *repo.TokenRepository, tokenSvc *TokenService, events *repo.EventRepository, users *repo.UserRepository, refresh *RefreshProfileService, settings *repo.SiteSettingRepository, store *storage.Client, inflight *InflightRegistry, showcase *repo.ShowcaseRepository, orders *repo.OrderRepository) *MaintenanceService { return &MaintenanceService{ tokens: tokens, tokenSvc: tokenSvc, @@ -45,6 +46,7 @@ func NewMaintenanceService(tokens *repo.TokenRepository, tokenSvc *TokenService, store: store, inflight: inflight, showcase: showcase, + orders: orders, interval: 60 * time.Second, stalePending: 600 * time.Second, mediaPruneEvery: 60 * time.Second, @@ -99,6 +101,15 @@ func (m *MaintenanceService) syncRecoveredQuota(accs []model.TokenAccount) { } func (m *MaintenanceService) tick(ctx context.Context) { + // 0. Auto-cancel unpaid recharge orders past their 30-min TTL. + if m.orders != nil { + if n, err := m.orders.ExpirePending(ctx, time.Now()); err != nil { + log.Printf("maintenance: expire orders: %v", err) + } else if n > 0 { + log.Printf("maintenance: cancelled %d expired order(s)", n) + } + } + // 1. Re-activate quota-exhausted tokens whose reset time has passed, then // auto-sync their real balance — these providers only refresh quota when // accessed, so recovery alone would leave a stale 0/—. For krea the sync diff --git a/backend/internal/service/payment.go b/backend/internal/service/payment.go new file mode 100644 index 0000000..56f3f39 --- /dev/null +++ b/backend/internal/service/payment.go @@ -0,0 +1,285 @@ +package service + +import ( + "context" + "errors" + "fmt" + "math" + "strconv" + "strings" + "time" + + "backend/internal/model" + "backend/internal/provider/epay" + "backend/internal/repo" + "gorm.io/gorm" +) + +const orderTTL = 30 * time.Minute + +var ( + ErrPayDisabled = errors.New("recharge is currently disabled") + ErrPayNotConfig = errors.New("payment is not configured") + ErrPayMethod = errors.New("unsupported payment method") + ErrPayAmount = errors.New("amount below the minimum") + ErrOrderNotFound = errors.New("order not found") + ErrOrderPaid = errors.New("order already paid") +) + +// PaymentService drives 易支付 recharge orders: create → pay → async-notify → +// credit points. Config lives in site settings (pay.*). +type PaymentService struct { + orders *repo.OrderRepository + users *repo.UserRepository + settings *repo.SiteSettingRepository +} + +func NewPaymentService(orders *repo.OrderRepository, users *repo.UserRepository, settings *repo.SiteSettingRepository) *PaymentService { + return &PaymentService{orders: orders, users: users, settings: settings} +} + +type PaySettings struct { + Enabled bool `json:"enabled"` + PID string `json:"pid"` + Key string `json:"key"` + APIBase string `json:"api_base"` // 易支付站点根地址,代码自动拼 /api/pay/create + Methods []string `json:"methods"` // wxpay, alipay + MinAmount float64 `json:"min_amount"` + PointsRatio int `json:"points_ratio"` // 积分 per 元 +} + +func (s *PaymentService) get(ctx context.Context, key string) string { + v, _ := s.settings.GetValue(ctx, key) + return v +} + +func (s *PaymentService) Settings(ctx context.Context) PaySettings { + api := strings.TrimRight(strings.TrimSpace(s.get(ctx, "pay.api_base")), "/") + if api == "" { + api = "https://pay.v8jisu.cn/api/pay" + } + ratio, _ := strconv.Atoi(s.get(ctx, "pay.points_ratio")) + if ratio <= 0 { + ratio = 100 + } + minAmt, _ := strconv.ParseFloat(s.get(ctx, "pay.min_amount"), 64) + var methods []string + for _, m := range strings.Split(s.get(ctx, "pay.methods"), ",") { + if m = strings.TrimSpace(m); m != "" { + methods = append(methods, m) + } + } + if len(methods) == 0 { + methods = []string{"wxpay", "alipay"} + } + return PaySettings{ + Enabled: s.get(ctx, "pay.enabled") == "true", + PID: s.get(ctx, "pay.pid"), + Key: s.get(ctx, "pay.key"), + APIBase: api, + Methods: methods, + MinAmount: minAmt, + PointsRatio: ratio, + } +} + +// Public returns the recharge config for the user UI (no merchant secrets). +func (s *PaymentService) Public(ctx context.Context) map[string]any { + c := s.Settings(ctx) + return map[string]any{ + "enabled": c.Enabled, + "methods": c.Methods, + "min_amount": c.MinAmount, + "points_ratio": c.PointsRatio, + } +} + +func (s *PaymentService) SaveSettings(ctx context.Context, in PaySettings) error { + api := strings.TrimRight(strings.TrimSpace(in.APIBase), "/") + pid := strings.TrimSpace(in.PID) + key := strings.TrimSpace(in.Key) + if api == "" { + return errors.New("支付地址不能为空") + } + if pid == "" { + return errors.New("商户ID不能为空") + } + if key == "" { + return errors.New("商户密钥不能为空") + } + if in.PointsRatio <= 0 { + in.PointsRatio = 100 + } + if in.MinAmount < 0 { + in.MinAmount = 0 + } + return s.settings.UpsertValues(ctx, map[string]string{ + "pay.enabled": strconv.FormatBool(in.Enabled), + "pay.pid": pid, + "pay.key": key, + "pay.api_base": api, + "pay.methods": strings.Join(in.Methods, ","), + "pay.min_amount": strconv.FormatFloat(in.MinAmount, 'f', -1, 64), + "pay.points_ratio": strconv.Itoa(in.PointsRatio), + }) +} + +func (c PaySettings) allows(method string) bool { + for _, m := range c.Methods { + if m == method { + return true + } + } + return false +} + +func (s *PaymentService) client(c PaySettings) *epay.Config { + return &epay.Config{APIBase: c.APIBase, PID: c.PID, Key: c.Key} +} + +// CreateOrder validates the request, persists a pending order, and places the +// 易支付 order. notifyBase is the public site origin (e.g. https://vividai.run). +func (s *PaymentService) CreateOrder(ctx context.Context, user *model.User, amount float64, method, notifyBase, clientIP string) (*model.Order, error) { + cfg := s.Settings(ctx) + if !cfg.Enabled { + return nil, ErrPayDisabled + } + if cfg.PID == "" || cfg.Key == "" { + return nil, ErrPayNotConfig + } + if !cfg.allows(method) { + return nil, ErrPayMethod + } + amount = math.Round(amount*100) / 100 + if amount <= 0 || amount < cfg.MinAmount { + return nil, ErrPayAmount + } + points := int(math.Round(amount * float64(cfg.PointsRatio))) + now := time.Now() + order := &model.Order{ + ID: "P" + strconv.FormatInt(now.Unix(), 10) + randomUpper(6), + UserID: user.ID, + Amount: amount, + Points: points, + PayType: method, + Status: "pending", + ExpiresAt: now.Add(orderTTL), + } + if err := s.orders.Create(ctx, order); err != nil { + return nil, err + } + res, err := s.client(cfg).Create(ctx, epay.CreateRequest{ + OutTradeNo: order.ID, + Type: method, + Name: fmt.Sprintf("积分充值 %d", points), + Money: strconv.FormatFloat(amount, 'f', 2, 64), + NotifyURL: strings.TrimRight(notifyBase, "/") + "/admin/api/pay/notify", + ClientIP: clientIP, + }) + if err != nil { + _ = s.orders.Update(ctx, order.ID, map[string]any{"status": "cancelled"}) + return nil, err + } + order.TradeNo = res.TradeNo + order.PayInfo = res.PayInfo + order.PayInfoType = res.PayType + _ = s.orders.Update(ctx, order.ID, map[string]any{ + "trade_no": res.TradeNo, "pay_info": res.PayInfo, "pay_info_type": res.PayType, + }) + return order, nil +} + +// Continue re-creates payment for an unpaid order (clones its amount/method into +// a fresh order — keeps the old one as history). Used by 订单管理 "继续支付". +func (s *PaymentService) Continue(ctx context.Context, user *model.User, orderID, notifyBase, clientIP string) (*model.Order, error) { + old, err := s.orders.Get(ctx, orderID) + if err != nil || old == nil || old.UserID != user.ID { + return nil, ErrOrderNotFound + } + if old.Status == "paid" { + return nil, ErrOrderPaid + } + // Reuse a still-valid pending order — return its saved qrcode/payurl directly, + // no new upstream order (and the countdown keeps its original expiry). + if old.Status == "pending" && old.PayInfo != "" && time.Now().Before(old.ExpiresAt) { + return old, nil + } + // Expired / cancelled (or never got a pay_info) → place a fresh order. + return s.CreateOrder(ctx, user, old.Amount, old.PayType, notifyBase, clientIP) +} + +// HandleNotify processes an 易支付 async callback. Returns true when this call is +// the one that credited the user (first successful notify for the order). +func (s *PaymentService) HandleNotify(ctx context.Context, params map[string]string) (bool, error) { + cfg := s.Settings(ctx) + if cfg.Key == "" { + return false, ErrPayNotConfig + } + if !s.client(cfg).VerifyNotify(params) { + return false, errors.New("bad sign") + } + if params["trade_status"] != "TRADE_SUCCESS" { + return false, nil + } + orderID := params["out_trade_no"] + order, err := s.orders.Get(ctx, orderID) + if err != nil || order == nil { + return false, ErrOrderNotFound + } + credited, err := s.orders.MarkPaid(ctx, order.ID, params["trade_no"], time.Now()) + if err != nil { + return false, err + } + if !credited { + return false, nil // duplicate / already handled + } + // Credit points + bump the user's cumulative recharge total, atomically. + _, err = s.users.Update(ctx, order.UserID, map[string]any{ + "credits": gorm.Expr("credits + ?", order.Points), + "recharge_total": gorm.Expr("recharge_total + ?", order.Amount), + }) + return err == nil, err +} + +func (s *PaymentService) GetForUser(ctx context.Context, userID, orderID string) (*model.Order, error) { + o, err := s.orders.Get(ctx, orderID) + if err != nil || o == nil || o.UserID != userID { + return nil, ErrOrderNotFound + } + 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) ListAll(ctx context.Context, status string, limit, offset int) ([]model.Order, int64, error) { + return s.orders.List(ctx, status, limit, offset) +} + +// UserNames maps user id → display name (name, else email, else id) so the admin +// 订单管理 list can show 用户名. +func (s *PaymentService) UserNames(ctx context.Context) map[string]string { + out := map[string]string{} + users, err := s.users.List(ctx) + if err != nil { + return out + } + for _, u := range users { + n := u.Name + if n == "" { + n = u.Email + } + if n == "" { + n = u.ID + } + out[u.ID] = n + } + return out +} + +// ExpireStale cancels pending orders past their TTL (called by the maintenance +// sweep). Returns how many were cancelled. +func (s *PaymentService) ExpireStale(ctx context.Context) (int64, error) { + return s.orders.ExpirePending(ctx, time.Now()) +} diff --git a/backend/internal/service/v1.go b/backend/internal/service/v1.go index 319278a..737639d 100644 --- a/backend/internal/service/v1.go +++ b/backend/internal/service/v1.go @@ -722,6 +722,8 @@ func (s *V1Service) runVideoJob(ctx context.Context, principal *APIPrincipal, in defer s.cleanupReferenceImages(ctx, eventID, refFiles) startedAt := time.Now() + // No-store: capture only the UPSTREAM video URL. /content streams it on demand + // (grok URLs are auth-gated → fetched with the generating account's token). var videoURL string var execErr error switch s.effectiveProvider(genCtx, modelItem) { @@ -748,7 +750,7 @@ func (s *V1Service) runVideoJob(ctx context.Context, principal *APIPrincipal, in _ = s.events.UpdateStatus(ctx, eventID, "failed", "upstream returned no video url", 0) return } - // Store the upstream URL as the event's "file"; /content proxies it. + // Store the upstream URL as the event's "file"; /content fetches it on demand. if err := s.events.MarkVideoReady(ctx, eventID, videoURL, int(time.Since(startedAt).Milliseconds())); err != nil { return } @@ -787,6 +789,22 @@ func (s *V1Service) OpenVideoContent(ctx context.Context, principal *APIPrincipa if ev.Status != "success" || strings.TrimSpace(ev.File) == "" { return nil, "", ErrVideoNotReady } + // grok asset URLs (assets.grok.com) are auth-gated — a plain GET 403s. Stream + // them through the SAME account that generated the clip, using its token. If + // that account is gone (grok pools churn often), the clip is unrecoverable. + if ev.Provider == "grok" && s.grok != nil { + if s.settings != nil { + if proxy, perr := s.settings.GetValue(ctx, "proxy.url"); perr == nil { + s.grok.SetProxy(proxy) + } + } + acct, _ := s.tokens.Get(ctx, "grok", ev.AccountID) + if acct == nil || strings.TrimSpace(acct.Value) == "" { + return nil, "", fmt.Errorf("%w: grok account no longer available for this video", ErrProviderTemporary) + } + return s.grok.OpenAsset(ctx, acct.Value, ev.File) + } + // Other providers return publicly-fetchable URLs — proxy directly. req, err := http.NewRequestWithContext(ctx, http.MethodGet, ev.File, nil) if err != nil { return nil, "", err @@ -1251,9 +1269,9 @@ const maxTempDeadAccounts = 3 // • tempAsDead=false (default): retry the SAME account up to // maxSameAccountAttempts times (not counted); if still failing, STOP // (no fan-out — an upstream-wide blip fails identically everywhere). -// • tempAsDead=true (adobe): treat the temporary error as a DEAD account — -// mark it like a 401 and fail over to the next account, capped at -// maxTempDeadAccounts accounts so a pool-wide blip can't kill everything. +// • tempAsDead=true (adobe): BAN the account (mark dead/disabled) and fail +// over to the next account, capped at maxTempDeadAccounts accounts so a +// pool-wide blip can't kill everything. Dead accounts don't auto-recover. // - 参数错 / request-level (anything else) → return immediately, no retry, no // account penalty (the account isn't at fault). // @@ -1356,10 +1374,17 @@ func (s *V1Service) tryAccount(ctx context.Context, eventID, pool string, token if isTemp { if tempAsDead { // Ops policy (adobe): a temporary upstream error ("system under - // load" etc.) means this account is effectively dead — mark it - // like a 401 and fail over to the next account. The pool driver - // caps how many accounts this is allowed to burn. - s.markTokenFailure(ctx, pool, token, kind, true, false) + // load" etc.) BANS this account — mark it dead/disabled and fail + // over to the next account. The pool driver caps how many accounts + // this is allowed to burn per request (maxTempDeadAccounts). Note: + // dead accounts do NOT auto-recover — they need a manual re-enable. + _, _ = s.tokens.Update(ctx, pool, token.ID, map[string]any{ + "status": "disabled", + "dead": true, + "last_used_at": time.Now(), + "fail_total": gorm.Expr("fail_total + 1"), + "fails": gorm.Expr("fails + 1"), + }) return nil, err, true, true } tempAttempts++ diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 3607cb5..57a7155 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,13 +1,15 @@ { - "name": "ai-gateway-frontend", + "name": "vivid-frontend", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "ai-gateway-frontend", + "name": "vivid-frontend", "version": "0.1.0", "dependencies": { + "marked": "^18.0.5", + "qrcode": "^1.5.4", "vue": "^3.5.13", "vue-router": "^4.5.0" }, @@ -1304,12 +1306,83 @@ "integrity": "sha512-FTW0AFZNaK5/mOqvGBwVfUlNLU38TiQn4+DQgIFUnrBBJQ1crMJ82yeGQLV5jyKFsO8yRukpbuP7x+nRbH6aug==", "license": "MIT" }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, "node_modules/csstype": { "version": "3.2.3", "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz", "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", "license": "MIT" }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/detect-libc": { "version": "2.1.2", "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.1.2.tgz", @@ -1320,6 +1393,18 @@ "node": ">=8" } }, + "node_modules/dijkstrajs": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz", + "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==", + "license": "MIT" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, "node_modules/enhanced-resolve": { "version": "5.21.6", "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.21.6.tgz", @@ -1412,6 +1497,19 @@ } } }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", @@ -1427,6 +1525,15 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -1434,6 +1541,15 @@ "dev": true, "license": "ISC" }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/jiti": { "version": "2.7.0", "resolved": "https://registry.npmmirror.com/jiti/-/jiti-2.7.0.tgz", @@ -1705,6 +1821,18 @@ "url": "https://opencollective.com/parcel" } }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "license": "MIT", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/magic-string": { "version": "0.30.21", "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz", @@ -1714,6 +1842,18 @@ "@jridgewell/sourcemap-codec": "^1.5.5" } }, + "node_modules/marked": { + "version": "18.0.5", + "resolved": "https://registry.npmmirror.com/marked/-/marked-18.0.5.tgz", + "integrity": "sha512-S6GcvALHg6K4ohtu4E7x0a1AqhAjp6cV8KhLSyN9qVapnzJkusVBxZRcIU9AeYsbe6P1hKDusSbEOzGyyuce6w==", + "license": "MIT", + "bin": { + "marked": "bin/marked.js" + }, + "engines": { + "node": ">= 20" + } + }, "node_modules/nanoid": { "version": "3.3.12", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.12.tgz", @@ -1732,6 +1872,51 @@ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz", @@ -1751,6 +1936,15 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pngjs": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz", + "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==", + "license": "MIT", + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/postcss": { "version": "8.5.15", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.5.15.tgz", @@ -1779,6 +1973,38 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/qrcode": { + "version": "1.5.4", + "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz", + "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==", + "license": "MIT", + "dependencies": { + "dijkstrajs": "^1.0.1", + "pngjs": "^5.0.0", + "yargs": "^15.3.1" + }, + "bin": { + "qrcode": "bin/qrcode" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "license": "ISC" + }, "node_modules/rollup": { "version": "4.62.0", "resolved": "https://registry.npmmirror.com/rollup/-/rollup-4.62.0.tgz", @@ -1824,6 +2050,12 @@ "fsevents": "~2.3.2" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz", @@ -1833,6 +2065,32 @@ "node": ">=0.10.0" } }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tailwindcss": { "version": "4.3.1", "resolved": "https://registry.npmmirror.com/tailwindcss/-/tailwindcss-4.3.1.tgz", @@ -1981,6 +2239,67 @@ "peerDependencies": { "vue": "^3.5.0" } + }, + "node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "license": "ISC" + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "license": "ISC" + }, + "node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "license": "MIT", + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "license": "ISC", + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } } } } diff --git a/frontend/package.json b/frontend/package.json index 094caac..9b93cad 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -9,6 +9,8 @@ "preview": "vite preview" }, "dependencies": { + "marked": "^18.0.5", + "qrcode": "^1.5.4", "vue": "^3.5.13", "vue-router": "^4.5.0" }, diff --git a/frontend/src/App.vue b/frontend/src/App.vue index f88c1e2..3596f37 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -2,13 +2,25 @@ // App shell is layout-driven: each top-level route renders its own layout // (PublicLayout for /, /user; AdminLayout for /admin/*). The login modal is // mounted here so it can overlay any page instead of being a separate route. -import { onMounted } from 'vue' +import { onMounted, watch } from 'vue' import LoginModal from './components/LoginModal.vue' +import AnnouncementModal from './components/AnnouncementModal.vue' +import PaymentModal from './components/PaymentModal.vue' import { auth, refreshMe, openRegister } from './auth' +import { loadAnnouncement } from './announcement' + +// Pull the 公告 whenever a user is (or becomes) logged in — at first paint AND +// after a fresh login. It pops up only if this user hasn't seen the latest one. +watch(() => auth.user?.id, (id) => { if (id) loadAnnouncement() }, { immediate: true }) -// An invite link (/?ref=CODE) should drop a guest straight into registration -// with the code attached. Logged-in users just ignore the ref. onMounted(async () => { + // Validate the stored session on every page load / refresh — even on public + // pages where the router guard doesn't. This populates auth.user, which fires + // the watch above → the 公告 check runs on a plain refresh (no re-login). + if (auth.token && !auth.ready) await refreshMe() + + // An invite link (/?ref=CODE) should drop a guest straight into registration + // with the code attached. Logged-in users just ignore the ref. const code = new URLSearchParams(location.search).get('ref') if (!code) return if (!auth.ready) await refreshMe() @@ -19,4 +31,6 @@ onMounted(async () => { diff --git a/frontend/src/announcement.js b/frontend/src/announcement.js new file mode 100644 index 0000000..ba13f4c --- /dev/null +++ b/frontend/src/announcement.js @@ -0,0 +1,28 @@ +// Site-wide 公告 (admin-authored markdown). Visible only to logged-in users; pops +// up whenever the current user hasn't seen the latest version — at login AND on +// any normal visit. An admin edit changes the version (content hash) so it +// re-pops for everyone who hasn't seen the new text. +import { reactive } from 'vue' +import { api, jsonBody } from './api' + +export const announcement = reactive({ content: '', version: '', show: false }) + +// Fetch the current announcement + this user's seen-state; show it if unseen. +export async function loadAnnouncement() { + try { + const r = await api('/announcement') + if (r.ok && r.data) { + announcement.content = r.data.content || '' + announcement.version = r.data.version || '' + announcement.show = !r.data.seen && !!announcement.content.trim() + } + } catch { /* offline — skip */ } +} + +// Dismiss: hide + remember this version server-side so it won't re-pop. +export async function dismissAnnouncement() { + announcement.show = false + if (announcement.version) { + try { await api('/announcement/seen', jsonBody('POST', { version: announcement.version })) } catch { /* ignore */ } + } +} diff --git a/frontend/src/components/AnnouncementModal.vue b/frontend/src/components/AnnouncementModal.vue new file mode 100644 index 0000000..ba39306 --- /dev/null +++ b/frontend/src/components/AnnouncementModal.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/frontend/src/components/Icon.vue b/frontend/src/components/Icon.vue index b2440eb..686b73f 100644 --- a/frontend/src/components/Icon.vue +++ b/frontend/src/components/Icon.vue @@ -21,6 +21,7 @@ const PATHS = { chevron: '', check: '', shield: '', + receipt: '', } defineProps({ name: { type: String, required: true } }) diff --git a/frontend/src/components/LoginModal.vue b/frontend/src/components/LoginModal.vue index d049c6b..05c3017 100644 --- a/frontend/src/components/LoginModal.vue +++ b/frontend/src/components/LoginModal.vue @@ -347,12 +347,15 @@ html.dark .fld:-webkit-autofill:focus { min-width: 5.5rem; /* keep width stable between text / spinner */ display: inline-flex; align-items: center; justify-content: center; font-size: 0.75rem; white-space: nowrap; - color: rgb(196 181 253 / 0.95); - background: rgb(167 139 250 / 0.1); border: 1px solid rgb(167 139 250 / 0.3); + color: rgb(124 58 237); /* violet-600 — readable on the light card */ + background: rgb(167 139 250 / 0.12); border: 1px solid rgb(167 139 250 / 0.4); transition: background 0.15s, opacity 0.15s; } +html.dark .code-btn { color: rgb(196 181 253 / 0.95); background: rgb(167 139 250 / 0.1); border-color: rgb(167 139 250 / 0.3); } .code-btn:hover:not(:disabled) { background: rgb(167 139 250 / 0.2); } -.code-btn:disabled { opacity: 0.45; cursor: not-allowed; color: rgb(255 255 255 / 0.5); border-color: rgb(255 255 255 / 0.12); } +/* Disabled (sending / countdown): just dim — keep the theme text color so it + never washes out to invisible white on the light card. */ +.code-btn:disabled { opacity: 0.55; cursor: not-allowed; } .code-spin { width: 1.05rem; height: 1.05rem; animation: code-spin 0.7s linear infinite; } @keyframes code-spin { to { transform: rotate(360deg); } } diff --git a/frontend/src/components/PaymentModal.vue b/frontend/src/components/PaymentModal.vue new file mode 100644 index 0000000..aa9d51f --- /dev/null +++ b/frontend/src/components/PaymentModal.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/frontend/src/layouts/AdminLayout.vue b/frontend/src/layouts/AdminLayout.vue index 7519eee..5fd032a 100644 --- a/frontend/src/layouts/AdminLayout.vue +++ b/frontend/src/layouts/AdminLayout.vue @@ -14,12 +14,13 @@ const tabs = [ { label: '账号管理', to: '/admin/accounts', icon: 'plug' }, { label: '用户管理', to: '/admin/users', icon: 'accounts' }, { label: '并发分组', to: '/admin/concurrency', icon: 'shield' }, - { label: '兑换码', to: '/admin/cdks', icon: 'spark' }, + { label: '订单管理', to: '/admin/orders', icon: 'receipt' }, + { label: '兑换码管理', to: '/admin/cdks', icon: 'spark' }, { label: '邀请日志', to: '/admin/invites', icon: 'accounts' }, { label: '图片管理', to: '/admin/images', icon: 'files' }, { label: '首页内容', to: '/admin/showcase', icon: 'spark' }, - { label: '日志', to: '/admin/logs', icon: 'log' }, - { label: '配置', to: '/admin/config', icon: 'config' }, + { label: '日志管理', to: '/admin/logs', icon: 'log' }, + { label: '系统配置', to: '/admin/config', icon: 'config' }, ] const currentLabel = computed(() => route.meta?.label || '') diff --git a/frontend/src/layouts/PublicLayout.vue b/frontend/src/layouts/PublicLayout.vue index d5b345a..47bb2bd 100644 --- a/frontend/src/layouts/PublicLayout.vue +++ b/frontend/src/layouts/PublicLayout.vue @@ -19,6 +19,7 @@ const nav = computed(() => { items.push({ to: '/logs', label: '图片', icon: 'files' }) items.push({ to: '/mylogs', label: '日志', icon: 'log' }) items.push({ to: '/invite', label: '邀请', icon: 'accounts' }) + items.push({ to: '/orders', label: '订单', icon: 'receipt' }) } // 文档 + 关于 are public — visible to guests too. items.push({ to: '/docs', label: '文档', icon: 'log' }) @@ -87,7 +88,7 @@ const currentLabel = computed(() => { - + diff --git a/frontend/src/main.js b/frontend/src/main.js index 90725e7..ef9c306 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -13,6 +13,8 @@ import PlaygroundView from './views/PlaygroundView.vue' import UserLogsView from './views/UserLogsView.vue' import UserLogsTableView from './views/UserLogsTableView.vue' import SettingsView from './views/SettingsView.vue' +import OrdersView from './views/OrdersView.vue' +import AdminOrdersView from './views/AdminOrdersView.vue' import InviteView from './views/InviteView.vue' import DocsView from './views/DocsView.vue' import AboutView from './views/AboutView.vue' @@ -40,6 +42,7 @@ const routes = [ { path: 'invite', component: InviteView, meta: { label: '邀请' } }, { path: 'docs', component: DocsView, meta: { label: '文档' } }, { path: 'about', component: AboutView, meta: { label: '关于' } }, + { path: 'orders', component: OrdersView, meta: { label: '订单' } }, { path: 'settings', component: SettingsView, meta: { label: '设置' } }, ], }, @@ -53,12 +56,13 @@ const routes = [ { path: 'accounts', component: AccountsView, meta: { label: '账号管理' } }, { path: 'users', component: UsersView, meta: { label: '用户管理' } }, { path: 'concurrency', component: ConcurrencyView, meta: { label: '并发分组' } }, - { path: 'cdks', component: CdksView, meta: { label: '兑换码' } }, + { path: 'orders', component: AdminOrdersView, meta: { label: '订单管理' } }, + { path: 'cdks', component: CdksView, meta: { label: '兑换码管理' } }, { path: 'invites', component: InvitesAdminView, meta: { label: '邀请日志' } }, { path: 'images', component: ImagesView, meta: { label: '图片管理' } }, { path: 'showcase', component: ShowcaseView, meta: { label: '首页内容' } }, - { path: 'logs', component: LogsView, meta: { label: '日志' } }, - { path: 'config', component: ConfigView, meta: { label: '配置' } }, + { path: 'logs', component: LogsView, meta: { label: '日志管理' } }, + { path: 'config', component: ConfigView, meta: { label: '系统配置' } }, ], }, // legacy redirects @@ -83,7 +87,7 @@ const router = createRouter({ // Pages that require a login. The home page (/) stays public; everything a // signed-in user touches (画图/记录/设置) and the whole admin area is gated. -const PROTECTED = ['/user', '/logs', '/invite', '/settings'] +const PROTECTED = ['/user', '/logs', '/invite', '/settings', '/orders'] function isProtected(path) { return path.startsWith('/admin') || PROTECTED.includes(path) } @@ -119,3 +123,25 @@ router.afterEach(applyTitle) loadSite().then(() => applyTitle(router.currentRoute.value)) createApp(App).use(router).mount('#app') + +// Globally strip the browser's video extras (画中画/PiP、下载、投屏、播放速率/增强菜单) +// from EVERY