From 7363fa55e484dd19fee0e78d6cfa2199188d8aee Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Tue, 2 Mar 2021 19:53:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/cmd/gva/initdb.go                | 16 ++++++++--------
 server/{utils => cmd/source}/init_db.go |  3 +--
 server/{utils => cmd/source}/mysql.go   |  2 +-
 server/service/sys_initdb.go            |  8 ++++----
 4 files changed, 14 insertions(+), 15 deletions(-)
 rename server/{utils => cmd/source}/init_db.go (98%)
 rename server/{utils => cmd/source}/mysql.go (99%)

diff --git a/server/cmd/gva/initdb.go b/server/cmd/gva/initdb.go
index 37f36811..8331905c 100644
--- 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/utils/init_db.go b/server/cmd/source/init_db.go
similarity index 98%
rename from server/utils/init_db.go
rename to server/cmd/source/init_db.go
index deee697e..be32dde9 100644
--- a/server/utils/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/utils/mysql.go b/server/cmd/source/mysql.go
similarity index 99%
rename from server/utils/mysql.go
rename to server/cmd/source/mysql.go
index 7a3b1351..1406ea38 100644
--- a/server/utils/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
index 18655c8e..0f6135a6 100644
--- 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
 }