Prechádzať zdrojové kódy

CtrlContext添加ApiEngine

zhangjq 6 rokov pred
rodič
commit
aa12032d67

+ 1 - 1
controllers/gen/ApiController_gen.go

@@ -30,6 +30,6 @@ func NewApiController(e *engine.ApiEngine) *ApiController {
 func (c *ApiController) ApiDoc(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.Api_ApiDoc(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.Api_ApiDoc(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 

+ 3 - 3
controllers/gen/SsoController_gen.go

@@ -30,7 +30,7 @@ func NewSsoController(e *engine.ApiEngine) *SsoController {
 func (c *SsoController) Login(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.Sso_Login(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.Sso_Login(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // Logout
@@ -42,7 +42,7 @@ func (c *SsoController) Login(ctx *gin.Context) {
 func (c *SsoController) Logout(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.Sso_Logout(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.Sso_Logout(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // TokenValidate
@@ -55,6 +55,6 @@ func (c *SsoController) Logout(ctx *gin.Context) {
 func (c *SsoController) TokenValidate(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.Sso_TokenValidate(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.Sso_TokenValidate(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 

+ 3 - 3
controllers/gen/SysAttachmentController_gen.go

@@ -29,7 +29,7 @@ func NewSysAttachmentController(e *engine.ApiEngine) *SysAttachmentController {
 func (c *SysAttachmentController) Upload(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.SysAttachment_Upload(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.SysAttachment_Upload(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // Download
@@ -42,7 +42,7 @@ func (c *SysAttachmentController) Upload(ctx *gin.Context) {
 func (c *SysAttachmentController) Download(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.SysAttachment_Download(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.SysAttachment_Download(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // Delete
@@ -55,6 +55,6 @@ func (c *SysAttachmentController) Download(ctx *gin.Context) {
 func (c *SysAttachmentController) Delete(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.SysAttachment_Delete(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.SysAttachment_Delete(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 

+ 28 - 28
controllers/gen/SystemController_gen.go

@@ -30,7 +30,7 @@ func NewSystemController(e *engine.ApiEngine) *SystemController {
 func (c *SystemController) Sidebar(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_Sidebar(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_Sidebar(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindUserPage
@@ -42,7 +42,7 @@ func (c *SystemController) Sidebar(ctx *gin.Context) {
 func (c *SystemController) FindUserPage(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_FindUserPage(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_FindUserPage(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetOrgTree
@@ -54,7 +54,7 @@ func (c *SystemController) FindUserPage(ctx *gin.Context) {
 func (c *SystemController) GetOrgTree(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_GetOrgTree(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_GetOrgTree(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetMenuTree
@@ -66,7 +66,7 @@ func (c *SystemController) GetOrgTree(ctx *gin.Context) {
 func (c *SystemController) GetMenuTree(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_GetMenuTree(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_GetMenuTree(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetDomainTree
@@ -78,7 +78,7 @@ func (c *SystemController) GetMenuTree(ctx *gin.Context) {
 func (c *SystemController) GetDomainTree(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_GetDomainTree(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_GetDomainTree(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindOrgPage
@@ -90,7 +90,7 @@ func (c *SystemController) GetDomainTree(ctx *gin.Context) {
 func (c *SystemController) FindOrgPage(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_FindOrgPage(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_FindOrgPage(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindRolePage
@@ -102,7 +102,7 @@ func (c *SystemController) FindOrgPage(ctx *gin.Context) {
 func (c *SystemController) FindRolePage(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_FindRolePage(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_FindRolePage(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindMenuPage
@@ -114,7 +114,7 @@ func (c *SystemController) FindRolePage(ctx *gin.Context) {
 func (c *SystemController) FindMenuPage(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_FindMenuPage(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_FindMenuPage(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindDomainPage
@@ -126,7 +126,7 @@ func (c *SystemController) FindMenuPage(ctx *gin.Context) {
 func (c *SystemController) FindDomainPage(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_FindDomainPage(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_FindDomainPage(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddUser
@@ -142,7 +142,7 @@ func (c *SystemController) FindDomainPage(ctx *gin.Context) {
 func (c *SystemController) AddUser(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_AddUser(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_AddUser(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelUser
@@ -155,7 +155,7 @@ func (c *SystemController) AddUser(ctx *gin.Context) {
 func (c *SystemController) DelUser(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_DelUser(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_DelUser(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateUser
@@ -171,7 +171,7 @@ func (c *SystemController) DelUser(ctx *gin.Context) {
 func (c *SystemController) UpdateUser(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_UpdateUser(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_UpdateUser(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddRole
@@ -185,7 +185,7 @@ func (c *SystemController) UpdateUser(ctx *gin.Context) {
 func (c *SystemController) AddRole(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_AddRole(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_AddRole(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelRole
@@ -198,7 +198,7 @@ func (c *SystemController) AddRole(ctx *gin.Context) {
 func (c *SystemController) DelRole(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_DelRole(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_DelRole(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateRole
@@ -213,7 +213,7 @@ func (c *SystemController) DelRole(ctx *gin.Context) {
 func (c *SystemController) UpdateRole(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_UpdateRole(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_UpdateRole(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindRoleMenu
@@ -226,7 +226,7 @@ func (c *SystemController) UpdateRole(ctx *gin.Context) {
 func (c *SystemController) FindRoleMenu(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_FindRoleMenu(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_FindRoleMenu(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // SaveRoleMenu
@@ -239,7 +239,7 @@ func (c *SystemController) FindRoleMenu(ctx *gin.Context) {
 func (c *SystemController) SaveRoleMenu(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_SaveRoleMenu(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_SaveRoleMenu(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // RoleAll
@@ -251,7 +251,7 @@ func (c *SystemController) SaveRoleMenu(ctx *gin.Context) {
 func (c *SystemController) RoleAll(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_RoleAll(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_RoleAll(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // FindPermissions
@@ -263,7 +263,7 @@ func (c *SystemController) RoleAll(ctx *gin.Context) {
 func (c *SystemController) FindPermissions(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_FindPermissions(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_FindPermissions(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddMenu
@@ -276,7 +276,7 @@ func (c *SystemController) FindPermissions(ctx *gin.Context) {
 func (c *SystemController) AddMenu(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_AddMenu(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_AddMenu(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelMenu
@@ -289,7 +289,7 @@ func (c *SystemController) AddMenu(ctx *gin.Context) {
 func (c *SystemController) DelMenu(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_DelMenu(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_DelMenu(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateMenu
@@ -302,7 +302,7 @@ func (c *SystemController) DelMenu(ctx *gin.Context) {
 func (c *SystemController) UpdateMenu(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_UpdateMenu(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_UpdateMenu(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // AddOrg
@@ -315,7 +315,7 @@ func (c *SystemController) UpdateMenu(ctx *gin.Context) {
 func (c *SystemController) AddOrg(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_AddOrg(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_AddOrg(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelOrg
@@ -328,7 +328,7 @@ func (c *SystemController) AddOrg(ctx *gin.Context) {
 func (c *SystemController) DelOrg(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_DelOrg(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_DelOrg(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateOrg
@@ -341,7 +341,7 @@ func (c *SystemController) DelOrg(ctx *gin.Context) {
 func (c *SystemController) UpdateOrg(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_UpdateOrg(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_UpdateOrg(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // GetOrgByUserid
@@ -354,7 +354,7 @@ func (c *SystemController) UpdateOrg(ctx *gin.Context) {
 func (c *SystemController) GetOrgByUserid(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_GetOrgByUserid(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_GetOrgByUserid(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // DelDomain
@@ -367,7 +367,7 @@ func (c *SystemController) GetOrgByUserid(ctx *gin.Context) {
 func (c *SystemController) DelDomain(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_DelDomain(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_DelDomain(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
 // UpdateDomain
@@ -380,6 +380,6 @@ func (c *SystemController) DelDomain(ctx *gin.Context) {
 func (c *SystemController) UpdateDomain(ctx *gin.Context) {
 	//
 	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
-	partial.System_UpdateDomain(&entitys.CtrlContext{ctx, db, c.apiengine.PlatformOrmEngine})
+	partial.System_UpdateDomain(&entitys.CtrlContext{c.apiengine,ctx, db, c.apiengine.PlatformOrmEngine})
 }
 

+ 0 - 1
controllers/partial/ApiController.go

@@ -19,7 +19,6 @@ import (
 // @Failure 403 :id is empty
 func Api_ApiDoc(c *entitys.CtrlContext) {
 	sys := c.Ctx.Query("sys")
-
 	ret := __none_func_api__(sys)
 	if ret{
 		c.Ctx.HTML(200, "api.tpl","")

+ 10 - 0
engine/apiengine.go

@@ -15,15 +15,25 @@ import (
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/xormplus/xorm"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 )
 
 type ApiEngine struct {
+	entitys.ApiEngineInterface
 	PlatformOrmEngine   *xorm.Engine
 	BusinessOrmEngine 	map[string]*xorm.Engine
 	GinEngine   		*gin.Engine
 	listen_addr 		string
 }
 
+func (g* ApiEngine)GetBusinessDb(domain string) *xorm.Engine{
+	return g.BusinessOrmEngine[domain]
+}
+
+func (g* ApiEngine)AddBusinessDb(domain string, engine *xorm.Engine){
+	g.BusinessOrmEngine[domain] = engine
+}
+
 func Default() *ApiEngine {
 	apiengine := NewApiEngine("mysql", config.AppConfig.DataSource, fmt.Sprintf(":%d", config.AppConfig.HttpPort))
 	return apiengine

+ 6 - 0
entitys/ctrl_context.go

@@ -5,7 +5,13 @@ import (
 	"github.com/xormplus/xorm"
 )
 
+type ApiEngineInterface interface {
+	GetBusinessDb(domain string) *xorm.Engine
+	AddBusinessDb(domain string, engine *xorm.Engine)
+}
+
 type CtrlContext struct {
+	App 			 ApiEngineInterface
 	Ctx              *gin.Context
 	Db               *xorm.Engine
 	PlatformDbEngine *xorm.Engine