重构项目结构,将 orm 和 rds 包迁移到 web/globals
This commit is contained in:
22
web/web.go
22
web/web.go
@@ -9,9 +9,9 @@ import (
|
||||
"log/slog"
|
||||
"net/http"
|
||||
_ "net/http/pprof"
|
||||
"platform/pkg/orm"
|
||||
"platform/web/auth"
|
||||
g "platform/web/globals"
|
||||
"platform/web/globals/orm"
|
||||
m "platform/web/models"
|
||||
q "platform/web/queries"
|
||||
"runtime"
|
||||
@@ -45,12 +45,8 @@ func New(config *Config) (*Server, error) {
|
||||
func (s *Server) Run() error {
|
||||
|
||||
// inits
|
||||
g.InitBaiyin()
|
||||
g.InitAlipay()
|
||||
g.InitWechatPay()
|
||||
g.InitAliyun()
|
||||
g.InitValidator()
|
||||
q.SetDefault(orm.DB)
|
||||
g.Init()
|
||||
q.SetDefault(g.DB)
|
||||
|
||||
// config
|
||||
s.fiber = fiber.New(fiber.Config{
|
||||
@@ -86,7 +82,17 @@ func (s *Server) Run() error {
|
||||
}
|
||||
|
||||
func (s *Server) Stop() {
|
||||
err := s.fiber.Shutdown()
|
||||
err := g.ExitRedis()
|
||||
if err != nil {
|
||||
slog.Error("Failed to close Redis connection", slog.Any("err", err))
|
||||
}
|
||||
|
||||
err = g.ExitOrm()
|
||||
if err != nil {
|
||||
slog.Error("Failed to close database connection", slog.Any("err", err))
|
||||
}
|
||||
|
||||
err = s.fiber.Shutdown()
|
||||
if err != nil {
|
||||
slog.Error("Failed to shutdown server", slog.Any("err", err))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user