public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-10-03 22:07:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor🎨: 移除服务管理

Browse Source
This commit is contained in:
zhangwenjian
2021-06-30 01:52:47 +08:00
parent e2cb033670
commit 862f24d8a7
1 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/api/server.go
+36 -35
View File
@@ -4,7 +4,9 @@ import (
"context"
"fmt"
"log"
"net/http"
"os"
"os/signal"
"time"
"github.com/gin-gonic/gin"
@@ -14,8 +16,6 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/config"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/runtime"
"github.com/go-admin-team/go-admin-core/server"
"github.com/go-admin-team/go-admin-core/server/listener"
"github.com/spf13/cobra"
"go-admin/app/admin/models"
@@ -86,6 +86,11 @@ func run() error {
f()
}
srv := &http.Server{
Addr: fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
Handler: sdk.Runtime.GetEngine(),
}
go func() {
jobs.InitJob()
jobs.Setup(sdk.Runtime.GetDb())
@@ -111,26 +116,39 @@ func run() error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if !config.SslConfig.Enable {
config.SslConfig.Pem, config.SslConfig.KeyStr = "", ""
}
s := listener.New("go-admin",
listener.WithAddr(fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port)),
listener.WithHandler(sdk.Runtime.GetEngine()),
listener.WithStartedHook(startedHook),
listener.WithEndHook(endHook),
)
m := listener.NewMetrics()
h := listener.NewHealthz()
go func() {
// 服务连接
if config.SslConfig.Enable {
if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
log.Fatal("listen: ", err)
}
} else {
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Fatal("listen: ", err)
}
}
}()
fmt.Println(pkg.Red(string(global.LogoContent)))
tip()
fmt.Println(pkg.Green("Server run at:"))
fmt.Printf("- Local: http://localhost:%d/ \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/ \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Println(pkg.Green("Swagger run at:"))
fmt.Printf("- Local: http://localhost:%d/swagger/index.html \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/swagger/index.html \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Printf("%s Enter Control + C Shutdown Server \r\n", pkg.GetCurrentTimeStr())
// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
quit := make(chan os.Signal)
signal.Notify(quit, os.Interrupt)
<-quit
fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
mgr := server.New()
mgr.Add(m, h, s)
if err := mgr.Start(ctx); err != nil {
log.Fatal("listen: ", err)
if err := srv.Shutdown(ctx); err != nil {
log.Fatal("Server Shutdown:", err)
}
log.Println("Server exiting")
return nil
return nil
}
var Router runtime.Router
@@ -165,20 +183,3 @@ func initRouter() {
common.InitMiddleware(r)
}
func startedHook() {
time.Sleep(time.Millisecond)
fmt.Println(pkg.Red(string(global.LogoContent)))
tip()
fmt.Println(pkg.Green("Server run at:"))
fmt.Printf("- Local: http://localhost:%d/ \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/ \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Println(pkg.Green("Swagger run at:"))
fmt.Printf("- Local: http://localhost:%d/swagger/index.html \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/swagger/index.html \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Printf("%s Enter Control + C Shutdown Server \r\n", pkg.GetCurrentTimeStr())
}
func endHook() {
fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
}