xinyin025/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-11-14 05:03:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1、泛型化参数，预留泛型约束，方便以后代码扩展的类型安全校验

Browse Source 
2、升级goframe至v2.7.3
This commit is contained in:
apefuu
2024-09-19 19:33:00 +08:00
parent 2a87055b62
commit f18ce6384b
57 changed files with 221 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/internal/logic/middleware/admin_auth.go
View File

@@ -44,7 +44,7 @@ func (s *sMiddleware) AdminAuth(r *ghttp.Request) {
// 验证路由访问权限
if !service.AdminRole().Verify(ctx, path, r.Method) {
g.Log().Debugf(ctx, "AdminAuth fail path:%+v, GetRoleKey:%+v, r.Method:%+v", path, contexts.GetRoleKey(ctx), r.Method)
g.Log().Debugf(ctx, "AdminAuth fail path:%+v, GetRoleKey:%+v, r.Method:%+v", path, contexts.GetRoleKey[any](ctx), r.Method)
response.JsonExit(r, gcode.CodeSecurityReason.Code(), "你没有访问权限！")
return
}

10
server/internal/logic/middleware/init.go
View File

@@ -73,7 +73,7 @@ func (s *sMiddleware) Ctx(r *ghttp.Request) {
data["request.body"] = gjson.New(r.GetBodyString())
}
contexts.Init(r, &model.Context{
contexts.Init(r, &model.Context[any]{
Data: data,
Module: getModule(r.URL.Path),
})
@@ -129,13 +129,13 @@ func (s *sMiddleware) DemoLimit(r *ghttp.Request) {
func (s *sMiddleware) Addon(r *ghttp.Request) {
var ctx = r.Context()
if contexts.Get(ctx).Module == "" {
if contexts.Get[any](ctx).Module == "" {
g.Log().Warning(ctx, "application module is not initialized.")
return
}
// 替换掉应用模块前缀
path := gstr.Replace(r.URL.Path, "/"+contexts.Get(ctx).Module+"/", "", 1)
path := gstr.Replace(r.URL.Path, "/"+contexts.Get[any](ctx).Module+"/", "", 1)
ss := gstr.Explode("/", path)
if len(ss) == 0 {
g.Log().Warning(ctx, "addon was not recognized.")
@@ -154,7 +154,7 @@ func (s *sMiddleware) Addon(r *ghttp.Request) {
return
}
contexts.SetAddonName(ctx, sk.Name)
contexts.SetAddonName[any](ctx, sk.Name)
r.Middleware.Next()
}
@@ -171,7 +171,7 @@ func (s *sMiddleware) DeliverUserContext(r *ghttp.Request) (err error) {
return
}
default:
contexts.SetUser(r.Context(), user)
contexts.SetUser[any](r.Context(), user)
}
return
}