diff --git a/code/core/context.go b/code/core/context.go index 162d561..19721ff 100644 --- a/code/core/context.go +++ b/code/core/context.go @@ -20,7 +20,7 @@ type Context interface { GetSessionCache() *cache.Table //获取全局的ControllerMap - GetControllerMap() map[string]IController + GetControllerMap() map[string]Controller //系统安装成功 InstallOk() diff --git a/code/core/controller.go b/code/core/controller.go index 27843aa..6cb875b 100644 --- a/code/core/controller.go +++ b/code/core/controller.go @@ -2,7 +2,7 @@ package core import "net/http" -type IController interface { +type Controller interface { Bean //注册自己固定的路由。 RegisterRoutes() map[string]func(writer http.ResponseWriter, request *http.Request) diff --git a/code/rest/base_model.go b/code/rest/base_model.go index 3c5543d..16a11d0 100644 --- a/code/rest/base_model.go +++ b/code/rest/base_model.go @@ -12,8 +12,6 @@ const ( FALSE = "false" ) -type Time time.Time - type IBase interface { //返回其对应的数据库表名 TableName() string diff --git a/code/support/tank_context.go b/code/support/tank_context.go index 841c6cb..131de83 100644 --- a/code/support/tank_context.go +++ b/code/support/tank_context.go @@ -20,7 +20,7 @@ type TankContext struct { //各类的Bean Map。这里面是包含ControllerMap中所有元素 BeanMap map[string]core.Bean //只包含了Controller的map - ControllerMap map[string]core.IController + ControllerMap map[string]core.Controller //处理所有路由请求 Router *TankRouter } @@ -33,7 +33,7 @@ func (this *TankContext) Init() { //初始化Map this.BeanMap = make(map[string]core.Bean) - this.ControllerMap = make(map[string]core.IController) + this.ControllerMap = make(map[string]core.Controller) //注册各类Beans.在这个方法里面顺便把Controller装入ControllerMap中去。 this.registerBeans() @@ -58,7 +58,7 @@ func (this *TankContext) GetSessionCache() *cache.Table { return this.SessionCache } -func (this *TankContext) GetControllerMap() map[string]core.IController { +func (this *TankContext) GetControllerMap() map[string]core.Controller { return this.ControllerMap } @@ -111,7 +111,7 @@ func (this *TankContext) registerBean(bean core.Bean) { this.BeanMap[typeName] = element //看看是不是controller类型,如果是,那么单独放在ControllerMap中。 - if controller, ok1 := bean.(core.IController); ok1 { + if controller, ok1 := bean.(core.Controller); ok1 { this.ControllerMap[typeName] = controller }