fix 组件注册

This commit is contained in:
yxh 2023-03-29 17:10:26 +08:00
parent eb65fbcaa2
commit 07acd2edfc
4 changed files with 21 additions and 7 deletions

View File

@ -11,10 +11,12 @@ import (
"github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/text/gstr"
"github.com/tiger1103/gfast/v3/internal/consts" "github.com/tiger1103/gfast/v3/internal/consts"
"github.com/tiger1103/gfast/v3/internal/router" "github.com/tiger1103/gfast/v3/internal/router"
"github.com/tiger1103/gfast/v3/library/libValidate"
"github.com/tiger1103/gfast/v3/library/upload"
"github.com/tiger1103/gfast/v3/task"
) )
var ( var (
Main = gcmd.Command{ Main = gcmd.Command{
Name: "main", Name: "main",
Usage: "main", Usage: "main",
@ -27,9 +29,9 @@ var (
router.R.BindController(ctx, group) router.R.BindController(ctx, group)
}) })
//重新配置swaggerUI静态页面--start--,若要使用原版gf字段swaggerUI请删除或注释此段 //重新配置swaggerUI静态页面--start--,若要使用原版gf字段swaggerUI请删除或注释此段
s.BindHookHandler(g.Cfg().MustGet(ctx,"server.swaggerPath").String()+"/*", ghttp.HookBeforeServe, func(r *ghttp.Request) { s.BindHookHandler(g.Cfg().MustGet(ctx, "server.swaggerPath").String()+"/*", ghttp.HookBeforeServe, func(r *ghttp.Request) {
content := gstr.ReplaceByMap(consts.SwaggerUITemplate, map[string]string{ content := gstr.ReplaceByMap(consts.SwaggerUITemplate, map[string]string{
`{SwaggerUIDocUrl}`: g.Cfg().MustGet(ctx, "server.openapiPath").String(), `{SwaggerUIDocUrl}`: g.Cfg().MustGet(ctx, "server.openapiPath").String(),
`{SwaggerUIDocNamePlaceHolder}`: gstr.TrimRight(fmt.Sprintf(`//%s`, r.Host)), `{SwaggerUIDocNamePlaceHolder}`: gstr.TrimRight(fmt.Sprintf(`//%s`, r.Host)),
}) })
r.Response.Write(content) r.Response.Write(content)
@ -37,12 +39,24 @@ var (
}) })
//重新配置swaggerUI静态页面--end-- //重新配置swaggerUI静态页面--end--
enhanceOpenAPIDoc(s) enhanceOpenAPIDoc(s)
//注册相关组件
register()
s.Run() s.Run()
return nil return nil
}, },
} }
) )
// 相关组件注册
func register() {
//注册上传组件
upload.Register()
//注册自定义验证规则
libValidate.Register()
//执行计划任务
task.Run()
}
func enhanceOpenAPIDoc(s *ghttp.Server) { func enhanceOpenAPIDoc(s *ghttp.Server) {
openapi := s.GetOpenApi() openapi := s.GetOpenApi()
openapi.Config.CommonResponse = ghttp.DefaultHandlerResponse{} openapi.Config.CommonResponse = ghttp.DefaultHandlerResponse{}

View File

@ -1,4 +1,4 @@
package boot package libValidate
import ( import (
"context" "context"
@ -11,7 +11,7 @@ import (
"strings" "strings"
) )
func init() { func Register() {
gvalid.RegisterRule("integer-array", IntegerArray) gvalid.RegisterRule("integer-array", IntegerArray)
gvalid.RegisterRule("float-array", FloatArray) gvalid.RegisterRule("float-array", FloatArray)
gvalid.RegisterRule("date-array", DateArray) gvalid.RegisterRule("date-array", DateArray)

View File

@ -39,7 +39,7 @@ func GetUploader(key UploaderType) IUpload {
return nil return nil
} }
func init() { func Register() {
RegisterUploader(SourceLocal, &Local{}) RegisterUploader(SourceLocal, &Local{})
RegisterUploader(SourceTencent, &Tencent{}) RegisterUploader(SourceTencent, &Tencent{})

View File

@ -14,7 +14,7 @@ import (
"github.com/tiger1103/gfast/v3/internal/app/system/service" "github.com/tiger1103/gfast/v3/internal/app/system/service"
) )
func init() { func Run() {
task1 := &model.TimeTask{ task1 := &model.TimeTask{
FuncName: "test1", FuncName: "test1",
Run: Test1, Run: Test1,