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

@@ -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
}