feat(db): add db param

landv · Aug 23, 2022 · 2c751a9 · 2c751a9
1 parent 5770218
commit 2c751a9
Show file tree

Hide file tree

Showing 26 changed files with 210 additions and 448 deletions.
diff --git a/README.md b/README.md
@@ -123,9 +123,9 @@ func main() {
 				User:         "root",
 				Pwd:          "root",
 				Name:         "goadmin",
-				MaxIdleCon: 50,
-				MaxOpenCon: 150,
-				ConMaxLifetime: time.Hour,
+				MaxIdleConns: 50,
+				MaxOpenConns: 150,
+				ConnMaxLifetime: time.Hour,
 				Driver:       "mysql",
 			},
         	},

diff --git a/README_CN.md b/README_CN.md
@@ -108,9 +108,9 @@ func main() {
 			User:         "root",
 			Pwd:          "root",
 			Name:         "goadmin",
-			MaxIdleCon: 50,
-			MaxOpenCon: 150,
-			ConMaxLifetime: time.Hour,
+			MaxIdleConns: 50,
+			MaxOpenConns: 150,
+			ConnMaxLifetime: time.Hour,
 			Driver:       "mysql",
 		    },
         	},

diff --git a/adapter/gofasthttp/fasthttp.go b/adapter/gofasthttp/fasthttp.go
diff --git a/adm/db.go b/adm/db.go
@@ -111,17 +111,17 @@ func askForDBConfig(info *dbInfo) config.DatabaseList {
 
 		return map[string]config.Database{
 			"default": {
-				Host:           info.Host,
-				Port:           info.Port,
-				User:           info.User,
-				Pwd:            info.Password,
-				Name:           info.Database,
-				MaxIdleCon:     5,
-				MaxOpenCon:     10,
-				ConMaxLifetime: time.Hour,
-				ConMaxIdleTime: 0,
-				Driver:         info.DriverName,
-				File:           "",
+				Host:            info.Host,
+				Port:            info.Port,
+				User:            info.User,
+				Pwd:             info.Password,
+				Name:            info.Database,
+				MaxIdleConns:    5,
+				MaxOpenConns:    10,
+				ConnMaxLifetime: time.Hour,
+				ConnMaxIdleTime: 0,
+				Driver:          info.DriverName,
+				File:            "",
 			},
 		}
 	} else {

diff --git a/adm/project_web.go b/adm/project_web.go
@@ -180,16 +180,16 @@ func buildProjectWeb(port string) {
 			if info.DriverName != db.DriverSqlite {
 				dbList = map[string]config.Database{
 					"default": {
-						Host:           info.Host,
-						Port:           info.Port,
-						User:           info.User,
-						Pwd:            info.Password,
-						Name:           info.Database,
-						MaxIdleCon:     5,
-						MaxOpenCon:     10,
-						ConMaxLifetime: time.Hour,
-						ConMaxIdleTime: 0,
-						Driver:         info.DriverName,
+						Host:            info.Host,
+						Port:            info.Port,
+						User:            info.User,
+						Pwd:             info.Password,
+						Name:            info.Database,
+						MaxIdleConns:    5,
+						MaxOpenConns:    10,
+						ConnMaxLifetime: time.Hour,
+						ConnMaxIdleTime: 0,
+						Driver:          info.DriverName,
 					},
 				}
 			} else {

diff --git a/examples/beego/main.go b/examples/beego/main.go
@@ -29,15 +29,15 @@ func main() {
 		Env: config.EnvLocal,
 		Databases: config.DatabaseList{
 			"default": {
-				Host:           "127.0.0.1",
-				Port:           "3306",
-				User:           "root",
-				Pwd:            "root",
-				Name:           "godmin",
-				MaxIdleCon:     50,
-				MaxOpenCon:     150,
-				ConMaxLifetime: time.Hour,
-				Driver:         config.DriverMysql,
+				Host:            "127.0.0.1",
+				Port:            "3306",
+				User:            "root",
+				Pwd:             "root",
+				Name:            "godmin",
+				MaxIdleConns:    50,
+				MaxOpenConns:    150,
+				ConnMaxLifetime: time.Hour,
+				Driver:          config.DriverMysql,
 			},
 		},
 		Store: config.Store{

diff --git a/examples/beego2/main.go b/examples/beego2/main.go
@@ -1,6 +1,11 @@
 package main
 
 import (
+	"log"
+	"os"
+	"os/signal"
+	"time"
+
 	_ "github.com/GoAdminGroup/go-admin/adapter/beego2"
 	_ "github.com/GoAdminGroup/go-admin/modules/db/drivers/mysql"
 
@@ -13,9 +18,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/template/chartjs"
 	"github.com/GoAdminGroup/themes/adminlte"
 	"github.com/beego/beego/v2/server/web"
-	"log"
-	"os"
-	"os/signal"
 )
 
 func main() {
@@ -27,14 +29,15 @@ func main() {
 		Env: config.EnvLocal,
 		Databases: config.DatabaseList{
 			"default": {
-				Host:       "127.0.0.1",
-				Port:       "3306",
-				User:       "root",
-				Pwd:        "123456",
-				Name:       "godmin",
-				MaxIdleCon: 50,
-				MaxOpenCon: 150,
-				Driver:     config.DriverMysql,
+				Host:            "127.0.0.1",
+				Port:            "3306",
+				User:            "root",
+				Pwd:             "123456",
+				Name:            "godmin",
+				MaxIdleConns:    50,
+				MaxOpenConns:    150,
+				ConnMaxLifetime: time.Hour,
+				Driver:          config.DriverMysql,
 			},
 		},
 		Store: config.Store{