近期bug修复,迁移go-admin-core库, Fixed #272 Fixed #261

This commit is contained in:
linwenxiang committed 2020-10-21 10:09:47 +08:00
1 parent f2703f16d5
commit 52f42616a2
24 files changed
+150 -85

No files matched your search

+15 -2
View File
@@ -3,7 +3,6 @@ package api
import (
"context"
"fmt"
"go-admin/app/admin/router"
"io/ioutil"
"net/http"
"os"
@@ -11,9 +10,12 @@ import (
"time"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/transfer"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go-admin/app/admin/router"
"go-admin/app/jobs"
"go-admin/common/database"
"go-admin/common/global"
@@ -74,7 +76,18 @@ func run() error {
}
engine := global.Cfg.GetEngine()
if engine == nil {
engine = gin.New()
if mode == "dev" {
r := gin.New()
//开发环境启动监控指标
r.GET("/metrics", transfer.Handler(promhttp.Handler()))
//健康检查
r.GET("/health", func(c *gin.Context) {
c.Status(http.StatusOK)
})
engine = r
} else {
engine = gin.New()
}
}
for _, f := range AppRouters {
+6 -5
View File
@@ -1,14 +1,14 @@
package migration
import (
"fmt"
"github.com/spf13/cast"
"gorm.io/gorm"
"log"
"path/filepath"
"sort"
"strconv"
"sync"
"github.com/spf13/cast"
"gorm.io/gorm"
)
var Migrate = &Migration{
@@ -40,11 +40,12 @@ func (e *Migration) Migrate() {
for k := range e.version {
versions = append(versions, k)
}
sort.IntsAreSorted(versions)
if !sort.IntsAreSorted(versions) {
sort.Ints(versions)
}
var err error
var count int64
for _, v := range versions {
fmt.Println(v)
err = e.db.Debug().Table("sys_migration").Where("version = ?", v).Count(&count).Error
if err != nil {
log.Fatalln(err)
@@ -0,0 +1,8 @@
package version_local
func init() {
}
/**
开发者项目的迁移脚本放在这个目录里,init写法参考version目录里的migrate或者自动生成
*/
@@ -1,6 +1,7 @@
package version
import (
"go-admin/app/admin/models/system"
"runtime"
"gorm.io/gorm"
@@ -20,7 +21,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
err := db.Debug().Migrator().AutoMigrate(
new(models.CasbinRule),
new(models.SysDept),
new(models.SysConfig),
new(system.SysConfig),
new(tools.SysTables),
new(tools.SysColumns),
new(models.Menu),
@@ -34,7 +35,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
new(models.DictData),
new(models.DictType),
new(models.SysJob),
new(models.SysConfig),
new(system.SysConfig),
new(models.SysSetting),
new(models.SysFileDir),
new(models.SysFileInfo),
@@ -1,6 +1,7 @@
package version
import (
"go-admin/app/admin/models/system"
"runtime"
"time"
@@ -260,7 +261,7 @@ func _1599190683670Test(db *gorm.DB, version string) error {
{DeptId: 10, ParentId: 1, DeptPath: "/0/1/10", DeptName: "人力资源", Sort: 3, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "1", CreateBy: "1", UpdateBy: "1", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
}
list4 := []models.SysConfig{
list4 := []system.SysConfig{
{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now(), DeletedAt: gorm.DeletedAt{}}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-默认皮肤样式名称", ConfigKey: "sys_index_skinName", ConfigValue: "skin-blue", ConfigType: "Y", Remark: "蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow"},
{Model: gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now(), DeletedAt: gorm.DeletedAt{}}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "用户管理-账号初始密码", ConfigKey: "sys.user.initPassword", ConfigValue: "123456", ConfigType: "Y", Remark: "初始化密码 123456"},
{Model: gorm.Model{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now(), DeletedAt: gorm.DeletedAt{}}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-侧边栏主题", ConfigKey: "sys_index_sideTheme", ConfigValue: "theme-dark", ConfigType: "Y", Remark: "深色主题theme-dark,浅色主题theme-light"},
@@ -2,6 +2,7 @@ package version
import (
"go-admin/app/admin/models"
"go-admin/app/admin/models/system"
"gorm.io/gorm"
"runtime"
@@ -16,14 +17,16 @@ func init() {
func _1602644950000Test(db *gorm.DB, version string) error {
return db.Transaction(func(tx *gorm.DB) error {
err := db.Migrator().RenameColumn(&models.SysConfig{}, "config_id", "id")
if err != nil {
return err
if tx.Migrator().HasColumn(&system.SysConfig{}, "config_id") {
err := tx.Migrator().RenameColumn(&system.SysConfig{}, "config_id", "id")
if err != nil {
return err
}
}
list2 := []models.CasbinRule{
{PType: "p", V0: "admin", V1: "/api/v1/config", V2: "GET"},
}
err = tx.Create(list2).Error
err := tx.Create(list2).Error
if err != nil {
return err
}
@@ -34,7 +37,7 @@ func _1602644950000Test(db *gorm.DB, version string) error {
return err
}
return db.Create(&common.Migration{
return tx.Create(&common.Migration{
Version: version,
}).Error
})
+19 -6
View File
@@ -3,24 +3,27 @@ package migrate
import (
"bytes"
"fmt"
tools2 "go-admin/tools"
"strconv"
"text/template"
"time"
"github.com/spf13/cobra"
"go-admin/cmd/migrate/migration"
_ "go-admin/cmd/migrate/migration/version"
_ "go-admin/cmd/migrate/migration/version-local"
"go-admin/common/database"
"go-admin/common/global"
"go-admin/common/models"
"go-admin/pkg/logger"
tools2 "go-admin/tools"
"go-admin/tools/config"
)
var (
configYml string
generate bool
goAdmin bool
StartCmd = &cobra.Command{
Use: "migrate",
Short: "Initialize the database",
@@ -34,16 +37,18 @@ var (
func init() {
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
StartCmd.PersistentFlags().BoolVarP(&generate, "generate", "g", false, "generate migration file")
StartCmd.PersistentFlags().BoolVarP(&goAdmin, "goAdmin", "a", false, "generate go-admin migration file")
}
func run() {
usage := `start init`
fmt.Println(usage)
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
if !generate {
//1. 读取配置
config.Setup(configYml)
//2. 设置日志
logger.Setup()
_ = initDB()
} else {
_ = genFile()
@@ -79,8 +84,16 @@ func genFile() error {
}
m := map[string]string{}
m["GenerateTime"] = strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
m["Package"] = "version_local"
if goAdmin {
m["Package"] = "version"
}
var b1 bytes.Buffer
err = t1.Execute(&b1, m)
tools2.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
if goAdmin {
tools2.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
} else {
tools2.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go")
}
return nil
}