区域、人员模板添加排序

controllers/partial/SystemController.go

@@ -1643,9 +1643,10 @@ func System_FindAreaTemplateDetailPage(c *entitys.CtrlContext) {
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 	del_flag := c.Ctx.Query("del_flag")
+	__sort__ := c.Ctx.Query("__sort__")
 	name := c.Ctx.Query("name")
 	temp_id := c.Ctx.Query("temp_id")
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "del_flag": del_flag, "name": name, "temp_id": temp_id}
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "del_flag": del_flag, "name": name, "temp_id": temp_id, "__sort__": __sort__}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_area_template_detail_page", "sys_area", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
@@ -1998,9 +1999,10 @@ func System_FindUserTemplateDetailPage(c *entitys.CtrlContext) {
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 	del_flag := c.Ctx.Query("del_flag")
+	__sort__ := c.Ctx.Query("__sort__")
 	name := c.Ctx.Query("name")
 	temp_id := c.Ctx.Query("temp_id")
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "del_flag": del_flag, "name": name, "temp_id": temp_id}
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "del_flag": del_flag, "name": name, "temp_id": temp_id, "__sort__": __sort__}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_user_template_detail_page", "sys_area", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})

middleware/login_ware.go

@@ -1,10 +1,8 @@
 package middleware
 
 import (
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/config"
 	sysmodels "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/wfclient"
 	"github.com/gin-gonic/gin"
 )
 
@@ -24,8 +22,8 @@ func LoginWare() gin.HandlerFunc {
 			return
 		}
 
-		wfendpoint := config.AppConfig.GetKey("wfendpoint")
-		wfclient.Instance().Init(wfendpoint, tk.UserId, tk.LoginID, tk.AccessToken, tk.Domain)
+		//wfendpoint := config.AppConfig.GetKey("wfendpoint")
+		//wfclient.Instance().Init(wfendpoint, tk.UserId, tk.LoginID, tk.AccessToken, tk.Domain)
 
 		c.Set("token", tk)
 		c.Set("user_id", tk.UserId)

routers/api_gen.go

@@ -1,28 +1,25 @@
-
 package routers
 
 import (
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/middleware"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
 )
 
