Skip to content

Commit e3032f9

Browse files
author
蒋吉兆
committed
Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin
2 parents 072bf62 + 65705db commit e3032f9

21 files changed

+619
-355
lines changed

server/cmd/datas/AuthorityMenu.go

Lines changed: 0 additions & 14 deletions
This file was deleted.

server/cmd/datas/authority_Ids.go

Lines changed: 0 additions & 36 deletions
This file was deleted.

server/cmd/datas/authority_menus.go

Lines changed: 0 additions & 79 deletions
This file was deleted.

server/cmd/datas/customers.go

Lines changed: 0 additions & 31 deletions
This file was deleted.

server/cmd/datas/init.go

Lines changed: 0 additions & 58 deletions
This file was deleted.

server/cmd/gva/initdb.go

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ limitations under the License.
1616
package gva
1717

1818
import (
19-
"gin-vue-admin/cmd/datas"
2019
"gin-vue-admin/core"
21-
"gin-vue-admin/initialize"
22-
2320
"github.com/gookit/color"
2421

2522
_ "gin-vue-admin/core"
@@ -38,30 +35,22 @@ var initdbCmd = &cobra.Command{
3835
3. sqlite未适配,
3936
4. sqlserver未适配`,
4037
Run: func(cmd *cobra.Command, args []string) {
38+
frame, _ := cmd.Flags().GetString("frame")
4139
path, _ := cmd.Flags().GetString("path")
4240
global.GVA_VP = core.Viper(path)
4341
global.GVA_LOG = core.Zap() // 初始化zap日志库
44-
db := initialize.GormMysql()
45-
switch global.GVA_CONFIG.System.DbType {
46-
case "mysql":
47-
datas.InitMysqlTables(db)
48-
datas.InitMysqlData(db)
49-
case "postgresql":
50-
color.Info.Println("postgresql功能开发中")
51-
case "sqlite":
52-
color.Info.Println("sqlite功能开发中")
53-
case "sqlserver":
54-
color.Info.Println("sqlserver功能开发中")
55-
default:
56-
datas.InitMysqlTables(db)
57-
datas.InitMysqlData(db)
58-
}
59-
frame, _ := cmd.Flags().GetString("frame")
60-
if frame == "gf" {
42+
Mysql.CheckDatabase()
43+
Mysql.CheckUtf8mb4()
44+
Mysql.Info()
45+
Mysql.Init()
46+
switch frame {
47+
case "gin":
48+
if global.GVA_CONFIG.System.DbType == "mysql" {
49+
Mysql.AutoMigrateTables()
50+
Mysql.InitData()
51+
}
52+
case "gf":
6153
color.Info.Println("gf功能开发中")
62-
return
63-
} else {
64-
return
6554
}
6655
},
6756
}

0 commit comments

Comments
 (0)