包位置调整

pixel · pixel · commit 7363fa55e484 · 2021-03-02T19:53:26.000+08:00
diff --git a/server/cmd/gva/initdb.go b/server/cmd/gva/initdb.go
@@ -16,9 +16,8 @@ limitations under the License.
 package gva
 
 import (
+	"gin-vue-admin/cmd/source"
 	"gin-vue-admin/core"
-	"gin-vue-admin/utils"
-
 	"github.com/gookit/color"
 
 	_ "gin-vue-admin/core"
@@ -41,15 +40,16 @@ var initdbCmd = &cobra.Command{
 		path, _ := cmd.Flags().GetString("path")
 		global.GVA_VP = core.Viper(path)
 		global.GVA_LOG = core.Zap() // 初始化zap日志库
-		utils.Mysql.CheckDatabase()
-		utils.Mysql.CheckUtf8mb4()
-		utils.Mysql.Info()
-		utils.Mysql.Init()
+
+		source.Mysql.CheckDatabase()
+		source.Mysql.CheckUtf8mb4()
+		source.Mysql.Info()
+		source.Mysql.Init()
 		switch frame {
 		case "gin":
 			if global.GVA_CONFIG.System.DbType == "mysql" {
-				utils.Mysql.AutoMigrateTables()
-				utils.Mysql.InitData()
+				source.Mysql.AutoMigrateTables()
+				source.Mysql.InitData()
 			}
 		case "gf":
 			color.Info.Println("gf功能开发中")
diff --git a/server/cmd/source/init_db.go b/server/cmd/source/init_db.go
@@ -1,8 +1,7 @@
-package utils
+package source
 
 import (
 	"database/sql"
-
 	"github.com/spf13/viper"
 )
 
diff --git a/server/cmd/source/mysql.go b/server/cmd/source/mysql.go
@@ -1,4 +1,4 @@
-package utils
+package source
 
 import (
 	"fmt"
diff --git a/server/service/sys_initdb.go b/server/service/sys_initdb.go
@@ -2,9 +2,9 @@ package service
 
 import (
 	"fmt"
+	"gin-vue-admin/cmd/source"
 	"gin-vue-admin/global"
 	"gin-vue-admin/model/request"
-	"gin-vue-admin/utils"
 )
 
 //@author: [songzhibin97](https://github.com/songzhibin97)
@@ -23,7 +23,7 @@ func InitDB(conf request.InitDB) error {
 	dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/", conf.UserName, conf.Password, conf.Host, conf.Port)
 	fmt.Println(dsn)
 	createSql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_general_ci;", conf.DBName)
-	if err := utils.CreateTable(dsn, "mysql", createSql); err != nil {
+	if err := source.CreateTable(dsn, "mysql", createSql); err != nil {
 		return err
 	}
 	setting := map[string]interface{}{
@@ -32,9 +32,9 @@ func InitDB(conf request.InitDB) error {
 		"mysql.username": conf.UserName,
 		"mysql.password": conf.Password,
 	}
-	if err := utils.WriteConfig(global.GVA_VP, setting); err != nil {
+	if err := source.WriteConfig(global.GVA_VP, setting); err != nil {
 		return err
 	}
-	utils.InitDB()
+	source.InitDB()
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-package utils`
	`1`	`+package source`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"database/sql"`
`5`		`-`
`6`	`5`	`"github.com/spf13/viper"`
`7`	`6`	`)`
`8`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package utils`
	`1`	`+package source`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ package service`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "gin-vue-admin/cmd/source"`
`5`	`6`	`"gin-vue-admin/global"`
`6`	`7`	`"gin-vue-admin/model/request"`
`7`		`- "gin-vue-admin/utils"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`//@author: [songzhibin97](https://github.com/songzhibin97)`
`@@ -23,7 +23,7 @@ func InitDB(conf request.InitDB) error {`
`23`	`23`	`dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/", conf.UserName, conf.Password, conf.Host, conf.Port)`
`24`	`24`	`fmt.Println(dsn)`
`25`	`25`	`createSql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_general_ci;", conf.DBName)`
`26`		`- if err := utils.CreateTable(dsn, "mysql", createSql); err != nil {`
	`26`	`+ if err := source.CreateTable(dsn, "mysql", createSql); err != nil {`
`27`	`27`	`return err`
`28`	`28`	`}`
`29`	`29`	`setting := map[string]interface{}{`
`@@ -32,9 +32,9 @@ func InitDB(conf request.InitDB) error {`
`32`	`32`	`"mysql.username": conf.UserName,`
`33`	`33`	`"mysql.password": conf.Password,`
`34`	`34`	`}`
`35`		`- if err := utils.WriteConfig(global.GVA_VP, setting); err != nil {`
	`35`	`+ if err := source.WriteConfig(global.GVA_VP, setting); err != nil {`
`36`	`36`	`return err`
`37`	`37`	`}`
`38`		`- utils.InitDB()`
	`38`	`+ source.InitDB()`
`39`	`39`	`return nil`
`40`	`40`	`}`