|
@@ -41,7 +41,12 @@ func createTable(dsn string, driver string, createSql string) error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
- defer db.Close()
|
|
|
+ defer func(db *sql.DB) {
|
|
|
+ err := db.Close()
|
|
|
+ if err != nil {
|
|
|
+
|
|
|
+ }
|
|
|
+ }(db)
|
|
|
if err = db.Ping(); err != nil {
|
|
|
return err
|
|
|
}
|
|
@@ -82,7 +87,6 @@ func InitDB(conf request.InitDB) error {
|
|
|
conf.Port = "3306"
|
|
|
}
|
|
|
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 := createTable(dsn, "mysql", createSql); err != nil {
|
|
|
return err
|
|
@@ -117,6 +121,7 @@ func InitDB(conf request.InitDB) error {
|
|
|
//global.GVA_LOG.Error("MySQL启动异常", zap.Any("err", err))
|
|
|
//os.Exit(0)
|
|
|
//return nil
|
|
|
+ _ = writeConfig(global.GVA_VP, BaseMysql)
|
|
|
return nil
|
|
|
} else {
|
|
|
sqlDB, _ := db.DB()
|
|
@@ -142,6 +147,7 @@ func InitDB(conf request.InitDB) error {
|
|
|
model.SysOperationRecord{},
|
|
|
)
|
|
|
if err != nil {
|
|
|
+ _ = writeConfig(global.GVA_VP, BaseMysql)
|
|
|
return err
|
|
|
}
|
|
|
err = initDB(
|