update
This commit is contained in:
20
cmd/erp.go
20
cmd/erp.go
@@ -8,6 +8,7 @@ import (
|
||||
"time"
|
||||
|
||||
"management/internal/erpserver"
|
||||
"management/internal/erpserver/repository/seed"
|
||||
"management/internal/pkg/config"
|
||||
|
||||
"github.com/drhin/logger"
|
||||
@@ -50,11 +51,22 @@ func runErp() error {
|
||||
return err
|
||||
}
|
||||
|
||||
mux, fn, err := erpserver.NewWire(conf, l)
|
||||
app, fn, err := erpserver.NewWire(conf, l)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// database seed
|
||||
if err = seed.Init(
|
||||
app.ConfigRepo,
|
||||
app.DepartmentRepo,
|
||||
app.RoleRepo,
|
||||
app.UserRepo,
|
||||
app.MenuRepo,
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer fn()
|
||||
|
||||
address := fmt.Sprintf("%s:%d", conf.App.Host, conf.App.Port)
|
||||
@@ -63,19 +75,21 @@ func runErp() error {
|
||||
if runtime.GOOS == "windows" {
|
||||
s := &http.Server{
|
||||
Addr: address,
|
||||
Handler: mux,
|
||||
Handler: app.Router,
|
||||
ReadTimeout: 20 * time.Second,
|
||||
WriteTimeout: 20 * time.Second,
|
||||
MaxHeaderBytes: 1 << 20,
|
||||
}
|
||||
return s.ListenAndServe()
|
||||
} else {
|
||||
s := endless.NewServer(address, mux)
|
||||
s := endless.NewServer(address, app.Router)
|
||||
s.ReadHeaderTimeout = 20 * time.Second
|
||||
s.WriteTimeout = 20 * time.Second
|
||||
s.MaxHeaderBytes = 1 << 20
|
||||
return s.ListenAndServe()
|
||||
}
|
||||
|
||||
//return nil
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
||||
Reference in New Issue
Block a user