后端: 1. LLM 独立服务与统一计费出口落地:新增 `cmd/llm`、`client/llm` 与 `services/llm/rpc`,补齐 BillingContext、CreditBalanceGuard、价格规则解析、stream usage 归集与 `credit.charge.requested` outbox 发布,active-scheduler / agent / course / memory / gateway fallback 全部改走 llm zrpc,不再各自本地初始化模型。 2. TokenStore 收口为 Credit 权威账本:新增 credit account / ledger / product / order / price-rule / reward-rule 能力与 Redis 快照缓存,扩展 tokenstore rpc/client 支撑余额快照、消耗看板、商品、订单、流水、价格规则和奖励规则,并接入 LLM charge 事件消费完成 Credit 扣费落账。 3. 计费旧链路下线与网关切口切换:`/token-store` 语义整体切到 `/credit-store`,agent chat 移除旧 TokenQuotaGuard,userauth 的 CheckTokenQuota / AdjustTokenUsage 改为废弃,聊天历史落库不再同步旧 token 额度账本,course 图片解析请求补 user_id 进入新计费口径。 前端: 4. 计划广场从 mock 数据切到真实接口:新增 forum api/types,首页支持真实列表、标签、搜索、防抖、点赞、导入和发布计划,详情页补齐帖子详情、评论树、回复和删除评论链路,同时补上“至少一个标签”的前后端约束与默认标签兜底。 5. 商店页切到 Credit 体系并重做展示:顶部改为余额 + Credit/Token 消耗看板,支持 24h/7d/30d/all 周期切换;套餐区展示原价与当前价;历史区改为当前用户 Credit 流水并支持查看更多,整体视觉和交互同步收口。 仓库: 6. 配置与本地启动体系补齐 llm / outbox 编排:`config.example.yaml` 增加 llm rpc 和统一 outbox service 配置,`dev-common.ps1` 把 llm 纳入多服务依赖并自动建 Kafka topic,`docker-compose.yml` 同步初始化 agent/task/memory/active-scheduler/notification/taskclass-forum/llm/token-store 全量 outbox topic。
105 lines
3.5 KiB
Go
105 lines
3.5 KiB
Go
package sv
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"log"
|
|
"strings"
|
|
|
|
sharedevents "github.com/LoveLosita/smartflow/backend/shared/events"
|
|
kafkabus "github.com/LoveLosita/smartflow/backend/shared/infra/kafka"
|
|
outboxinfra "github.com/LoveLosita/smartflow/backend/shared/infra/outbox"
|
|
)
|
|
|
|
// RegisterCreditChargeRoutes 只登记 token-store 负责消费的 Credit 扣费事件归属。
|
|
func RegisterCreditChargeRoutes() error {
|
|
return outboxinfra.RegisterEventService(sharedevents.CreditChargeRequestedEventType, outboxinfra.ServiceTokenStore)
|
|
}
|
|
|
|
// RegisterCreditChargeHandlers 注册 token-store 对 Credit 扣费事件的消费处理器。
|
|
func RegisterCreditChargeHandlers(bus OutboxBus, outboxRepo *outboxinfra.Repository, svc *Service) error {
|
|
if bus == nil {
|
|
return errors.New("event bus is nil")
|
|
}
|
|
if outboxRepo == nil {
|
|
return errors.New("outbox repository is nil")
|
|
}
|
|
if svc == nil {
|
|
return errors.New("tokenstore service is nil")
|
|
}
|
|
if err := RegisterCreditChargeRoutes(); err != nil {
|
|
return err
|
|
}
|
|
|
|
route, ok := outboxinfra.ResolveEventRoute(sharedevents.CreditChargeRequestedEventType)
|
|
if !ok {
|
|
return fmt.Errorf("credit charge outbox route is missing: eventType=%s", sharedevents.CreditChargeRequestedEventType)
|
|
}
|
|
eventOutboxRepo := outboxRepo.WithRoute(route)
|
|
|
|
handler := func(ctx context.Context, envelope kafkabus.Envelope) error {
|
|
if !isAllowedCreditChargeEventVersion(envelope.EventVersion) {
|
|
if err := eventOutboxRepo.MarkDead(ctx, envelope.OutboxID, fmt.Sprintf("Credit 扣费事件版本不受支持: %s", envelope.EventVersion)); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
var payload sharedevents.CreditChargeRequestedPayload
|
|
if err := json.Unmarshal(envelope.Payload, &payload); err != nil {
|
|
if markErr := eventOutboxRepo.MarkDead(ctx, envelope.OutboxID, "解析 Credit 扣费载荷失败: "+err.Error()); markErr != nil {
|
|
return markErr
|
|
}
|
|
return nil
|
|
}
|
|
if strings.TrimSpace(payload.EventID) == "" {
|
|
payload.EventID = strings.TrimSpace(envelope.EventID)
|
|
}
|
|
if err := payload.Validate(); err != nil {
|
|
if markErr := eventOutboxRepo.MarkDead(ctx, envelope.OutboxID, "Credit 扣费载荷非法: "+err.Error()); markErr != nil {
|
|
return markErr
|
|
}
|
|
return nil
|
|
}
|
|
if payload.EventType() != sharedevents.CreditChargeRequestedEventType {
|
|
if markErr := eventOutboxRepo.MarkDead(ctx, envelope.OutboxID, fmt.Sprintf("Credit 扣费事件类型不匹配: envelope=%s payload=%s", sharedevents.CreditChargeRequestedEventType, payload.EventType())); markErr != nil {
|
|
return markErr
|
|
}
|
|
return nil
|
|
}
|
|
|
|
if !payload.SkipCharge && payload.CreditCost <= 0 && payload.RMBCostMicros <= 0 {
|
|
if err := eventOutboxRepo.MarkConsumed(ctx, envelope.OutboxID); err != nil {
|
|
return err
|
|
}
|
|
log.Printf("credit charge event skipped with zero cost: event_id=%s outbox_id=%d", payload.EventID, envelope.OutboxID)
|
|
return nil
|
|
}
|
|
|
|
tx, err := svc.RecordCreditCharge(ctx, payload)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := eventOutboxRepo.MarkConsumed(ctx, envelope.OutboxID); err != nil {
|
|
return err
|
|
}
|
|
|
|
log.Printf(
|
|
"credit charge event consumed by tokenstore: event_id=%s transaction_id=%d outbox_id=%d",
|
|
payload.EventID,
|
|
tx.TransactionID,
|
|
envelope.OutboxID,
|
|
)
|
|
return nil
|
|
}
|
|
|
|
return bus.RegisterEventHandler(sharedevents.CreditChargeRequestedEventType, handler)
|
|
}
|
|
|
|
func isAllowedCreditChargeEventVersion(version string) bool {
|
|
version = strings.TrimSpace(version)
|
|
return version == "" || version == sharedevents.CreditChargeEventVersion
|
|
}
|