Merge branch 'main' of github.com:flipped-aurora/gin-vue-admin

piexlmax · piexlmax · commit 8bf33f107983 · 2022-03-14T15:08:52.000+08:00
diff --git a/server/service/system/sys_api.go b/server/service/system/sys_api.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
@@ -89,6 +90,9 @@ func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.Pag
 				} else {
 					OrderStr = order
 				}
+			} else { // didn't matched any order key in `orderMap`
+				err = fmt.Errorf("非法的排序字段: %v", order)
+				return err, apiList, total
 			}
 
 			err = db.Order(OrderStr).Find(&apiList).Error
diff --git a/server/service/system/sys_initdb.go b/server/service/system/sys_initdb.go
@@ -20,11 +20,11 @@ type InitDBService struct{}
 func (initDBService *InitDBService) InitDB(conf request.InitDB) error {
 	switch conf.DBType {
 	case "mysql":
-		return initDBService.initMsqlDB(conf)
+		return initDBService.initMysqlDB(conf)
 	case "pgsql":
 		return initDBService.initPgsqlDB(conf)
 	default:
-		return initDBService.initMsqlDB(conf)
+		return initDBService.initMysqlDB(conf)
 	}
 }
 
diff --git a/server/service/system/sys_initdb_mysql.go b/server/service/system/sys_initdb_mysql.go
@@ -29,11 +29,11 @@ func (initDBService *InitDBService) writeMysqlConfig(mysql config.Mysql) error {
 	return global.GVA_VP.WriteConfig()
 }
 
-// initMsqlDB 创建数据库并初始化 mysql
+// initMysqlDB 创建数据库并初始化 mysql
 // Author [piexlmax](https://github.com/piexlmax)
 // Author [SliverHorn](https://github.com/SliverHorn)
 // Author: [songzhibin97](https://github.com/songzhibin97)
-func (initDBService *InitDBService) initMsqlDB(conf request.InitDB) error {
+func (initDBService *InitDBService) initMysqlDB(conf request.InitDB) error {
 	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 := initDBService.createDatabase(dsn, "mysql", createSql); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package system`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
	`5`	`+ "fmt"`
`5`	`6`
`6`	`7`	`"github.com/flipped-aurora/gin-vue-admin/server/global"`
`7`	`8`	`"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"`
`@@ -89,6 +90,9 @@ func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.Pag`
`89`	`90`	`} else {`
`90`	`91`	`OrderStr = order`
`91`	`92`	`}`
	`93`	+ } else { // didn't matched any order key in `orderMap`
	`94`	`+ err = fmt.Errorf("非法的排序字段: %v", order)`
	`95`	`+ return err, apiList, total`
`92`	`96`	`}`
`93`	`97`
`94`	`98`	`err = db.Order(OrderStr).Find(&apiList).Error`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ type InitDBService struct{}`
`20`	`20`	`func (initDBService *InitDBService) InitDB(conf request.InitDB) error {`
`21`	`21`	`switch conf.DBType {`
`22`	`22`	`case "mysql":`
`23`		`- return initDBService.initMsqlDB(conf)`
	`23`	`+ return initDBService.initMysqlDB(conf)`
`24`	`24`	`case "pgsql":`
`25`	`25`	`return initDBService.initPgsqlDB(conf)`
`26`	`26`	`default:`
`27`		`- return initDBService.initMsqlDB(conf)`
	`27`	`+ return initDBService.initMysqlDB(conf)`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`