feat: update framework
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package fiber
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"backend/providers/http"
|
||||
@@ -9,9 +10,9 @@ import (
|
||||
"git.ipao.vip/rogeecn/atom/utils/opt"
|
||||
log "github.com/sirupsen/logrus"
|
||||
|
||||
"github.com/gofiber/fiber/v2"
|
||||
"github.com/gofiber/fiber/v2/middleware/logger"
|
||||
"github.com/gofiber/fiber/v2/middleware/recover"
|
||||
"github.com/gofiber/fiber/v3"
|
||||
"github.com/gofiber/fiber/v3/middleware/logger"
|
||||
"github.com/gofiber/fiber/v3/middleware/recover"
|
||||
)
|
||||
|
||||
func DefaultProvider() container.ProviderContainer {
|
||||
@@ -37,14 +38,32 @@ func (e *Service) GetEngine() interface{} {
|
||||
}
|
||||
|
||||
func (e *Service) Close() {
|
||||
e.Engine.Shutdown()
|
||||
if err := e.Engine.Shutdown(); err != nil {
|
||||
log.Error("http server shutdown error: ", err)
|
||||
}
|
||||
}
|
||||
|
||||
func (e *Service) Serve() error {
|
||||
if e.conf.Tls != nil {
|
||||
return e.Engine.ListenTLS(e.conf.PortString(), e.conf.Tls.Cert, e.conf.Tls.Key)
|
||||
listenConfig := fiber.ListenConfig{
|
||||
EnablePrintRoutes: true,
|
||||
OnShutdownSuccess: func() {
|
||||
log.Info("http server shutdown success")
|
||||
},
|
||||
OnShutdownError: func(err error) {
|
||||
log.Error("http server shutdown error: ", err)
|
||||
},
|
||||
DisableStartupMessage: true,
|
||||
}
|
||||
return e.Engine.Listen(e.conf.PortString())
|
||||
|
||||
if e.conf.Tls != nil {
|
||||
if e.conf.Tls.Cert == "" || e.conf.Tls.Key == "" {
|
||||
return errors.New("tls cert or key is empty")
|
||||
}
|
||||
listenConfig.CertFile = e.conf.Tls.Cert
|
||||
listenConfig.CertKeyFile = e.conf.Tls.Key
|
||||
}
|
||||
|
||||
return e.Engine.Listen(e.conf.PortString(), listenConfig)
|
||||
}
|
||||
|
||||
func Provide(opts ...opt.Option) error {
|
||||
@@ -56,8 +75,7 @@ func Provide(opts ...opt.Option) error {
|
||||
|
||||
return container.Container.Provide(func(l *log.Logger) (http.Service, error) {
|
||||
engine := fiber.New(fiber.Config{
|
||||
EnablePrintRoutes: true,
|
||||
StrictRouting: true,
|
||||
StrictRouting: true,
|
||||
})
|
||||
engine.Use(recover.New())
|
||||
|
||||
|
||||
Reference in New Issue
Block a user