后端: 1. 登录注册补齐极验行为验证与跨域入口:gateway 新增 `/user/captcha/register`,登录/注册先做 GeeTest 初始化与二次校验,再进入 user/auth RPC;补充验证码失败/初始化失败/服务不可用响应码,并新增可配置 CORS middleware 适配分域部署。 2. 容器部署配置入口收口:`bootstrap.LoadConfig` 支持 `SMARTFLOW_CONFIG_FILE` 与环境变量覆盖,`config.example.yaml` / `config.docker.yaml` 补齐 geetest 与容器内服务地址,网关新增配置列表解析,便于 compose 场景直接挂载配置启动。 3. LLM outbox 与助手时间线稳定性修正:`cmd/llm` 显式绑定 llm 自身 topic/group,避免误入 agent consumer group;agent timeline 在 Redis 热缓存未落 MySQL 时改用 `seq` 兜底临时 id,避免前端历史回放撞 key。 前端: 4. 认证页接入极验并补齐提交前校验:新增 GeeTest 脚本加载与实例封装,登录/注册面板支持 challenge 初始化、切换面板重挂载、失败提示与提交前校验,认证 API/types 同步透传 geetest 三元组。 5. 前端部署基址与网关对接收口:Axios `baseURL`、Vue Router `history base` 与 Vite `base/dev proxy` 改为读取环境变量,新增 `frontend/.env.example`,支持子路径部署、容器内反向代理和本地联调共存。 6. 助手与工作台展示细节修正:AssistantPanel 历史重建优先使用真实 timeline id、缺失时退回 `seq` 保证消息主键唯一;首页主面板改为纵向可滚动并补底部留白,避免内容截断。 仓库: 7. 整站容器化交付链路补齐并重写说明文档:新增后端/前端 Dockerfile、`.dockerignore`、前端 Nginx 代理、`docker-compose.full.yml`、`.env.full.example` 与镜像打包/导入脚本,README 改写数据库/路由/部署章节,并新增 `docs/容器化部署说明.md` 说明离线镜像分发方案。
163 lines
5.1 KiB
Go
163 lines
5.1 KiB
Go
package main
|
||
|
||
import (
|
||
"context"
|
||
"log"
|
||
"os"
|
||
"os/signal"
|
||
"sync"
|
||
"syscall"
|
||
|
||
tokenstoreclient "github.com/LoveLosita/smartflow/backend/client/tokenstore"
|
||
llmservice "github.com/LoveLosita/smartflow/backend/services/llm"
|
||
llmdao "github.com/LoveLosita/smartflow/backend/services/llm/dao"
|
||
llmrpc "github.com/LoveLosita/smartflow/backend/services/llm/rpc"
|
||
creditcontracts "github.com/LoveLosita/smartflow/backend/shared/contracts/creditstore"
|
||
"github.com/LoveLosita/smartflow/backend/shared/infra/bootstrap"
|
||
einoinfra "github.com/LoveLosita/smartflow/backend/shared/infra/eino"
|
||
kafkabus "github.com/LoveLosita/smartflow/backend/shared/infra/kafka"
|
||
outboxinfra "github.com/LoveLosita/smartflow/backend/shared/infra/outbox"
|
||
redisinfra "github.com/LoveLosita/smartflow/backend/shared/infra/redis"
|
||
"github.com/spf13/viper"
|
||
)
|
||
|
||
func main() {
|
||
if err := bootstrap.LoadConfig(); err != nil {
|
||
log.Fatalf("failed to load config: %v", err)
|
||
}
|
||
|
||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||
defer stop()
|
||
|
||
db, err := llmdao.OpenDBFromConfig()
|
||
if err != nil {
|
||
log.Fatalf("failed to connect llm database: %v", err)
|
||
}
|
||
|
||
redisClient, err := redisinfra.OpenRedisFromConfig()
|
||
if err != nil {
|
||
log.Fatalf("failed to connect llm redis: %v", err)
|
||
}
|
||
defer redisClient.Close()
|
||
|
||
aiHub, err := einoinfra.InitEino()
|
||
if err != nil {
|
||
log.Fatalf("failed to initialize llm Eino runtime: %v", err)
|
||
}
|
||
|
||
legacyService := llmservice.New(llmservice.Options{
|
||
AIHub: aiHub,
|
||
APIKey: os.Getenv("ARK_API_KEY"),
|
||
BaseURL: viper.GetString("agent.baseURL"),
|
||
CourseVisionModel: viper.GetString("courseImport.visionModel"),
|
||
})
|
||
|
||
balanceSnapshotProvider := &tokenStoreSnapshotProvider{
|
||
cfg: tokenstoreclient.ClientConfig{
|
||
Endpoints: viper.GetStringSlice("tokenstore.rpc.endpoints"),
|
||
Target: viper.GetString("tokenstore.rpc.target"),
|
||
Timeout: viper.GetDuration("tokenstore.rpc.timeout"),
|
||
},
|
||
}
|
||
|
||
outboxRepo := outboxinfra.NewRepository(db)
|
||
priceRuleDAO := llmdao.NewPriceRuleDAO(db)
|
||
dispatchEngine, err := buildLLMOutboxDispatchEngine(outboxRepo)
|
||
if err != nil {
|
||
log.Fatalf("failed to initialize llm outbox dispatch engine: %v", err)
|
||
}
|
||
if dispatchEngine != nil {
|
||
dispatchEngine.StartDispatch(ctx)
|
||
defer dispatchEngine.Close()
|
||
log.Println("llm outbox dispatch started")
|
||
} else {
|
||
log.Println("llm outbox dispatch is disabled")
|
||
}
|
||
|
||
runtimeService, err := llmservice.NewRuntimeService(llmservice.RuntimeServiceOptions{
|
||
LegacyService: legacyService,
|
||
CacheDAO: llmdao.NewCacheDAO(redisClient),
|
||
PriceRuleDAO: priceRuleDAO,
|
||
SnapshotProvider: balanceSnapshotProvider,
|
||
OutboxRepo: outboxRepo,
|
||
OutboxMaxRetry: kafkabus.LoadConfig().MaxRetry,
|
||
ProviderName: viper.GetString("llm.providerName"),
|
||
LiteModelName: viper.GetString("agent.liteModel"),
|
||
ProModelName: viper.GetString("agent.proModel"),
|
||
MaxModelName: viper.GetString("agent.maxModel"),
|
||
CourseVisionModel: viper.GetString("courseImport.visionModel"),
|
||
})
|
||
if err != nil {
|
||
log.Fatalf("failed to initialize llm runtime service: %v", err)
|
||
}
|
||
|
||
server, listenOn, err := llmrpc.NewServer(llmrpc.ServerOptions{
|
||
ListenOn: viper.GetString("llm.rpc.listenOn"),
|
||
Timeout: viper.GetDuration("llm.rpc.timeout"),
|
||
Service: runtimeService,
|
||
})
|
||
if err != nil {
|
||
log.Fatalf("failed to build llm zrpc server: %v", err)
|
||
}
|
||
defer server.Stop()
|
||
|
||
go func() {
|
||
log.Printf("llm zrpc service starting on %s", listenOn)
|
||
server.Start()
|
||
}()
|
||
|
||
<-ctx.Done()
|
||
log.Println("llm service stopping")
|
||
}
|
||
|
||
func buildLLMOutboxDispatchEngine(outboxRepo *outboxinfra.Repository) (*outboxinfra.Engine, error) {
|
||
kafkaCfg := kafkabus.LoadConfig()
|
||
if !kafkaCfg.Enabled || outboxRepo == nil {
|
||
return nil, nil
|
||
}
|
||
|
||
// 1. LLM 进程这里只启动“LLM 自己 outbox 的 dispatch”,不应复用 kafka.LoadConfig() 里的全局默认 topic/group。
|
||
// 2. 全局默认值当前仍兼容指向 agent outbox;若只改 ServiceName 不同步改 Topic/GroupID,llm.exe 会误入 agent consumer group。
|
||
// 3. 因此这里显式绑定 llm 服务目录,确保 dispatch engine 只触达 llm_outbox_messages / smartflow.llm.outbox。
|
||
route, _ := outboxinfra.ResolveServiceRoute(outboxinfra.ServiceLLM)
|
||
kafkaCfg.ServiceName = route.ServiceName
|
||
kafkaCfg.Topic = route.Topic
|
||
kafkaCfg.GroupID = route.GroupID
|
||
return outboxinfra.NewEngine(outboxRepo.WithRoute(route), kafkaCfg)
|
||
}
|
||
|
||
type tokenStoreSnapshotProvider struct {
|
||
cfg tokenstoreclient.ClientConfig
|
||
|
||
mu sync.Mutex
|
||
client *tokenstoreclient.Client
|
||
}
|
||
|
||
func (p *tokenStoreSnapshotProvider) GetCreditBalanceSnapshot(ctx context.Context, userID uint64) (*creditcontracts.CreditBalanceSnapshot, error) {
|
||
client, err := p.ensureClient()
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
return client.GetCreditBalanceSnapshot(ctx, userID)
|
||
}
|
||
|
||
func (p *tokenStoreSnapshotProvider) ensureClient() (*tokenstoreclient.Client, error) {
|
||
if p == nil {
|
||
return nil, nil
|
||
}
|
||
|
||
p.mu.Lock()
|
||
defer p.mu.Unlock()
|
||
|
||
if p.client != nil {
|
||
return p.client, nil
|
||
}
|
||
|
||
client, err := tokenstoreclient.NewClient(p.cfg)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
p.client = client
|
||
return p.client, nil
|
||
}
|