public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-20 17:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

config重构

Browse Source
This commit is contained in:
linwenxiang
2020-12-08 20:28:26 +08:00
parent 0810383afc
commit 5f873914e0
14 changed files with 134 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/api/server.go
+9 -8
View File
@@ -11,8 +11,6 @@ import (
"github.com/gin-gonic/gin"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go-admin/app/admin/router"
"go-admin/app/jobs"
"go-admin/common/database"
@@ -59,6 +57,7 @@ func setup() {
//1. 读取配置
config.Setup(configYml)
go config.Watch()
//2. 设置日志
global.Logger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "bus")
global.JobLogger.Logger = logger.SetupLogger(config.LoggerConfig.Path, "job")
@@ -74,7 +73,9 @@ func setup() {
}
func run() error {
if viper.GetString("settings.application.mode") == string(tools.ModeProd) {
defer config.Stop()
if config.ApplicationConfig.Mode == tools.ModeProd.String() {
gin.SetMode(gin.ReleaseMode)
}
engine := global.Cfg.GetEngine()
@@ -92,7 +93,7 @@ func run() error {
}
srv := &http.Server{
Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port,
Addr: fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
Handler: global.Cfg.GetEngine(),
}
go func() {
@@ -125,11 +126,11 @@ func run() error {
fmt.Println(tools.Red(string(global.LogoContent)))
tip()
fmt.Println(tools.Green("Server run at:"))
fmt.Printf("- Local: http://localhost:%s/ \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%s/ \r\n", tools.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Printf("- Local: http://localhost:%d/ \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/ \r\n", tools.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Println(tools.Green("Swagger run at:"))
fmt.Printf("- Local: http://localhost:%s/swagger/index.html \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%s/swagger/index.html \r\n", tools.GetLocaHonst(), config.ApplicationConfig.Port)
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", tools.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Printf("%s Enter Control + C Shutdown Server \r\n", tools.GetCurrentTimeStr())
// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
quit := make(chan os.Signal)