后端:
1.阶段 6 CP4/CP5 目录收口与共享边界纯化
- 将 backend 根目录收口为 services、client、gateway、cmd、shared 五个一级目录
- 收拢 bootstrap、inits、infra/kafka、infra/outbox、conv、respond、pkg、middleware,移除根目录旧实现与空目录
- 将 utils 下沉到 services/userauth/internal/auth,将 logic 下沉到 services/schedule/core/planning
- 将迁移期 runtime 桥接实现统一收拢到 services/runtime/{conv,dao,eventsvc,model},删除 shared/legacy 与未再被 import 的旧 service 实现
- 将 gateway/shared/respond 收口为 HTTP/Gin 错误写回适配,shared/respond 仅保留共享错误语义与状态映射
- 将 HTTP IdempotencyMiddleware 与 RateLimitMiddleware 收口到 gateway/middleware
- 将 GormCachePlugin 下沉到 shared/infra/gormcache,将共享 RateLimiter 下沉到 shared/infra/ratelimit,将 agent token budget 下沉到 services/agent/shared
- 删除 InitEino 兼容壳,收缩 cmd/internal/coreinit 仅保留旧组合壳残留域初始化语义
- 更新微服务迁移计划与桌面 checklist,补齐 CP4/CP5 当前切流点、目录终态与验证结果
- 完成 go test ./...、git diff --check 与最终真实 smoke;health、register/login、task/create+get、schedule/today、task-class/list、memory/items、agent chat/meta/timeline/context-stats 全部 200,SSE 合并结果为 CP5_OK 且 [DONE] 只有 1 个
203 lines
5.9 KiB
Go
203 lines
5.9 KiB
Go
package schedule
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"strings"
|
|
"time"
|
|
|
|
schedulepb "github.com/LoveLosita/smartflow/backend/services/schedule/rpc/pb"
|
|
schedulecontracts "github.com/LoveLosita/smartflow/backend/shared/contracts/schedule"
|
|
"github.com/zeromicro/go-zero/zrpc"
|
|
)
|
|
|
|
const (
|
|
defaultEndpoint = "127.0.0.1:9084"
|
|
defaultTimeout = 6 * time.Second
|
|
)
|
|
|
|
type ClientConfig struct {
|
|
Endpoints []string
|
|
Target string
|
|
Timeout time.Duration
|
|
}
|
|
|
|
// Client 是 gateway 侧 schedule zrpc 的最小适配层。
|
|
//
|
|
// 职责边界:
|
|
// 1. 只负责跨进程 gRPC 调用和 JSON 透传,不碰 DAO、粗排算法或正式日程 apply 状态机;
|
|
// 2. HTTP 入参仍由 gateway/api 做基础绑定,业务校验交给 schedule 服务;
|
|
// 3. 复杂响应不在 gateway 重建模型,避免 DTO 复制扩散。
|
|
type Client struct {
|
|
rpc schedulepb.ScheduleClient
|
|
}
|
|
|
|
func NewClient(cfg ClientConfig) (*Client, error) {
|
|
timeout := cfg.Timeout
|
|
if timeout <= 0 {
|
|
timeout = defaultTimeout
|
|
}
|
|
endpoints := normalizeEndpoints(cfg.Endpoints)
|
|
target := strings.TrimSpace(cfg.Target)
|
|
if len(endpoints) == 0 && target == "" {
|
|
endpoints = []string{defaultEndpoint}
|
|
}
|
|
|
|
zclient, err := zrpc.NewClient(zrpc.RpcClientConf{
|
|
Endpoints: endpoints,
|
|
Target: target,
|
|
NonBlock: true,
|
|
Timeout: int64(timeout / time.Millisecond),
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
client := &Client{rpc: schedulepb.NewScheduleClient(zclient.Conn())}
|
|
if err := client.ping(timeout); err != nil {
|
|
return nil, err
|
|
}
|
|
return client, nil
|
|
}
|
|
|
|
func (c *Client) GetUserTodaySchedule(ctx context.Context, userID int) (json.RawMessage, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.GetToday(ctx, &schedulepb.UserRequest{UserId: int64(userID)})
|
|
return jsonFromResponse(resp, err)
|
|
}
|
|
|
|
func (c *Client) GetUserWeeklySchedule(ctx context.Context, userID int, week int) (json.RawMessage, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.GetWeek(ctx, &schedulepb.WeekRequest{UserId: int64(userID), Week: int64(week)})
|
|
return jsonFromResponse(resp, err)
|
|
}
|
|
|
|
func (c *Client) DeleteScheduleEvent(ctx context.Context, req schedulecontracts.DeleteScheduleEventsRequest) error {
|
|
if err := c.ensureReady(); err != nil {
|
|
return err
|
|
}
|
|
eventsJSON, err := json.Marshal(req.Events)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = c.rpc.DeleteEvents(ctx, &schedulepb.DeleteEventsRequest{
|
|
UserId: int64(req.UserID),
|
|
EventsJson: eventsJSON,
|
|
})
|
|
return responseFromRPCError(err)
|
|
}
|
|
|
|
func (c *Client) GetUserRecentCompletedSchedules(ctx context.Context, req schedulecontracts.RecentCompletedRequest) (json.RawMessage, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.GetRecentCompleted(ctx, &schedulepb.RecentCompletedRequest{
|
|
UserId: int64(req.UserID),
|
|
Index: int64(req.Index),
|
|
Limit: int64(req.Limit),
|
|
})
|
|
return jsonFromResponse(resp, err)
|
|
}
|
|
|
|
func (c *Client) GetUserOngoingSchedule(ctx context.Context, userID int) (json.RawMessage, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.GetCurrent(ctx, &schedulepb.UserRequest{UserId: int64(userID)})
|
|
return jsonFromResponse(resp, err)
|
|
}
|
|
|
|
func (c *Client) RevokeTaskItemFromSchedule(ctx context.Context, req schedulecontracts.RevokeTaskItemRequest) error {
|
|
if err := c.ensureReady(); err != nil {
|
|
return err
|
|
}
|
|
_, err := c.rpc.RevokeTaskItem(ctx, &schedulepb.RevokeTaskItemRequest{
|
|
UserId: int64(req.UserID),
|
|
EventId: int64(req.EventID),
|
|
})
|
|
return responseFromRPCError(err)
|
|
}
|
|
|
|
func (c *Client) SmartPlanning(ctx context.Context, req schedulecontracts.SmartPlanningRequest) (json.RawMessage, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.SmartPlanning(ctx, &schedulepb.SmartPlanningRequest{
|
|
UserId: int64(req.UserID),
|
|
TaskClassId: int64(req.TaskClassID),
|
|
})
|
|
return jsonFromResponse(resp, err)
|
|
}
|
|
|
|
func (c *Client) SmartPlanningMulti(ctx context.Context, req schedulecontracts.SmartPlanningMultiRequest) (json.RawMessage, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
taskClassIDs := make([]int64, 0, len(req.TaskClassIDs))
|
|
for _, id := range req.TaskClassIDs {
|
|
taskClassIDs = append(taskClassIDs, int64(id))
|
|
}
|
|
resp, err := c.rpc.SmartPlanningMulti(ctx, &schedulepb.SmartPlanningMultiRequest{
|
|
UserId: int64(req.UserID),
|
|
TaskClassIds: taskClassIDs,
|
|
})
|
|
return jsonFromResponse(resp, err)
|
|
}
|
|
|
|
func (c *Client) GetAgentWeekSchedule(ctx context.Context, req schedulecontracts.AgentScheduleWeekRequest) (json.RawMessage, error) {
|
|
if err := c.ensureReady(); err != nil {
|
|
return nil, err
|
|
}
|
|
payload, err := json.Marshal(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := c.rpc.GetAgentWeekSchedule(ctx, &schedulepb.JSONRequest{PayloadJson: payload})
|
|
return jsonFromResponse(resp, err)
|
|
}
|
|
|
|
func (c *Client) ensureReady() error {
|
|
if c == nil || c.rpc == nil {
|
|
return errors.New("schedule zrpc client is not initialized")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (c *Client) ping(timeout time.Duration) error {
|
|
if err := c.ensureReady(); err != nil {
|
|
return err
|
|
}
|
|
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
|
defer cancel()
|
|
_, err := c.rpc.Ping(ctx, &schedulepb.StatusResponse{})
|
|
return responseFromRPCError(err)
|
|
}
|
|
|
|
func jsonFromResponse(resp *schedulepb.JSONResponse, rpcErr error) (json.RawMessage, error) {
|
|
if rpcErr != nil {
|
|
return nil, responseFromRPCError(rpcErr)
|
|
}
|
|
if resp == nil {
|
|
return nil, errors.New("schedule zrpc service returned empty JSON response")
|
|
}
|
|
if len(resp.DataJson) == 0 {
|
|
return json.RawMessage("null"), nil
|
|
}
|
|
return json.RawMessage(resp.DataJson), nil
|
|
}
|
|
|
|
func normalizeEndpoints(values []string) []string {
|
|
endpoints := make([]string, 0, len(values))
|
|
for _, value := range values {
|
|
trimmed := strings.TrimSpace(value)
|
|
if trimmed != "" {
|
|
endpoints = append(endpoints, trimmed)
|
|
}
|
|
}
|
|
return endpoints
|
|
}
|