diff --git a/pkg/adapter/controller.go b/pkg/adapter/controller.go index 010add64..c0616962 100644 --- a/pkg/adapter/controller.go +++ b/pkg/adapter/controller.go @@ -18,7 +18,6 @@ import ( "mime/multipart" "net/url" - "github.com/astaxie/beego/pkg/adapter/context" "github.com/astaxie/beego/pkg/adapter/session" webContext "github.com/astaxie/beego/pkg/server/web/context" @@ -61,14 +60,13 @@ func (p ControllerCommentsSlice) Swap(i, j int) { // http context, template and view, session and xsrf. type Controller web.Controller +func (c *Controller) Init(ctx *webContext.Context, controllerName, actionName string, app interface{}) { + (*web.Controller)(c).Init(ctx, controllerName, actionName, app) +} + // ControllerInterface is an interface to uniform all controller handler. type ControllerInterface web.ControllerInterface -// Init generates default values of controller operations. -func (c *Controller) Init(ctx *context.Context, controllerName, actionName string, app interface{}) { - (*web.Controller)(c).Init((*webContext.Context)(ctx), controllerName, actionName, app) -} - // Prepare runs after Init before request function execution. func (c *Controller) Prepare() { (*web.Controller)(c).Prepare() diff --git a/pkg/adapter/orm/db_alias.go b/pkg/adapter/orm/db_alias.go index b1f1a724..523b6aee 100644 --- a/pkg/adapter/orm/db_alias.go +++ b/pkg/adapter/orm/db_alias.go @@ -27,12 +27,11 @@ type DriverType orm.DriverType // Enum the Database driver const ( - _ DriverType = iota // int enum type - DRMySQL = orm.DRMySQL - DRSqlite = orm.DRSqlite // sqlite - DROracle = orm.DROracle // oracle - DRPostgres = orm.DRPostgres // pgsql - DRTiDB = orm.DRTiDB // TiDB + DRMySQL = DriverType(orm.DRMySQL) + DRSqlite = DriverType(orm.DRSqlite) // sqlite + DROracle = DriverType(orm.DROracle) // oracle + DRPostgres = DriverType(orm.DRPostgres) // pgsql + DRTiDB = DriverType(orm.DRTiDB) // TiDB ) type DB orm.DB