Merge pull request #2157 from morya/main

FIX: code too complicated

Author: pixelmaxQm

server/service/system/sys_initdb.go

@@ -160,7 +160,7 @@ func createDatabase(dsn string, driver string, createSql string) error {
 // createTables 创建表（默认 dbInitHandler.initTables 行为）
 func createTables(ctx context.Context, inits initSlice) error {
 	next, cancel := context.WithCancel(ctx)
-	defer func(c func()) { c() }(cancel)
+	defer cancel()
 	for _, init := range inits {
 		if init.TableCreated(next) {
 			continue

server/service/system/sys_initdb_mssql.go

@@ -73,7 +73,7 @@ func (h MssqlInitHandler) InitTables(ctx context.Context, inits initSlice) error
 
 func (h MssqlInitHandler) InitData(ctx context.Context, inits initSlice) error {
 	next, cancel := context.WithCancel(ctx)
-	defer func(c func()) { c() }(cancel)
+	defer cancel()
 	for _, init := range inits {
 		if init.DataInserted(next) {
 			color.Info.Printf(InitDataExist, Mssql, init.InitializerName())

server/service/system/sys_initdb_mysql.go

@@ -78,7 +78,7 @@ func (h MysqlInitHandler) InitTables(ctx context.Context, inits initSlice) error
 
 func (h MysqlInitHandler) InitData(ctx context.Context, inits initSlice) error {
 	next, cancel := context.WithCancel(ctx)
-	defer func(c func()) { c() }(cancel)
+	defer cancel()
 	for _, init := range inits {
 		if init.DataInserted(next) {
 			color.Info.Printf(InitDataExist, Mysql, init.InitializerName())

server/service/system/sys_initdb_pgsql.go

@@ -82,7 +82,7 @@ func (h PgsqlInitHandler) InitTables(ctx context.Context, inits initSlice) error
 
 func (h PgsqlInitHandler) InitData(ctx context.Context, inits initSlice) error {
 	next, cancel := context.WithCancel(ctx)
-	defer func(c func()) { c() }(cancel)
+	defer cancel()
 	for i := 0; i < len(inits); i++ {
 		if inits[i].DataInserted(next) {
 			color.Info.Printf(InitDataExist, Pgsql, inits[i].InitializerName())

server/service/system/sys_initdb_sqlite.go

@@ -69,7 +69,7 @@ func (h SqliteInitHandler) InitTables(ctx context.Context, inits initSlice) erro
 
 func (h SqliteInitHandler) InitData(ctx context.Context, inits initSlice) error {
 	next, cancel := context.WithCancel(ctx)
-	defer func(c func()) { c() }(cancel)
+	defer cancel()
 	for _, init := range inits {
 		if init.DataInserted(next) {
 			color.Info.Printf(InitDataExist, Sqlite, init.InitializerName())