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

重构迁移核心数据结构到认证模块；完善中间件初始化逻辑以及 logger 记录过程

Browse Source
This commit is contained in:
luorijun
2025-05-08 13:18:54 +08:00
parent c93d0bf467
commit e2cc318560
24 changed files with 353 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/handlers/announcement.go
View File

@@ -5,7 +5,6 @@ import (
"platform/web/auth"
"platform/web/core"
q "platform/web/queries"
"platform/web/services"
)
// region ListAnnouncements
@@ -17,7 +16,7 @@ type ListAnnouncementsRequest struct {
func ListAnnouncements(c *fiber.Ctx) error {
// 检查权限
_, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}

16
web/handlers/auth.go
View File

@@ -136,7 +136,7 @@ func Token(c *fiber.Ctx) error {
token, err := s.Auth.OauthPassword(c.Context(), client, &req.GrantPasswordData, c.IP(), c.Get("User-Agent"))
if err != nil {
return err
return sendError(c, err)
}
return sendSuccess(c, token)
@@ -211,6 +211,16 @@ func protect(c *fiber.Ctx, grant s.OauthGrantType, clientId, clientSecret string
}
}
// 保存 auth 信息到上下文（以兼容通用 auth 处理逻辑）
auth.Locals(c, &auth.Context{
Payload: auth.Payload{
Id: client.ID,
Type: auth.PayloadClientConfidential,
Name: client.Name,
Avatar: client.Icon,
},
})
return client, nil
}
@@ -268,7 +278,7 @@ type RevokeReq struct {
}
func Revoke(c *fiber.Ctx) error {
_, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
// 用户未登录
return nil
@@ -299,7 +309,7 @@ type IntrospectResp struct {
func Introspect(c *fiber.Ctx) error {
// 验证权限
authCtx, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authCtx, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}

3
web/handlers/bill.go
View File

@@ -4,7 +4,6 @@ import (
"platform/web/auth"
"platform/web/core"
q "platform/web/queries"
"platform/web/services"
"time"
"github.com/gofiber/fiber/v2"
@@ -23,7 +22,7 @@ type ListBillReq struct {
// ListBill 获取账单列表
func ListBill(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}

10
web/handlers/channel.go
View File

@@ -22,7 +22,7 @@ type ListChannelsReq struct {
func ListChannels(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -99,7 +99,7 @@ type CreateChannelReq struct {
func CreateChannel(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -172,9 +172,9 @@ type RemoveChannelsReq struct {
func RemoveChannels(c *fiber.Ctx) error {
// 检查权限
authCtx, err := auth.Protect(c, []s.PayloadType{
s.PayloadUser,
s.PayloadClientConfidential,
authCtx, err := auth.Protect(c, []auth.PayloadType{
auth.PayloadUser,
auth.PayloadClientConfidential,
}, []string{})
if err != nil {
return err

2
web/handlers/iden.go
View File

@@ -36,7 +36,7 @@ type IdentifyRes struct {
func Identify(c *fiber.Ctx) error {
// 检查权限
authCtx, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
authCtx, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}

14
web/handlers/resource.go
View File

@@ -27,7 +27,7 @@ type ListResourcePssReq struct {
// ListResourcePss 获取套餐列表
func ListResourcePss(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -102,7 +102,7 @@ type AllResourceReq struct {
func AllResource(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -158,7 +158,7 @@ type PaidCreateResourceReq struct {
func PrepareResourceByAlipay(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -190,7 +190,7 @@ func PrepareResourceByAlipay(c *fiber.Ctx) error {
func PrepareResourceByWechat(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -221,7 +221,7 @@ func PrepareResourceByWechat(c *fiber.Ctx) error {
func CreateResourceByAlipay(c *fiber.Ctx) error {
// 检查权限
_, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -252,7 +252,7 @@ func CreateResourceByAlipay(c *fiber.Ctx) error {
func CreateResourceByWechat(c *fiber.Ctx) error {
// 检查权限
_, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -284,7 +284,7 @@ func CreateResourceByWechat(c *fiber.Ctx) error {
func CreateResourceByBalance(c *fiber.Ctx) error {
// 检查权限
authCtx, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authCtx, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}

14
web/handlers/user.go
View File

@@ -24,7 +24,7 @@ type UpdateUserReq struct {
func UpdateUser(c *fiber.Ctx) error {
// 检查权限
authCtx, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authCtx, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -63,7 +63,7 @@ type UpdateAccountReq struct {
func UpdateAccount(c *fiber.Ctx) error {
// 检查权限
authCtx, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authCtx, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -101,7 +101,7 @@ type UpdatePasswordReq struct {
func UpdatePassword(c *fiber.Ctx) error {
// 检查权限
authCtx, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authCtx, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -162,7 +162,7 @@ type RechargeConfirmResp struct {
// RechargePrepareAlipay 通过支付宝充值
func RechargePrepareAlipay(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -198,7 +198,7 @@ func RechargePrepareAlipay(c *fiber.Ctx) error {
func RechargeConfirmAlipay(c *fiber.Ctx) error {
// 检查权限
_, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -229,7 +229,7 @@ func RechargeConfirmAlipay(c *fiber.Ctx) error {
func RechargePrepareWechat(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -265,7 +265,7 @@ func RechargePrepareWechat(c *fiber.Ctx) error {
func RechargeConfirmWechat(c *fiber.Ctx) error {
// 检查权限
_, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}

4
web/handlers/verifier.go
View File

@@ -17,8 +17,8 @@ type VerifierReq struct {
func SmsCode(c *fiber.Ctx) error {
_, err := auth.Protect(c, []services.PayloadType{
services.PayloadClientConfidential,
_, err := auth.Protect(c, []auth.PayloadType{
auth.PayloadClientConfidential,
}, []string{})
if err != nil {
return err

9
web/handlers/whitelist.go
View File

@@ -7,7 +7,6 @@ import (
g "platform/web/globals"
m "platform/web/models"
q "platform/web/queries"
"platform/web/services"
"time"
"github.com/gofiber/fiber/v2"
@@ -27,7 +26,7 @@ type ListWhitelistResp struct {
func ListWhitelist(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -78,7 +77,7 @@ type CreateWhitelistReq struct {
func CreateWhitelist(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -112,7 +111,7 @@ type UpdateWhitelistReq struct {
func UpdateWhitelist(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
@@ -150,7 +149,7 @@ type RemoveWhitelistReq struct {
func RemoveWhitelist(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}