lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 13 Activity

重命名包为 core

Browse Source
This commit is contained in:
luorijun
2025-05-07 17:38:27 +08:00
parent 60bbe47368
commit 0a16f9923c
43 changed files with 349 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/handlers/resource.go
View File

@@ -3,7 +3,7 @@ package handlers
import (
"platform/pkg/u"
"platform/web/auth"
"platform/web/common"
"platform/web/core"
q "platform/web/queries"
s "platform/web/services"
"time"
@@ -14,7 +14,7 @@ import (
// region ListResourcePss
type ListResourcePssReq struct {
common.PageReq
core.PageReq
ResourceNo *string `json:"resource_no"`
Active *bool `json:"active"`
Type *int `json:"type"`
@@ -51,16 +51,16 @@ func ListResourcePss(c *fiber.Ctx) error {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Type.Eq(int32(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Resource.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
do.Where(q.Resource.CreatedAt.Gte(core.LocalDateTime(*req.CreateAfter)))
}
if req.CreateBefore != nil {
do.Where(q.Resource.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
do.Where(q.Resource.CreatedAt.Lte(core.LocalDateTime(*req.CreateBefore)))
}
if req.ExpireAfter != nil {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Gte(common.LocalDateTime(*req.ExpireAfter)))
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Gte(core.LocalDateTime(*req.ExpireAfter)))
}
if req.ExpireBefore != nil {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(common.LocalDateTime(*req.ExpireBefore)))
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(core.LocalDateTime(*req.ExpireBefore)))
}
resource, err := q.Resource.Where(do).
@@ -85,7 +85,7 @@ func ListResourcePss(c *fiber.Ctx) error {
}
}
return c.JSON(common.PageResp{
return c.JSON(core.PageResp{
Total: int(total),
Page: req.GetPage(),
Size: req.GetSize(),
@@ -116,13 +116,13 @@ func AllResource(c *fiber.Ctx) error {
q.Resource.Active.Is(true),
q.Resource.Where(
pss.Type.Eq(1),
pss.Expire.Gte(common.LocalDateTime(time.Now())),
pss.Expire.Gte(core.LocalDateTime(time.Now())),
).Or(
pss.Type.Eq(2),
pss.Quota.GtCol(pss.Used),
),
q.Resource.Where(
pss.DailyLast.Lt(common.LocalDateTime(u.Today())),
pss.DailyLast.Lt(core.LocalDateTime(u.Today())),
).Or(
pss.DailyUsed.LtCol(pss.DailyLimit),
),