diff --git a/contrib/drivers/mysql/mysql.go b/contrib/drivers/mysql/mysql.go index 3acdd7b5b..31343e05e 100644 --- a/contrib/drivers/mysql/mysql.go +++ b/contrib/drivers/mysql/mysql.go @@ -14,6 +14,7 @@ import ( "net/url" _ "github.com/go-sql-driver/mysql" + "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/container/gmap" "github.com/gogf/gf/v2/database/gdb" @@ -34,8 +35,15 @@ var ( ) func init() { - if err := gdb.Register(`mysql`, New()); err != nil { - panic(err) + var ( + err error + driverObj = New() + driverNames = g.SliceStr{"mysql", "mariadb", "tidb"} + ) + for _, driverName := range driverNames { + if err = gdb.Register(driverName, driverObj); err != nil { + panic(err) + } } } diff --git a/net/ghttp/ghttp.go b/net/ghttp/ghttp.go index c6afb6916..66c1ae479 100644 --- a/net/ghttp/ghttp.go +++ b/net/ghttp/ghttp.go @@ -16,10 +16,10 @@ import ( "github.com/gogf/gf/v2/container/gmap" "github.com/gogf/gf/v2/container/gtype" + "github.com/gogf/gf/v2/net/goai" "github.com/gogf/gf/v2/net/gsvc" "github.com/gogf/gf/v2/os/gcache" "github.com/gogf/gf/v2/os/gsession" - "github.com/gogf/gf/v2/protocol/goai" ) type ( diff --git a/net/ghttp/ghttp_server.go b/net/ghttp/ghttp_server.go index 3dd2500c7..6c3f97e21 100644 --- a/net/ghttp/ghttp_server.go +++ b/net/ghttp/ghttp_server.go @@ -25,6 +25,7 @@ import ( "github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/internal/intlog" "github.com/gogf/gf/v2/net/ghttp/internal/swaggerui" + "github.com/gogf/gf/v2/net/goai" "github.com/gogf/gf/v2/os/gcache" "github.com/gogf/gf/v2/os/genv" "github.com/gogf/gf/v2/os/gfile" @@ -32,7 +33,6 @@ import ( "github.com/gogf/gf/v2/os/gproc" "github.com/gogf/gf/v2/os/gsession" "github.com/gogf/gf/v2/os/gtimer" - "github.com/gogf/gf/v2/protocol/goai" "github.com/gogf/gf/v2/text/gregex" "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/gconv" diff --git a/net/ghttp/ghttp_server_openapi.go b/net/ghttp/ghttp_server_openapi.go index 035063f04..72fd10644 100644 --- a/net/ghttp/ghttp_server_openapi.go +++ b/net/ghttp/ghttp_server_openapi.go @@ -10,7 +10,7 @@ import ( "context" "github.com/gogf/gf/v2/internal/intlog" - "github.com/gogf/gf/v2/protocol/goai" + "github.com/gogf/gf/v2/net/goai" "github.com/gogf/gf/v2/text/gstr" ) diff --git a/net/ghttp/ghttp_server_router.go b/net/ghttp/ghttp_server_router.go index 973ac35a8..bf107f762 100644 --- a/net/ghttp/ghttp_server_router.go +++ b/net/ghttp/ghttp_server_router.go @@ -19,7 +19,7 @@ import ( "github.com/gogf/gf/v2/errors/gcode" "github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/internal/utils" - "github.com/gogf/gf/v2/protocol/goai" + "github.com/gogf/gf/v2/net/goai" "github.com/gogf/gf/v2/text/gregex" "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/gmeta" diff --git a/protocol/goai/goai.go b/net/goai/goai.go similarity index 100% rename from protocol/goai/goai.go rename to net/goai/goai.go diff --git a/protocol/goai/goai_callback.go b/net/goai/goai_callback.go similarity index 100% rename from protocol/goai/goai_callback.go rename to net/goai/goai_callback.go diff --git a/protocol/goai/goai_components.go b/net/goai/goai_components.go similarity index 100% rename from protocol/goai/goai_components.go rename to net/goai/goai_components.go diff --git a/protocol/goai/goai_config.go b/net/goai/goai_config.go similarity index 100% rename from protocol/goai/goai_config.go rename to net/goai/goai_config.go diff --git a/protocol/goai/goai_example.go b/net/goai/goai_example.go similarity index 100% rename from protocol/goai/goai_example.go rename to net/goai/goai_example.go diff --git a/protocol/goai/goai_external_docs.go b/net/goai/goai_external_docs.go similarity index 100% rename from protocol/goai/goai_external_docs.go rename to net/goai/goai_external_docs.go diff --git a/protocol/goai/goai_header.go b/net/goai/goai_header.go similarity index 100% rename from protocol/goai/goai_header.go rename to net/goai/goai_header.go diff --git a/protocol/goai/goai_info.go b/net/goai/goai_info.go similarity index 100% rename from protocol/goai/goai_info.go rename to net/goai/goai_info.go diff --git a/protocol/goai/goai_link.go b/net/goai/goai_link.go similarity index 100% rename from protocol/goai/goai_link.go rename to net/goai/goai_link.go diff --git a/protocol/goai/goai_mediatype.go b/net/goai/goai_mediatype.go similarity index 100% rename from protocol/goai/goai_mediatype.go rename to net/goai/goai_mediatype.go diff --git a/protocol/goai/goai_operation.go b/net/goai/goai_operation.go similarity index 100% rename from protocol/goai/goai_operation.go rename to net/goai/goai_operation.go diff --git a/protocol/goai/goai_parameter.go b/net/goai/goai_parameter.go similarity index 100% rename from protocol/goai/goai_parameter.go rename to net/goai/goai_parameter.go diff --git a/protocol/goai/goai_parameter_ref.go b/net/goai/goai_parameter_ref.go similarity index 100% rename from protocol/goai/goai_parameter_ref.go rename to net/goai/goai_parameter_ref.go diff --git a/protocol/goai/goai_path.go b/net/goai/goai_path.go similarity index 100% rename from protocol/goai/goai_path.go rename to net/goai/goai_path.go diff --git a/protocol/goai/goai_requestbody.go b/net/goai/goai_requestbody.go similarity index 100% rename from protocol/goai/goai_requestbody.go rename to net/goai/goai_requestbody.go diff --git a/protocol/goai/goai_response.go b/net/goai/goai_response.go similarity index 100% rename from protocol/goai/goai_response.go rename to net/goai/goai_response.go diff --git a/protocol/goai/goai_response_ref.go b/net/goai/goai_response_ref.go similarity index 100% rename from protocol/goai/goai_response_ref.go rename to net/goai/goai_response_ref.go diff --git a/protocol/goai/goai_security.go b/net/goai/goai_security.go similarity index 100% rename from protocol/goai/goai_security.go rename to net/goai/goai_security.go diff --git a/protocol/goai/goai_server.go b/net/goai/goai_server.go similarity index 100% rename from protocol/goai/goai_server.go rename to net/goai/goai_server.go diff --git a/protocol/goai/goai_shema.go b/net/goai/goai_shema.go similarity index 100% rename from protocol/goai/goai_shema.go rename to net/goai/goai_shema.go diff --git a/protocol/goai/goai_shema_ref.go b/net/goai/goai_shema_ref.go similarity index 100% rename from protocol/goai/goai_shema_ref.go rename to net/goai/goai_shema_ref.go diff --git a/protocol/goai/goai_shemas.go b/net/goai/goai_shemas.go similarity index 100% rename from protocol/goai/goai_shemas.go rename to net/goai/goai_shemas.go diff --git a/protocol/goai/goai_tags.go b/net/goai/goai_tags.go similarity index 100% rename from protocol/goai/goai_tags.go rename to net/goai/goai_tags.go diff --git a/protocol/goai/goai_xextensions.go b/net/goai/goai_xextensions.go similarity index 100% rename from protocol/goai/goai_xextensions.go rename to net/goai/goai_xextensions.go diff --git a/protocol/goai/goai_z_unit_test.go b/net/goai/goai_z_unit_test.go similarity index 99% rename from protocol/goai/goai_z_unit_test.go rename to net/goai/goai_z_unit_test.go index da0bab7f3..26b949f8a 100644 --- a/protocol/goai/goai_z_unit_test.go +++ b/net/goai/goai_z_unit_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/gogf/gf/v2/frame/g" - "github.com/gogf/gf/v2/protocol/goai" + "github.com/gogf/gf/v2/net/goai" "github.com/gogf/gf/v2/test/gtest" "github.com/gogf/gf/v2/util/gmeta" ) diff --git a/protocol/goai/testdata/example.yaml b/net/goai/testdata/example.yaml similarity index 100% rename from protocol/goai/testdata/example.yaml rename to net/goai/testdata/example.yaml