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

6
web/handlers/announcement.go
View File

@@ -3,7 +3,7 @@ package handlers
import (
"github.com/gofiber/fiber/v2"
"platform/web/auth"
"platform/web/common"
"platform/web/core"
q "platform/web/queries"
"platform/web/services"
)
@@ -11,7 +11,7 @@ import (
// region ListAnnouncements
type ListAnnouncementsRequest struct {
common.PageReq
core.PageReq
}
func ListAnnouncements(c *fiber.Ctx) error {
@@ -53,7 +53,7 @@ func ListAnnouncements(c *fiber.Ctx) error {
}
// 返回结果
return c.JSON(common.PageResp{
return c.JSON(core.PageResp{
Total: int(total),
List: list,
Page: req.GetPage(),

10
web/handlers/bill.go
View File

@@ -2,7 +2,7 @@ package handlers
import (
"platform/web/auth"
"platform/web/common"
"platform/web/core"
q "platform/web/queries"
"platform/web/services"
"time"
@@ -13,7 +13,7 @@ import (
// region ListBill
type ListBillReq struct {
common.PageReq
core.PageReq
BillNo *string `json:"bill_no"`
Type *int `json:"type"`
CreateAfter *time.Time `json:"create_after"`
@@ -42,10 +42,10 @@ func ListBill(c *fiber.Ctx) error {
do.Where(q.Bill.Type.Eq(int32(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Bill.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
do.Where(q.Bill.CreatedAt.Gte(core.LocalDateTime(*req.CreateAfter)))
}
if req.CreateBefore != nil {
do.Where(q.Bill.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
do.Where(q.Bill.CreatedAt.Lte(core.LocalDateTime(*req.CreateBefore)))
}
if req.BillNo != nil && *req.BillNo != "" {
do.Where(q.Bill.BillNo.Eq(*req.BillNo))
@@ -72,7 +72,7 @@ func ListBill(c *fiber.Ctx) error {
}
}
return c.JSON(common.PageResp{
return c.JSON(core.PageResp{
Total: int(total),
Page: req.GetPage(),
Size: req.GetSize(),

10
web/handlers/channel.go
View File

@@ -3,7 +3,7 @@ package handlers
import (
"fmt"
"platform/web/auth"
"platform/web/common"
"platform/web/core"
q "platform/web/queries"
s "platform/web/services"
"time"
@@ -14,7 +14,7 @@ import (
// region ListChannels
type ListChannelsReq struct {
common.PageReq
core.PageReq
AuthType s.ChannelAuthType `json:"auth_type"`
ExpireAfter *time.Time `json:"expire_after"`
ExpireBefore *time.Time `json:"expire_before"`
@@ -46,10 +46,10 @@ func ListChannels(c *fiber.Ctx) error {
}
if req.ExpireAfter != nil {
cond.Where(q.Channel.Expiration.Gte(common.LocalDateTime(*req.ExpireAfter)))
cond.Where(q.Channel.Expiration.Gte(core.LocalDateTime(*req.ExpireAfter)))
}
if req.ExpireBefore != nil {
cond.Where(q.Channel.Expiration.Lte(common.LocalDateTime(*req.ExpireBefore)))
cond.Where(q.Channel.Expiration.Lte(core.LocalDateTime(*req.ExpireBefore)))
}
// 查询数据
@@ -75,7 +75,7 @@ func ListChannels(c *fiber.Ctx) error {
}
// 返回结果
return c.JSON(common.PageResp{
return c.JSON(core.PageResp{
Total: int(total),
Page: req.GetPage(),
Size: req.GetSize(),

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),
),

4
web/handlers/user.go
View File

@@ -2,7 +2,7 @@ package handlers
import (
"platform/web/auth"
"platform/web/common"
"platform/web/core"
m "platform/web/models"
q "platform/web/queries"
s "platform/web/services"
@@ -114,7 +114,7 @@ func UpdatePassword(c *fiber.Ctx) error {
// 验证手机令牌
if req.Phone == "" || req.Code == "" {
return common.NewErr("user", "手机号码和验证码不能为空")
return core.NewErr("user", "手机号码和验证码不能为空")
}
err = s.Verifier.VerifySms(c.Context(), req.Phone, req.Code)
if err != nil {

6
web/handlers/whitelist.go
View File

@@ -3,7 +3,7 @@ package handlers
import (
"net"
"platform/web/auth"
"platform/web/common"
"platform/web/core"
g "platform/web/globals"
m "platform/web/models"
q "platform/web/queries"
@@ -14,7 +14,7 @@ import (
)
type ListWhitelistReq struct {
common.PageReq
core.PageReq
}
type ListWhitelistResp struct {
@@ -62,7 +62,7 @@ func ListWhitelist(c *fiber.Ctx) error {
}
// 返回结果
return c.JSON(common.PageResp{
return c.JSON(core.PageResp{
Total: int(total),
List: list,
Page: req.GetPage(),