From 41dd808c9a901712886359389910bcfeffc6819f Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Thu, 10 Feb 2022 11:47:44 +0800
Subject: [PATCH] db

---
 pkg/common/db/mysql.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go
index d075510b5..bb5823860 100644
--- a/pkg/common/db/mysql.go
+++ b/pkg/common/db/mysql.go
@@ -33,23 +33,22 @@ func initMysqlDB() {
 	//	}
 	//}
 
+	dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local",
+		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName)
+	db, err := gorm.Open("mysql", dsn)
+	if err != nil {
+		log.NewError("0", "Open failed ", err.Error(), dsn)
+		panic(err.Error())
+	}
 	//Check the database and table during initialization
 	sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci;", config.Config.Mysql.DBDatabaseName)
-	err := db.Exec(sql).Error
+	err = db.Exec(sql).Error
 	if err != nil {
 		log.NewError("0", "Exec failed ", err.Error(), sql)
 		panic(err.Error())
 	}
 	db.Close()
 
-	dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local",
-		config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName)
-	db, err = gorm.Open("mysql", dsn)
-	if err != nil {
-		log.NewError("0", "Open failed ", err.Error(), dsn)
-		panic(err.Error())
-	}
-
 	log.NewInfo("open db ok ", dsn)
 	db.AutoMigrate(&Friend{},
 		&FriendRequest{},