feat: complete template

This commit is contained in:
Rogee
2024-11-29 17:05:05 +08:00
parent aa7ad01ecc
commit 7bc082abea
36 changed files with 1336 additions and 252 deletions

View File

@@ -1,8 +0,0 @@
package http
type Route interface{}
type Service interface {
Serve() error
GetEngine() interface{}
}

View File

@@ -1,11 +1,11 @@
package fiber
package http
import (
"errors"
"fmt"
"runtime/debug"
"time"
"backend/providers/http"
"git.ipao.vip/rogeecn/atom/container"
"git.ipao.vip/rogeecn/atom/utils/opt"
log "github.com/sirupsen/logrus"
@@ -19,31 +19,17 @@ func DefaultProvider() container.ProviderContainer {
return container.ProviderContainer{
Provider: Provide,
Options: []opt.Option{
opt.Prefix(http.DefaultPrefix),
opt.Prefix(DefaultPrefix),
},
}
}
type Service struct {
conf *http.Config
conf *Config
Engine *fiber.App
}
func (e *Service) Use(middleware ...interface{}) fiber.Router {
return e.Engine.Use(middleware...)
}
func (e *Service) GetEngine() interface{} {
return e.Engine
}
func (e *Service) Close() {
if err := e.Engine.Shutdown(); err != nil {
log.Error("http server shutdown error: ", err)
}
}
func (e *Service) Serve() error {
func (svc *Service) Serve() error {
listenConfig := fiber.ListenConfig{
EnablePrintRoutes: true,
OnShutdownSuccess: func() {
@@ -52,32 +38,40 @@ func (e *Service) Serve() error {
OnShutdownError: func(err error) {
log.Error("http server shutdown error: ", err)
},
DisableStartupMessage: true,
// DisableStartupMessage: true,
}
if e.conf.Tls != nil {
if e.conf.Tls.Cert == "" || e.conf.Tls.Key == "" {
if svc.conf.Tls != nil {
if svc.conf.Tls.Cert == "" || svc.conf.Tls.Key == "" {
return errors.New("tls cert or key is empty")
}
listenConfig.CertFile = e.conf.Tls.Cert
listenConfig.CertKeyFile = e.conf.Tls.Key
listenConfig.CertFile = svc.conf.Tls.Cert
listenConfig.CertKeyFile = svc.conf.Tls.Key
}
container.AddCloseAble(func() {
svc.Engine.Shutdown()
})
return e.Engine.Listen(e.conf.PortString(), listenConfig)
return svc.Engine.Listen(svc.conf.PortString(), listenConfig)
}
func Provide(opts ...opt.Option) error {
o := opt.New(opts...)
var config http.Config
var config Config
if err := o.UnmarshalConfig(&config); err != nil {
return err
}
return container.Container.Provide(func(l *log.Logger) (http.Service, error) {
return container.Container.Provide(func() (*Service, error) {
engine := fiber.New(fiber.Config{
StrictRouting: true,
})
engine.Use(recover.New())
engine.Use(recover.New(recover.Config{
EnableStackTrace: true,
StackTraceHandler: func(c fiber.Ctx, e any) {
log.WithError(e.(error)).Error(fmt.Sprintf("panic: %v\n%s\n", e, debug.Stack()))
},
}))
if config.StaticRoute != nil && config.StaticPath != nil {
engine.Use(config.StaticRoute, config.StaticPath)
@@ -89,8 +83,6 @@ func Provide(opts ...opt.Option) error {
TimeZone: "Asia/Shanghai",
}))
svc := &Service{Engine: engine, conf: &config}
container.AddCloseAble(svc.Close)
return svc, nil
return &Service{Engine: engine, conf: &config}, nil
}, o.DiOptions()...)
}

View File

@@ -1,26 +0,0 @@
package swagger
import (
"git.ipao.vip/rogeecn/atom/container"
"git.ipao.vip/rogeecn/atom/utils/opt"
)
const DefaultPrefix = "Swagger"
type Config struct {
BaseRoute string
Version string
Host string
BasePath string
Title string
Description string
}
func DefaultProvider() container.ProviderContainer {
return container.ProviderContainer{
Provider: Provide,
Options: []opt.Option{
opt.Prefix(DefaultPrefix),
},
}
}

View File

@@ -1,83 +0,0 @@
package swagger
import (
"fmt"
"strings"
"backend/providers/http"
"git.ipao.vip/rogeecn/atom/container"
"git.ipao.vip/rogeecn/atom/utils/opt"
jsonpatch "github.com/evanphx/json-patch"
"github.com/gofiber/fiber/v2"
fiberSwagger "github.com/swaggo/fiber-swagger"
"github.com/swaggo/swag"
)
type Swagger struct {
config *Config
http http.Service
}
const infoTpl = `{"schemes": "__ marshal .Schemes __",
"swagger": "2.0",
"info": {
"description": "{{escape .Description}}",
"title": "{{.Title}}",
"contact": {},
"version": "{{.Version}}"
},
"host": "{{.Host}}",
"basePath": "{{.BasePath}}"}`
func (swagger *Swagger) Load(spec string) error {
original := []byte(spec)
target := []byte(infoTpl)
patch, err := jsonpatch.MergeMergePatches(original, target)
if err != nil {
return err
}
merged, err := jsonpatch.MergePatch(original, patch)
if err != nil {
return err
}
spec = strings.NewReplacer(`"__`, "{{", `__"`, "}}").Replace(string(merged))
swaggerInfo := &swag.Spec{
Version: swagger.config.Version,
Host: swagger.config.Host,
BasePath: swagger.config.BasePath,
Schemes: []string{},
Title: swagger.config.Title,
Description: swagger.config.Description,
InfoInstanceName: "swagger",
SwaggerTemplate: spec,
LeftDelim: "{{",
RightDelim: "}}",
}
swag.Register(swaggerInfo.InstanceName(), swaggerInfo)
engine := swagger.http.GetEngine().(*fiber.App)
engine.Get(fmt.Sprintf("/%s/*", swagger.config.BaseRoute), fiberSwagger.WrapHandler)
return nil
}
func Provide(opts ...opt.Option) error {
o := opt.New(opts...)
var config Config
if err := o.UnmarshalConfig(&config); err != nil {
return err
}
return container.Container.Provide(func(http http.Service) *Swagger {
if config.BaseRoute == "" {
config.BaseRoute = "swagger"
}
return &Swagger{
config: &config,
http: http,
}
}, o.DiOptions()...)
}