sys_initdb_mysql/pgsql.go: 优化流程, 创建database前,如果dbname为空直接返回 (flipped-aurora#1134)

奇淼（piexlmax · lyonnee · web-flow · commit dff7ce1bc05a · 2022-06-22T11:51:09.000+08:00
Co-authored-by: Lyon.Nee &lt;lyon.nee@outlook.com&gt;
diff --git a/server/service/system/sys_initdb_mysql.go b/server/service/system/sys_initdb_mysql.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"path/filepath"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/config"
 	"github.com/gookit/color"
-	"path/filepath"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 
@@ -44,17 +45,19 @@ func (h MysqlInitHandler) EnsureDB(ctx context.Context, conf *request.InitDB) (n
 	if s, ok := ctx.Value("dbtype").(string); !ok || s != "mysql" {
 		return ctx, ErrDBTypeMismatch
 	}
-	dsn := conf.MysqlEmptyDsn()
-	createSql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS `%s` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_general_ci;", conf.DBName)
-	if err = createDatabase(dsn, "mysql", createSql); err != nil {
-		return nil, err
-	} // 创建数据库
 
 	c := conf.ToMysqlConfig()
 	next = context.WithValue(ctx, "config", c)
 	if c.Dbname == "" {
 		return ctx, nil
 	} // 如果没有数据库名, 则跳出初始化数据
+
+	dsn := conf.MysqlEmptyDsn()
+	createSql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS `%s` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_general_ci;", c.Dbname)
+	if err = createDatabase(dsn, "mysql", createSql); err != nil {
+		return nil, err
+	} // 创建数据库
+
 	var db *gorm.DB
 	if db, err = gorm.Open(mysql.New(mysql.Config{
 		DSN:                       c.Dsn(), // DSN data source name
diff --git a/server/service/system/sys_initdb_pgsql.go b/server/service/system/sys_initdb_pgsql.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"path/filepath"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/config"
 	"github.com/gookit/color"
-	"path/filepath"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 
@@ -44,17 +45,19 @@ func (h PgsqlInitHandler) EnsureDB(ctx context.Context, conf *request.InitDB) (n
 	if s, ok := ctx.Value("dbtype").(string); !ok || s != "pgsql" {
 		return ctx, ErrDBTypeMismatch
 	}
-	dsn := conf.PgsqlEmptyDsn()
-	createSql := fmt.Sprintf("CREATE DATABASE %s;", conf.DBName)
-	if err = createDatabase(dsn, "pgx", createSql); err != nil {
-		return nil, err
-	} // 创建数据库
 
 	c := conf.ToPgsqlConfig()
 	next = context.WithValue(ctx, "config", c)
 	if c.Dbname == "" {
 		return ctx, nil
 	} // 如果没有数据库名, 则跳出初始化数据
+
+	dsn := conf.PgsqlEmptyDsn()
+	createSql := fmt.Sprintf("CREATE DATABASE %s;", c.Dbname)
+	if err = createDatabase(dsn, "pgx", createSql); err != nil {
+		return nil, err
+	} // 创建数据库
+
 	var db *gorm.DB
 	if db, err = gorm.Open(postgres.New(postgres.Config{
 		DSN:                  c.Dsn(), // DSN data source name
