添加 otel 相关环境变量,优化部署配置
Some checks failed
Docker / build (push) Has been cancelled

This commit is contained in:
2025-12-19 15:13:46 +08:00
parent 2b190bd4e5
commit c8fd4cf9ca
5 changed files with 27 additions and 24 deletions

View File

@@ -353,21 +353,10 @@ func StatisticResourceUsage(c *fiber.Ctx) error {
}
// 统计套餐提取数量
do := q.LogsUserUsage.Where(q.LogsUserUsage.UserID.Eq(authCtx.User.ID))
if req.ResourceNo != nil && *req.ResourceNo != "" {
var resourceID int32
err := q.Resource.
Where(
q.Resource.UserID.Eq(authCtx.User.ID),
q.Resource.ResourceNo.Eq(*req.ResourceNo),
).
Select(q.Resource.ID).
Scan(&resourceID)
if err != nil {
return err
}
do.Where(q.LogsUserUsage.ResourceID.Eq(resourceID))
}
do := q.LogsUserUsage.Where(
q.LogsUserUsage.UserID.Eq(authCtx.User.ID),
)
if req.TimeAfter != nil {
do.Where(q.LogsUserUsage.Time.Gte(*req.TimeAfter))
}
@@ -383,7 +372,7 @@ func StatisticResourceUsage(c *fiber.Ctx) error {
).
Where(do).
Group(
field.NewUnsafeFieldRaw("date_trunc('day', time)"),
field.NewField("", "date"),
).
Order(
field.NewField("", "date").Desc(),
@@ -397,9 +386,8 @@ func StatisticResourceUsage(c *fiber.Ctx) error {
}
type StatisticResourceUsageReq struct {
ResourceNo *string `json:"resource_no"`
TimeAfter *time.Time `json:"time_after"`
TimeBefore *time.Time `json:"time_before"`
TimeAfter *time.Time `json:"time_start"`
TimeBefore *time.Time `json:"time_end"`
}
type StatisticResourceUsageResp []struct {