-func init(){
+func init() {
 	addRegisterHandler(registerApiRouter)
 }
 
-func registerApiRouter(e *engine.ApiEngine){
-	api:=e.GinEngine.Group("/api")
-	v1:=api.Group("/v1/api")
-    _router["api"] = v1
+func registerApiRouter(e *engine.ApiEngine) {
+	api := e.GinEngine.Group("/api")
+	v1 := api.Group("/v1/api")
 	v1.Use(middleware.LoginWare())
-
+	if len(_router["api"]) > 0 {
+		v1.Use(_router["api"]...)
+	}
 	ctrler := gen.NewApiController(e)
 
-
-
-	v1.GET("/api_doc",ctrler.ApiDoc)
+	v1.GET("/api_doc", ctrler.ApiDoc)
 	//v1.POST("/api_doc",ctrler.ApiDoc)
 
 }
-

routers/router_gen.go

@@ -1,54 +1,50 @@
-
 package routers
 
 import (
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
-    "git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
-	"github.com/gin-gonic/gin"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
+	"github.com/gin-gonic/gin"
 	"sync"
 )
 
 var (
-	_registerHandlers []func(e *engine.ApiEngine) = nil
+	_registerHandlers     []func(e *engine.ApiEngine) = nil
 	_registerHandlerMutex sync.Mutex
-    _router       map[string]*gin.RouterGroup
+	_router               map[string][]gin.HandlerFunc
 )
 
-func addRegisterHandler(handler func(e *engine.ApiEngine)){
+func addRegisterHandler(handler func(e *engine.ApiEngine)) {
 	_registerHandlerMutex.Lock()
 	defer _registerHandlerMutex.Unlock()
-	if _registerHandlers == nil{
+	if _registerHandlers == nil {
 		_registerHandlers = make([]func(e *engine.ApiEngine), 0)
 	}
-	if _router == nil {
-		_router = make(map[string]*gin.RouterGroup)
-	}
 	_registerHandlers = append(_registerHandlers, handler)
 }
 
-func GetRouter(name string) *gin.RouterGroup {
+func UseMiddleware(name string, middle ...gin.HandlerFunc) {
 	if _router == nil {
-		return nil
+		_router = make(map[string][]gin.HandlerFunc)
 	}
-	return _router[name]
+	_router[name] = append(_router[name], middle...)
 }
 
-func Register(e *engine.ApiEngine){
-    e.AddAppMoudleInitFunc("light-apiengine", DbInitFunc)
+func Register(e *engine.ApiEngine) {
+	e.AddAppMoudleInitFunc("light-apiengine", DbInitFunc)
 	_registerHandlerMutex.Lock()
 	defer _registerHandlerMutex.Unlock()
-	for i := range _registerHandlers{
+	for i := range _registerHandlers {
 		_registerHandlers[i](e)
 	}
 }
 
-func DbInitFunc(domain string, e entitys.ApiEngineInterface)  {
-	if domain == ""{
-		for _,db := range e.GetAllBusinessDb() {
+func DbInitFunc(domain string, e entitys.ApiEngineInterface) {
+	if domain == "" {
+		for _, db := range e.GetAllBusinessDb() {
 			models.SyncDb(db)
 		}
-	}else {
+	} else {
 		db := e.GetBusinessDb(domain)
 		models.SyncDb(db)
 	}

routers/sso_gen.go

@@ -1,34 +1,31 @@
-
 package routers
 
 import (
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
-	
+
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
 )
 
-func init(){
+func init() {
 	addRegisterHandler(registerSsoRouter)
 }
 
-func registerSsoRouter(e *engine.ApiEngine){
-	api:=e.GinEngine.Group("/api")
-	v1:=api.Group("/v1/sso")
-    _router["sso"] = v1
-	
+func registerSsoRouter(e *engine.ApiEngine) {
+	api := e.GinEngine.Group("/api")
+	v1 := api.Group("/v1/sso")
 
+	if len(_router["sso"]) > 0 {
+		v1.Use(_router["sso"]...)
+	}
 	ctrler := gen.NewSsoController(e)
 
+	v1.GET("/login", ctrler.Login)
+	v1.POST("/login", ctrler.Login)
 
+	v1.GET("/logout", ctrler.Logout)
+	v1.POST("/logout", ctrler.Logout)
 
-	v1.GET("/login",ctrler.Login)
-	v1.POST("/login",ctrler.Login)
-
-	v1.GET("/logout",ctrler.Logout)
-	v1.POST("/logout",ctrler.Logout)
-
-	v1.GET("/token_validate",ctrler.TokenValidate)
-	v1.POST("/token_validate",ctrler.TokenValidate)
+	v1.GET("/token_validate", ctrler.TokenValidate)
+	v1.POST("/token_validate", ctrler.TokenValidate)
 
 }
-

routers/sys_attachment_gen.go

@@ -1,34 +1,31 @@
-
 package routers
 
 import (
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/middleware"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
 )
 
-func init(){
+func init() {
 	addRegisterHandler(registerSysAttachmentRouter)
 }
 
-func registerSysAttachmentRouter(e *engine.ApiEngine){
-	api:=e.GinEngine.Group("/api")
-	v1:=api.Group("/v1/sys_attachment")
-    _router["sys_attachment"] = v1
+func registerSysAttachmentRouter(e *engine.ApiEngine) {
+	api := e.GinEngine.Group("/api")
+	v1 := api.Group("/v1/sys_attachment")
 	v1.Use(middleware.LoginWare())
-
+	if len(_router["sys_attachment"]) > 0 {
+		v1.Use(_router["sys_attachment"]...)
+	}
 	ctrler := gen.NewSysAttachmentController(e)
 
-
-
 	//v1.GET("/upload",ctrler.Upload)
-	v1.POST("/upload",ctrler.Upload)
+	v1.POST("/upload", ctrler.Upload)
 
-	v1.GET("/download",ctrler.Download)
+	v1.GET("/download", ctrler.Download)
 	//v1.POST("/download",ctrler.Download)
 
-	v1.GET("/delete",ctrler.Delete)
+	v1.GET("/delete", ctrler.Delete)
 	//v1.POST("/delete",ctrler.Delete)
 
 }
-

routers/system_gen.go

@@ -13,9 +13,10 @@ func init() {
 func registerSystemRouter(e *engine.ApiEngine) {
 	api := e.GinEngine.Group("/api")
 	v1 := api.Group("/v1/system")
-	_router["system"] = v1
 	v1.Use(middleware.LoginWare())
-
+	if len(_router["system"]) > 0 {
+		v1.Use(_router["system"]...)
+	}
 	ctrler := gen.NewSystemController(e)
 
 	v1.GET("/sidebar", ctrler.Sidebar)

sqlconfig/system_controller/system_find_area_template_detail_page_select.tpl

@@ -14,4 +14,7 @@ where
 {{if ne .temp_id ""}}
 	and sys_area_template_detail.temp_id = '{{.temp_id}}'
 {{end}}
+{{if ne .__sort__ ""}}
+	order by {{.__sort__}}
+{{end}}
 LIMIT {{.rows}} OFFSET {{.offset}}

sqlconfig/system_controller/system_find_user_template_detail_page_select.tpl

@@ -14,4 +14,7 @@ where
 {{if ne .temp_id ""}}
 	and sys_user_template_detail.temp_id = '{{.temp_id}}'
 {{end}}
+{{if ne .__sort__ ""}}
+	order by {{.__sort__}}
+{{end}}
 LIMIT {{.rows}} OFFSET {{.offset}}