Version: 0.9.80.dev.260506

后端:
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。
This commit is contained in:
Losita
2026-05-06 20:16:53 +08:00
parent 7d324b77aa
commit 61db646805
104 changed files with 9527 additions and 3925 deletions

View File

@@ -4,10 +4,10 @@ import (
"context"
"errors"
"github.com/LoveLosita/smartflow/backend/shared/respond"
"github.com/LoveLosita/smartflow/backend/services/tokenstore/rpc/pb"
tokenstoresv "github.com/LoveLosita/smartflow/backend/services/tokenstore/sv"
tokencontracts "github.com/LoveLosita/smartflow/backend/shared/contracts/tokenstore"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
type Handler struct {
@@ -20,11 +20,6 @@ func NewHandler(svc *tokenstoresv.Service) *Handler {
}
// service 负责统一校验 RPC 层依赖是否已经注入。
//
// 职责边界:
// 1. 只判断 handler 自身和业务 service 是否可用;
// 2. 不负责支付状态流转、订单幂等和 grant 账本写入;
// 3. 失败时返回可直接转成 gRPC status 的业务错误。
func (h *Handler) service() (*tokenstoresv.Service, error) {
if h == nil || h.svc == nil {
return nil, errors.New("tokenstore service dependency not initialized")
@@ -32,282 +27,39 @@ func (h *Handler) service() (*tokenstoresv.Service, error) {
return h.svc, nil
}
// GetSummary 负责把 Token 概览请求从 gRPC 协议转成内部服务调用
func (h *Handler) GetSummary(ctx context.Context, req *pb.GetTokenSummaryRequest) (*pb.GetTokenSummaryResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
summary, err := svc.GetSummary(ctx, req.ActorUserId)
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.GetTokenSummaryResponse{Summary: tokenSummaryToPB(summary)}, nil
// GetSummary 保留旧 token RPC 方法壳,统一返回已下线
func (h *Handler) GetSummary(context.Context, *pb.GetTokenSummaryRequest) (*pb.GetTokenSummaryResponse, error) {
return nil, legacyTokenMethodRemoved()
}
func (h *Handler) ListProducts(ctx context.Context, req *pb.ListTokenProductsRequest) (*pb.ListTokenProductsResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
items, err := svc.ListProducts(ctx, req.ActorUserId)
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.ListTokenProductsResponse{Items: tokenProductsToPB(items)}, nil
func (h *Handler) ListProducts(context.Context, *pb.ListTokenProductsRequest) (*pb.ListTokenProductsResponse, error) {
return nil, legacyTokenMethodRemoved()
}
func (h *Handler) CreateOrder(ctx context.Context, req *pb.CreateTokenOrderRequest) (*pb.CreateTokenOrderResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
order, err := svc.CreateOrder(ctx, tokencontracts.CreateTokenOrderRequest{
ActorUserID: req.ActorUserId,
ProductID: req.ProductId,
Quantity: int(req.Quantity),
IdempotencyKey: req.IdempotencyKey,
})
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.CreateTokenOrderResponse{Order: tokenOrderToPB(order)}, nil
func (h *Handler) CreateOrder(context.Context, *pb.CreateTokenOrderRequest) (*pb.CreateTokenOrderResponse, error) {
return nil, legacyTokenMethodRemoved()
}
func (h *Handler) ListOrders(ctx context.Context, req *pb.ListTokenOrdersRequest) (*pb.ListTokenOrdersResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
items, page, err := svc.ListOrders(ctx, tokencontracts.ListTokenOrdersRequest{
ActorUserID: req.ActorUserId,
Page: int(req.Page),
PageSize: int(req.PageSize),
Status: req.Status,
})
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.ListTokenOrdersResponse{
Items: tokenOrdersToPB(items),
Page: tokenPageToPB(page),
}, nil
func (h *Handler) ListOrders(context.Context, *pb.ListTokenOrdersRequest) (*pb.ListTokenOrdersResponse, error) {
return nil, legacyTokenMethodRemoved()
}
func (h *Handler) GetOrder(ctx context.Context, req *pb.GetTokenOrderRequest) (*pb.GetTokenOrderResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
order, err := svc.GetOrder(ctx, req.ActorUserId, req.OrderId)
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.GetTokenOrderResponse{Order: tokenOrderToPB(order)}, nil
func (h *Handler) GetOrder(context.Context, *pb.GetTokenOrderRequest) (*pb.GetTokenOrderResponse, error) {
return nil, legacyTokenMethodRemoved()
}
func (h *Handler) MockPaidOrder(ctx context.Context, req *pb.MockPaidOrderRequest) (*pb.MockPaidOrderResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
order, err := svc.MockPaidOrder(ctx, tokencontracts.MockPaidOrderRequest{
ActorUserID: req.ActorUserId,
OrderID: req.OrderId,
MockChannel: req.MockChannel,
IdempotencyKey: req.IdempotencyKey,
})
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.MockPaidOrderResponse{Order: tokenOrderToPB(order)}, nil
func (h *Handler) MockPaidOrder(context.Context, *pb.MockPaidOrderRequest) (*pb.MockPaidOrderResponse, error) {
return nil, legacyTokenMethodRemoved()
}
func (h *Handler) ListGrants(ctx context.Context, req *pb.ListTokenGrantsRequest) (*pb.ListTokenGrantsResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
items, page, err := svc.ListGrants(ctx, tokencontracts.ListTokenGrantsRequest{
ActorUserID: req.ActorUserId,
Page: int(req.Page),
PageSize: int(req.PageSize),
Source: req.Source,
})
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.ListTokenGrantsResponse{
Items: tokenGrantsToPB(items),
Page: tokenPageToPB(page),
}, nil
func (h *Handler) ListGrants(context.Context, *pb.ListTokenGrantsRequest) (*pb.ListTokenGrantsResponse, error) {
return nil, legacyTokenMethodRemoved()
}
// RecordForumRewardGrant 负责把论坛 outbox 奖励事件转成 token-store 内部账本写入调用。
func (h *Handler) RecordForumRewardGrant(ctx context.Context, req *pb.RecordForumRewardGrantRequest) (*pb.RecordForumRewardGrantResponse, error) {
svc, err := h.service()
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
if req == nil {
return nil, grpcErrorFromServiceError(respond.MissingParam)
}
grant, err := svc.RecordForumRewardGrant(ctx, tokencontracts.RecordForumRewardGrantRequest{
EventID: req.EventId,
ReceiverUserID: req.ReceiverUserId,
Source: req.Source,
SourceRefID: req.SourceRefId,
})
if err != nil {
return nil, grpcErrorFromServiceError(err)
}
return &pb.RecordForumRewardGrantResponse{Grant: tokenGrantToPB(grant)}, nil
func (h *Handler) RecordForumRewardGrant(context.Context, *pb.RecordForumRewardGrantRequest) (*pb.RecordForumRewardGrantResponse, error) {
return nil, legacyTokenMethodRemoved()
}
func tokenPageToPB(page tokencontracts.PageResult) *pb.PageResponse {
return &pb.PageResponse{
Page: int32(page.Page),
PageSize: int32(page.PageSize),
Total: int32(page.Total),
HasMore: page.HasMore,
}
}
func tokenSummaryToPB(summary *tokencontracts.TokenSummary) *pb.TokenSummary {
if summary == nil {
return nil
}
return &pb.TokenSummary{
RecordedTokenTotal: summary.RecordedTokenTotal,
AppliedTokenTotal: summary.AppliedTokenTotal,
PendingApplyTokenTotal: summary.PendingApplyTokenTotal,
QuotaSyncStatus: summary.QuotaSyncStatus,
Tip: summary.Tip,
}
}
func tokenProductToPB(product tokencontracts.TokenProductView) *pb.TokenProductView {
return &pb.TokenProductView{
ProductId: product.ProductID,
Name: product.Name,
Description: product.Description,
TokenAmount: product.TokenAmount,
PriceCent: product.PriceCent,
PriceText: product.PriceText,
Currency: product.Currency,
Badge: product.Badge,
Status: product.Status,
SortOrder: int32(product.SortOrder),
}
}
func tokenProductsToPB(items []tokencontracts.TokenProductView) []*pb.TokenProductView {
if len(items) == 0 {
return nil
}
result := make([]*pb.TokenProductView, 0, len(items))
for i := range items {
result = append(result, tokenProductToPB(items[i]))
}
return result
}
func tokenGrantToPB(grant *tokencontracts.TokenGrantView) *pb.TokenGrantView {
if grant == nil {
return nil
}
return &pb.TokenGrantView{
GrantId: grant.GrantID,
EventId: grant.EventID,
Source: grant.Source,
SourceLabel: grant.SourceLabel,
Amount: grant.Amount,
Status: grant.Status,
QuotaApplied: grant.QuotaApplied,
Description: grant.Description,
CreatedAt: grant.CreatedAt,
}
}
func tokenGrantsToPB(items []tokencontracts.TokenGrantView) []*pb.TokenGrantView {
if len(items) == 0 {
return nil
}
result := make([]*pb.TokenGrantView, 0, len(items))
for i := range items {
item := items[i]
result = append(result, tokenGrantToPB(&item))
}
return result
}
func tokenOrderToPB(order *tokencontracts.TokenOrderView) *pb.TokenOrderView {
if order == nil {
return nil
}
return &pb.TokenOrderView{
OrderId: order.OrderID,
OrderNo: order.OrderNo,
Status: order.Status,
TokenAmount: order.TokenAmount,
AmountCent: order.AmountCent,
PriceText: order.PriceText,
Currency: order.Currency,
PaymentMode: order.PaymentMode,
Grant: tokenGrantToPB(order.Grant),
CreatedAt: order.CreatedAt,
PaidAt: tokenStringFromPtr(order.PaidAt),
GrantedAt: tokenStringFromPtr(order.GrantedAt),
ProductSnapshot: order.ProductSnapshot,
ProductName: order.ProductName,
Quantity: int32(order.Quantity),
}
}
func tokenOrdersToPB(items []tokencontracts.TokenOrderView) []*pb.TokenOrderView {
if len(items) == 0 {
return nil
}
result := make([]*pb.TokenOrderView, 0, len(items))
for i := range items {
item := items[i]
result = append(result, tokenOrderToPB(&item))
}
return result
}
func tokenStringFromPtr(value *string) string {
if value == nil {
return ""
}
return *value
func legacyTokenMethodRemoved() error {
return status.Error(codes.Unimplemented, "legacy token API has been removed; use credit APIs instead")
}