Merge branch 'dev' of https://github.com/go-admin-team/go-admin into go-admin-team-dev

This commit is contained in:
zhangwenjian committed 2020-10-27 11:39:49 +08:00
commit 2195c89099
31 files changed
+129 -796

No files matched your search

+8 -7
View File
@@ -17,6 +17,7 @@ import (
"go-admin/app/jobs"
"go-admin/common/database"
"go-admin/common/global"
"go-admin/common/log"
mycasbin "go-admin/pkg/casbin"
"go-admin/pkg/logger"
"go-admin/tools"
@@ -57,14 +58,14 @@ func setup() {
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
global.Logger, global.JobLogger, global.RequestLogger = logger.Setup()
//3. 初始化数据库链接
database.Setup(config.DatabaseConfig.Driver)
//4. 接口访问控制加载
mycasbin.Setup()
global.CasbinEnforcer = mycasbin.Setup(global.Eloquent, "sys_")
usageStr := `starting api server`
global.Logger.Info(usageStr)
log.Info(usageStr)
}
@@ -100,11 +101,11 @@ func run() error {
// 服务连接
if config.SslConfig.Enable {
if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
global.Logger.Fatal("listen: ", err)
log.Fatal("listen: ", err)
}
} else {
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
global.Logger.Fatal("listen: ", err)
log.Fatal("listen: ", err)
}
}
}()
@@ -127,9 +128,9 @@ func run() error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if err := srv.Shutdown(ctx); err != nil {
global.Logger.Fatal("Server Shutdown:", err)
log.Fatal("Server Shutdown:", err)
}
global.Logger.Println("Server exiting")
log.Info("Server exiting")
return nil
}
@@ -1,9 +1,9 @@
package version
import (
"go-admin/app/admin/models/system"
"runtime"
"go-admin/app/admin/models/system"
"gorm.io/gorm"
"go-admin/app/admin/models"
@@ -1,13 +1,13 @@
package version
import (
"go-admin/app/admin/models/system"
"runtime"
"time"
"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/app/admin/models/system"
"go-admin/cmd/migrate/migration"
common "go-admin/common/models"
)
@@ -1,11 +1,12 @@
package version
import (
"go-admin/app/admin/models"
"go-admin/app/admin/models/system"
"gorm.io/gorm"
"runtime"
"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/app/admin/models/system"
"go-admin/cmd/migrate/migration"
common "go-admin/common/models"
)
+4 -4
View File
@@ -16,7 +16,7 @@ import (
"go-admin/common/global"
"go-admin/common/models"
"go-admin/pkg/logger"
tools2 "go-admin/tools"
"go-admin/tools"
"go-admin/tools/config"
)
@@ -48,7 +48,7 @@ func run() {
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
global.Logger, global.JobLogger, global.RequestLogger = logger.Setup()
_ = initDB()
} else {
_ = genFile()
@@ -91,9 +91,9 @@ func genFile() error {
var b1 bytes.Buffer
err = t1.Execute(&b1, m)
if goAdmin {
tools2.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
tools.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
} else {
tools2.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go")
tools.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go")
}
return nil
}
+1 -4
View File
@@ -9,10 +9,7 @@ import (
)
var (
configYml string
port string
mode string
StartCmd = &cobra.Command{
StartCmd = &cobra.Command{
Use: "version",
Short: "Get version info",
Example: "go-admin version",