重新生成代码

controllers/gen/ApiController_gen.go

@@ -24,7 +24,7 @@ func NewApiController(e *engine.ApiEngine) *ApiController {
 // @Title ApiDoc
 // @Description api文档         
 // @Param	sys    string  false  "是否包含用户管理相关接口"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /api_doc  [get]
 func (c *ApiController) ApiDoc(ctx *gin.Context) {

controllers/gen/SsoController_gen.go

@@ -24,7 +24,7 @@ func NewSsoController(e *engine.ApiEngine) *SsoController {
 // @Title Login
 // @Description 用户登录         
 // @Param	logininfo      false  "登录信息"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /login  [post,get,put]
 func (c *SsoController) Login(ctx *gin.Context) {
@@ -36,7 +36,7 @@ func (c *SsoController) Login(ctx *gin.Context) {
 // Logout
 // @Title Logout
 // @Description 用户退出         
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /logout  [post,get]
 func (c *SsoController) Logout(ctx *gin.Context) {

controllers/gen/SysAttachmentController_gen.go

@@ -23,7 +23,7 @@ func NewSysAttachmentController(e *engine.ApiEngine) *SysAttachmentController {
 // Upload
 // @Title Upload
 // @Description 上传文件         
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /upload  [post]
 func (c *SysAttachmentController) Upload(ctx *gin.Context) {
@@ -36,7 +36,7 @@ func (c *SysAttachmentController) Upload(ctx *gin.Context) {
 // @Title Download
 // @Description 下载文件         
 // @Param	id    string  false  "文件ID"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /download  [get]
 func (c *SysAttachmentController) Download(ctx *gin.Context) {
@@ -49,7 +49,7 @@ func (c *SysAttachmentController) Download(ctx *gin.Context) {
 // @Title Delete
 // @Description 删除文件         
 // @Param	id    string  false  "文件ID"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /delete  [get]
 func (c *SysAttachmentController) Delete(ctx *gin.Context) {

controllers/gen/SystemController_gen.go

@@ -24,7 +24,7 @@ func NewSystemController(e *engine.ApiEngine) *SystemController {
 // @Title GetNavTree
 // @Description 获取导航菜单         
 // @Param	user    string  false  "用户id"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_nav_tree  [post,get]
 func (c *SystemController) GetNavTree(ctx *gin.Context) {
@@ -37,7 +37,7 @@ func (c *SystemController) GetNavTree(ctx *gin.Context) {
 // @Title GetMenuTree
 // @Description 获取系统菜单         
 // @Param	user    string  false  "用户id"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_menu_tree  [post,get]
 func (c *SystemController) GetMenuTree(ctx *gin.Context) {
@@ -49,7 +49,7 @@ func (c *SystemController) GetMenuTree(ctx *gin.Context) {
 // FindUserPage
 // @Title FindUserPage
 // @Description 获取用户分页数         
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_user_page  [get,post]
 func (c *SystemController) FindUserPage(ctx *gin.Context) {
@@ -61,7 +61,7 @@ func (c *SystemController) FindUserPage(ctx *gin.Context) {
 // GetOrgTree
 // @Title GetOrgTree
 // @Description 获取组织架构树         
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /get_org_tree  [get,post]
 func (c *SystemController) GetOrgTree(ctx *gin.Context) {
@@ -77,7 +77,7 @@ func (c *SystemController) GetOrgTree(ctx *gin.Context) {
 // @Param	password    string  false  "密码"  
 // @Param	org_id    string  false  "组织ID"  
 // @Param	email    string  false  "邮箱"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_user  [post,get,put]
 func (c *SystemController) AddUser(ctx *gin.Context) {
@@ -90,7 +90,7 @@ func (c *SystemController) AddUser(ctx *gin.Context) {
 // @Title DelUser
 // @Description 删除用户         
 // @Param	id    string  false  "用户ID"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_user  [post,get,put]
 func (c *SystemController) DelUser(ctx *gin.Context) {
@@ -106,7 +106,7 @@ func (c *SystemController) DelUser(ctx *gin.Context) {
 // @Param	password    string  false  "密码"  
 // @Param	org_id    string  false  "组织ID"  
 // @Param	email    string  false  "邮箱"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_user  [post,get,put]
 func (c *SystemController) UpdateUser(ctx *gin.Context) {
@@ -120,7 +120,7 @@ func (c *SystemController) UpdateUser(ctx *gin.Context) {
 // @Description 添加角色         
 // @Param	name    string  false  "角色名称"  
 // @Param	remark    string  false  "备注"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_role  [post,get,put]
 func (c *SystemController) AddRole(ctx *gin.Context) {
@@ -133,7 +133,7 @@ func (c *SystemController) AddRole(ctx *gin.Context) {
 // @Title DelRole
 // @Description 添加角色         
 // @Param	id    string  false  "角色ID"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_role  [post,get,put]
 func (c *SystemController) DelRole(ctx *gin.Context) {
@@ -148,7 +148,7 @@ func (c *SystemController) DelRole(ctx *gin.Context) {
 // @Param	id    string  false  "角色ID"  
 // @Param	name    string  false  "角色名称"  
 // @Param	remark    string  false  "备注"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_role  [post,get,put]
 func (c *SystemController) UpdateRole(ctx *gin.Context) {
@@ -161,7 +161,7 @@ func (c *SystemController) UpdateRole(ctx *gin.Context) {
 // @Title FindRolePage
 // @Description 角色分页         
 // @Param	page      false  "分页参数"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_role_page  [post,get,put]
 func (c *SystemController) FindRolePage(ctx *gin.Context) {
@@ -174,7 +174,7 @@ func (c *SystemController) FindRolePage(ctx *gin.Context) {
 // @Title FindRoleMenu
 // @Description 查找角色权限         
 // @Param	role_id    string  false  "角色id"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_role_menu  [post,get,put]
 func (c *SystemController) FindRoleMenu(ctx *gin.Context) {
@@ -187,7 +187,7 @@ func (c *SystemController) FindRoleMenu(ctx *gin.Context) {
 // @Title SaveRoleMenu
 // @Description 保存角色权限         
 // @Param	role_menu    string  false  "角色权限"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /save_role_menu  [post,get,put]
 func (c *SystemController) SaveRoleMenu(ctx *gin.Context) {
@@ -199,7 +199,7 @@ func (c *SystemController) SaveRoleMenu(ctx *gin.Context) {
 // RoleAll
 // @Title RoleAll
 // @Description 查找所有角色         
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /role_all  [post,get,put]
 func (c *SystemController) RoleAll(ctx *gin.Context) {
@@ -211,7 +211,7 @@ func (c *SystemController) RoleAll(ctx *gin.Context) {
 // FindPermissions
 // @Title FindPermissions
 // @Description 查找用户权限         
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /find_permissions  [post,get,put]
 func (c *SystemController) FindPermissions(ctx *gin.Context) {
@@ -224,7 +224,7 @@ func (c *SystemController) FindPermissions(ctx *gin.Context) {
 // @Title AddMenu
 // @Description 添加菜单         
 // @Param	    string  false  "菜单"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /add_menu  [post,get,put]
 func (c *SystemController) AddMenu(ctx *gin.Context) {
@@ -237,7 +237,7 @@ func (c *SystemController) AddMenu(ctx *gin.Context) {
 // @Title DelMenu
 // @Description 删除菜单         
 // @Param	id    string  false  "菜单ID"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /del_menu  [post,get,put]
 func (c *SystemController) DelMenu(ctx *gin.Context) {
@@ -250,7 +250,7 @@ func (c *SystemController) DelMenu(ctx *gin.Context) {
 // @Title UpdateMenu
 // @Description 更新菜单         
 // @Param	    string  false  "菜单"  
-// @Success 200 {object} models.sysReturn
+// @Success 200 {object} sysReturn
 // @Failure 403 :id is empty
 // @router /update_menu  [post,get,put]
 func (c *SystemController) UpdateMenu(ctx *gin.Context) {

controllers/partial/ApiController.go

@@ -3,22 +3,26 @@ package partial
 
 import (
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
+	//sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
+    //sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+	//"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 )
 
 
+
+
 // _ApiDoc
 // @Title _ApiDoc
-// @Description api文档
-// @Param	sys    string  false  "是否包含用户管理相关接口"
-// @Success 200 {object} models.Account
+// @Description api文档         
+// @Param	sys    string  false  "是否包含用户管理相关接口"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func Api_ApiDoc(c *entitys.CtrlContext) {
-	sys := c.Ctx.Param(":sys")
-	ret := __none_func_api__(sys)
+	sys := c.Ctx.Query("sys")
 
+	ret := __none_func_api__(sys)
 	if ret{
-		//c.Ctx.String(200,"")
-		c.Ctx.HTML(200, "api.tpl","")
+		c.Ctx.String(200,"")
 	}
 }
 

controllers/partial/SsoController.go

@@ -4,80 +4,37 @@ package partial
 import (
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
-	"time"
-	"strings"
-	"strconv"
-	"fmt"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+    //sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 )
 
+
+
+
 // _Login
 // @Title _Login
 // @Description 用户登录         
 // @Param	logininfo      false  "登录信息"  
-// @Success 200 {object} models.Account
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func Sso_Login(c *entitys.CtrlContext) {
-
-	var logininfo sysmodel.LoginInfo
-	c.Ctx.BindJSON(&logininfo)
-	//fmt.Println(logininfo)
-	var user sysmodel.SysUser
-	ret, err := c.PlatformDbEngine.SQL(sysmodel.SqlUserLogin, logininfo.Account).Get(&user)
-	if ret && err == nil {
-		//TODO check password
-		timestamp := uint64(time.Now().UnixNano())
-		md5Pwd := utils.HashPassword(logininfo.Password, "")
-
-		//密码错误
-		if !strings.EqualFold(user.Password, md5Pwd) {
-			c.Ctx.JSON(200, sysmodel.SysReturn{400, "passowrd incorrect!", nil})
-			return
-		}
-
-		token := &entitys.Token{}
-		timestamp_str := strconv.FormatUint(timestamp, 10)
-		sec_tooken := utils.GenerateToken(logininfo.Account + timestamp_str)
-
-		if v := utils.GetGlobalTokenStore().Get(sec_tooken); v == nil {
-			token.AccessToken = sec_tooken
-			token.RefreshToken = sec_tooken
-			token.LoginID = logininfo.Account
-			token.UserId = user.Id
-			token.Result = 200
-			//token.Password = pwd
-			token.ServerIp = ""
-			token.Domain = user.Domain
-			utils.GetGlobalTokenStore().Set(sec_tooken, token)
-		} else {
-			token = v
-		}
-
-		data := sysmodel.LoginReturnInfo{}
-		data.Id = user.Id
-		data.LoginId = user.LoginId
-		data.Token = token.AccessToken
-		data.Type = user.Type
-		data.Domain = user.Domain
-
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", data})
-	} else {
-		//fmt.Println(err.Error())
-		c.Ctx.JSON(200, sysmodel.SysReturn{400, "username or passowrd incorrect!", nil})
+	var paramObj0 models.LoginInfo 
+	c.Ctx.BindJSON(&paramObj0)
+	ret := __none_func_sso__(paramObj0)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _Logout
 // @Title _Logout
 // @Description 用户退出         
-// @Success 200 {object} models.Account
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func Sso_Logout(c *entitys.CtrlContext) {
-
-	token := c.Ctx.GetHeader("token")
-	fmt.Println("delete token: ", token)
-	utils.GetGlobalTokenStore().Remove(token)
-
+	
 	ret := __none_func_sso__()
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})

controllers/partial/SysAttachmentController.go

@@ -1,166 +1,66 @@
+
 package partial
 
 import (
-	"bytes"
-	"fmt"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/logs"
-	"io"
-	"mime"
-	"strconv"
-	"strings"
-
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
-	"log"
-	"path"
-	"time"
+    //sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+	//"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 )
 
+
+
+
 // _Upload
 // @Title _Upload
-// @Description 上传文件
-// @Success 200 {object} models.Account
+// @Description 上传文件         
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func SysAttachment_Upload(c *entitys.CtrlContext) {
-
-	// 单文件
-	file, _ := c.Ctx.FormFile("file")
-	f, _ := file.Open()
-	log.Println(file.Filename)
-
-	download, hash, length, err := utils.PostFile(f)
-
-	if err != nil {
-		logs.Error("PostFile err: ", err.Error())
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	attach := &sysmodel.SysAttachment{}
-	attach.Id = utils.NewUUID()
-	attach.Name = file.Filename
-	attach.Size = length
-	attach.Url = download
-	attach.CreateTime = time.Now()
-	attach.Ext = path.Ext(attach.Name)
-	attach.Hash = hash
-
-	//插入数据库
-	_, err = c.Db.Insert(attach)
-	if err != nil {
-		logs.Error("Insert Attachment err: ", err.Error())
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
+	
 	ret := __none_func_sys_attachment__()
 	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", attach.Id})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _Download
 // @Title _Download
-// @Description 下载文件
-// @Param	id      false  "文件ID"
-// @Success 200 {object} models.Account
+// @Description 下载文件         
+// @Param	id    string  false  "文件ID"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func SysAttachment_Download(c *entitys.CtrlContext) {
-	gt := c.Ctx.GetString("get_thumb")
-	attrId := c.Ctx.Param("attrId")
-	fmt.Println("--------", attrId)
-	var attach sysmodel.SysAttachment
-	_, err := c.Db.Id(attrId).Get(&attach)
-	if err != nil {
-		logs.Error("获取附件出错了:", err)
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	logs.Debug("开始下载附件:", attach.Name, attach.Size)
-
-	durl := attach.Url
-	if gt != "" {
-		durl += "?getthumb=" + gt
-	}
-
-	resultBody, err := utils.GetFile(durl)
-	if err != nil {
-		logs.Error("下载附件出错了:", err)
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-	defer resultBody.Close()
-
-	bbuf := bytes.NewBuffer([]byte{})
-
-	c.Ctx.Header("Content-Disposition", "attachment;filename=\""+utils.FormatForBrowse(c.Ctx.Request.UserAgent(), attach.Name)+"\"")
-	c.Ctx.Header("Content-Type", strings.Replace(mime.TypeByExtension(attach.Ext), "charset=utf-8", "", -1))
-
-	buff := make([]byte, 1024)
-	var ssize int64 = 0
-
-	for {
-		n, err := io.ReadFull(resultBody, buff)
-		if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
-			logs.Error("下载附件出错了:", err)
-			c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-			return
-		}
-		if n <= 0 {
-			break
-		}
-		bbuf.Write(buff[:n])
-		ssize += int64(n)
-	}
-
-	c.Ctx.Header("Content-Length", strconv.FormatInt(ssize, 10))
-	_, err = c.Ctx.Writer.Write(bbuf.Bytes())
-
-	if err != nil {
-		logs.Error("输出流断开:", attach.Name, attach.Size)
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	logs.Debug("下载附件成功:", attach.Name, attach.Size)
-
-	ret := __none_func_sys_attachment__(attrId)
+	id := c.Ctx.Query("id")
 
+	ret := __none_func_sys_attachment__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _Delete
 // @Title _Delete
-// @Description 删除文件
-// @Param	id      false  "文件ID"
-// @Success 200 {object} models.Account
+// @Description 删除文件         
+// @Param	id    string  false  "文件ID"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func SysAttachment_Delete(c *entitys.CtrlContext) {
-	attrId := c.Ctx.Param("attrId")
-	var attach sysmodel.SysAttachment
-	_, err := c.Db.ID(attrId).Delete(&attach)
-
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
+	id := c.Ctx.Query("id")
 
-	ret := __none_func_sys_attachment__(attrId)
+	ret := __none_func_sys_attachment__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
-func __none_func_sys_attachment__(params ...interface{}) bool {
+
+func __none_func_sys_attachment__(params ... interface{}) bool{
 	return true
 }

controllers/partial/SystemController.go

@@ -1,117 +1,81 @@
+
 package partial
 
 import (
-	"fmt"
-	"time"
-
-	//"git.qianqiusoft.com/qianqiusoft/light-apiengine/db"
 	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	sysmodel "git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+    sysutils "git.qianqiusoft.com/qianqiusoft/light-apiengine/utils"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 )
 
-//https://www.kancloud.cn/xormplus/xorm/167077
+
+
 
 // _GetNavTree
 // @Title _GetNavTree
-// @Description 获取导航菜单
-// @Param	user    string  false  "用户id"
-// @Success 200 {object} models.Account
+// @Description 获取导航菜单         
+// @Param	user    string  false  "用户id"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_GetNavTree(c *entitys.CtrlContext) {
-	// set in the login_ware.go
-	user_id := c.Ctx.GetString("user_id")
-
-	var menus []sysmodel.SysMenuTree
-	if user_id == "187c50a4-caad-4557-80c8-aca81af9f370" {
-		c.Db.SQL(sysmodel.Selectall_nav_tree_admin).Find(&menus)
-	} else {
-		c.Db.SQL(sysmodel.Selectall_nav_tree, user_id).Find(&menus)
-	}
+	user := c.Ctx.Query("user")
 
-	var menutree []sysmodel.SysMenuTree
-	finChildrenMenu(&menus, "", nil, &menutree)
-	for i := 0; i < len(menutree); i++ {
-		finChildrenMenu(&menus, menutree[i].Id, &menutree[i], &menutree)
+	ret := __none_func_system__(user)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
-	fmt.Println(menutree)
-	c.Ctx.JSON(200, sysmodel.SysReturn{200, "", menutree})
 }
 
 // _GetMenuTree
 // @Title _GetMenuTree
-// @Description 获取系统菜单
-// @Param	user    string  false  "用户id"
-// @Success 200 {object} sysmodel.Account
+// @Description 获取系统菜单         
+// @Param	user    string  false  "用户id"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_GetMenuTree(c *entitys.CtrlContext) {
+	user := c.Ctx.Query("user")
 
-	user := c.Ctx.Param(":user")
 	ret := __none_func_system__(user)
-	var menus []sysmodel.SysMenuTree
-	c.Db.SQL(sysmodel.Selectall_sys_menu).Find(&menus)
-
-	var menutree []sysmodel.SysMenuTree
-	finChildrenMenu(&menus, "", nil, &menutree)
-
-	fmt.Println(menutree)
-	for i := 0; i < len(menutree); i++ {
-		finChildrenMenu(&menus, menutree[i].Id, &menutree[i], &menutree)
-	}
 	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", menutree})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
-
 }
 
-// _GetOrgTree
-// @Title _GetOrgTree
-// @Description 获取组织架构树
-// @Success 200 {object} sysmodel.Account
+// _FindUserPage
+// @Title _FindUserPage
+// @Description 获取用户分页数         
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
-func System_GetOrgTree(c *entitys.CtrlContext) {
-
-	paramMap_i_t := map[string]interface{}{"sort": "name"}
-	result, err := utils.TreeSearch(c.Db, "system","get_org_tree", "sys_org", paramMap_i_t)
-
+func System_FindUserPage(c *entitys.CtrlContext) {
+	
+	var page int64  = c.Ctx.GetInt64("page")
+	var rows int64 = c.Ctx.GetInt64("rows")
+	
+	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
+	result, err := sysutils.PageSearch(c.Db,"system","find_user_page", "sys_user", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
 	}else{
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
-}
 
-func finChildrenMenu(menus *[]sysmodel.SysMenuTree, parent string, parent_menu *sysmodel.SysMenuTree, menutree *[]sysmodel.SysMenuTree) {
-	for _, m := range *menus {
-		if m.Parent == parent {
-			if parent_menu == nil {
-				m.Level = 0
-				m.ParentName = ""
-				*menutree = append(*menutree, m)
-				//finChildrenMenu(menus, m.Id, menutree[len(*menutree)-1], menutree)
-			} else {
-				m.Level = parent_menu.Level + 1
-				m.ParentName = parent_menu.Name
-				parent_menu.Children = append(parent_menu.Children, m)
-				finChildrenMenu(menus, m.Id, &parent_menu.Children[len(parent_menu.Children)-1], menutree)
-			}
-		}
-	}
 }
 
-// _FindUserPage
-// @Title _FindUserPage
-// @Description 获取用户分布数据
-// @Param	page      false  "分页参数"
-// @Success 200 {object} sysmodel.Account
+// _GetOrgTree
+// @Title _GetOrgTree
+// @Description 获取组织架构树         
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
-func System_FindUserPage(c *entitys.CtrlContext) {
-
-	var page int64  = c.Ctx.GetInt64("page")
-	var rows int64 = c.Ctx.GetInt64("rows")
-
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
-	result, err := utils.PageSearch(c.Db,"system","find_user_page", "sys_user", paramMap_i_t)
+func System_GetOrgTree(c *entitys.CtrlContext) {
+	
+	
+	paramMap_i_t := map[string]interface{}{"sort": "name"}
+	result, err := sysutils.TreeSearch(c.Db, "system","get_org_tree", "sys_org", paramMap_i_t)
+	
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
 	}else{
@@ -122,805 +86,257 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 
 // _AddUser
 // @Title _AddUser
-// @Description 添加用户
-// @Param	login_id    string  false  "登录ID"
-// @Param	password    string  false  "密码"
-// @Param	org_id    string  false  "组织ID"
-// @Param	email    string  false  "邮箱"
-// @Success 200 {object} models.Account
+// @Description 添加用户         
+// @Param	login_id    string  false  "登录ID"  
+// @Param	password    string  false  "密码"  
+// @Param	org_id    string  false  "组织ID"  
+// @Param	email    string  false  "邮箱"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_AddUser(c *entitys.CtrlContext) {
+	login_id := c.Ctx.Query("login_id")
+password := c.Ctx.Query("password")
+org_id := c.Ctx.Query("org_id")
+email := c.Ctx.Query("email")
 
-	var user sysmodel.SysUser
-	err := c.Ctx.ShouldBindJSON(&user)
-	if err != nil {
-		c.Ctx.JSON(500, sysmodel.SysReturn{200, "c.Ctx.ShouldBindJSON error " + err.Error(), nil})
-		return
-	}
-
-	fmt.Println(user.LoginId, "-----add user-----", user.Password, " --- ", user.OrgId)
-
-	//查找login_id是否存在
-	oldUser := new(sysmodel.SysUser)
-	count, _ := c.Db.SQL("select * from sys_user").Where("login_id = ?", user.LoginId).Count(&oldUser)
-
-	if count > 1 {
-		if oldUser.DelFlag == 1 {
-			oldUser.DelFlag = 0
-			_, err := c.Db.Id("id").Cols("del_flag").Update(&oldUser)
-			if err != nil {
-				c.Ctx.JSON(500, sysmodel.SysReturn{500, "login_id exit, update err: " + err.Error(), nil})
-			}
-			return
-		} else {
-			c.Ctx.JSON(200, sysmodel.SysReturn{200, "login_id exit", nil})
-			return
-		}
-	}
-
-	user_id := c.Ctx.GetString("user_id")
-
-	user.Id = utils.NewUUID()
-	//when name is null
-	if user.Name == "" {
-		user.Name = user.LoginId
-	}
-	user.CreateTime = time.Now()
-	user.LastUpdateDate = time.Now()
-	user.CreateBy = user_id
-	user.LastUpdateBy = user_id
-	user.DelFlag = 0
-	user.Password = utils.HashPassword(user.Password, "")
-
-	_, err = c.Db.Insert(&user)
-
-	ret := __none_func_system__(user.LoginId, user.Password, user.OrgId, user.Email)
-	if ret && err == nil {
+	ret := __none_func_system__(login_id,password,org_id,email)
+	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _DelUser
 // @Title _DelUser
-// @Description 删除用户
-// @Param	id    string  false  "用户ID"
-// @Success 200 {object} models.Account
+// @Description 删除用户         
+// @Param	id    string  false  "用户ID"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelUser(c *entitys.CtrlContext) {
-	type Param struct {
-		Id string `json:"id"`
-	}
-
-	var params []Param
-	c.Ctx.BindJSON(&params)
-
-	ids := []string{}
-	for _, param := range params {
-		ids = append(ids, param.Id)
-	}
-
-	session := c.Db.NewSession()
-	defer session.Close()
-
-	//_, err := c.Db.Table(new(models.SysUser)).ID(param.Id).Update(map[string]interface{}{"del_flag": 0})
-	_, err := c.Db.Table(new(sysmodel.SysUser)).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
-	if err != nil {
-		session.Rollback()
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	_, err = c.Db.Table(new(sysmodel.SysUserRole)).In("user_id", ids).Update(map[string]interface{}{"del_flag": 1})
-	if err != nil {
-		session.Rollback()
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
+	id := c.Ctx.Query("id")
 
-	session.Commit()
-
-	ret := __none_func_system__()
+	ret := __none_func_system__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _UpdateUser
 // @Title _UpdateUser
-// @Description 修改用户
-// @Param	login_id    string  false  "登录ID"
-// @Param	password    string  false  "密码"
-// @Param	org_id    string  false  "组织ID"
-// @Param	email    string  false  "邮箱"
-// @Success 200 {object} models.Account
+// @Description 修改用户         
+// @Param	login_id    string  false  "登录ID"  
+// @Param	password    string  false  "密码"  
+// @Param	org_id    string  false  "组织ID"  
+// @Param	email    string  false  "邮箱"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateUser(c *entitys.CtrlContext) {
-	user_id := c.Ctx.GetString("user_id")
-	user_id = user_id
-
-	/*var userInfo sysmodel.UserInfo
-	err := c.Ctx.BindJSON(&userInfo)
-	if err != nil {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	session := c.Db.NewSession()
-	defer session.Close()
-	//1、删除用户角色
-	_, err = c.Db.SQL(sysmodel.SqlDeleteUserRoles, userInfo.Id).Execute()
-	if err != nil {
-		session.Rollback()
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	//2、修改角色
-	userRoles := []sysmodel.SysUserRole{}
-	roles := []string{}
-	if userInfo.UserRole != "" {
-		err = json.Unmarshal([]byte(userInfo.UserRole), &roles)
-		if err != nil {
-			session.Rollback()
-			c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-			return
-		}
-	}
-
-	for _, role := range roles {
-		userRole := sysmodel.SysUserRole{}
-		userRole.Id = utils.NewUUID()
-		userRole.RoleId = role
-		userRole.UserId = userInfo.Id
-		userRole.CreateBy = user_id
-		userRole.LastUpdateBy = user_id
-		userRole.CreateTime = time.Now()
-		userRole.LastUpdateDate = time.Now()
-		userRole.DelFlag = 0
-		userRoles = append(userRoles, userRole)
-	}
-	_, err = c.Db.Insert(userRoles)
-	if err != nil {
-		session.Rollback()
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	var updateUser sysmodel.SysUser
-
-	updateUser.Name = userInfo.Name
-	updateUser.FullName = userInfo.FullName
-	updateUser.Mobile = userInfo.Mobile
-	updateUser.OrgId = userInfo.OrgId
-	updateUser.Type = userInfo.Type
-	updateUser.Status = userInfo.Status
-	updateUser.Domain = userInfo.Domain
-	updateUser.OptionA = userInfo.OptionA
-	updateUser.OptionB = userInfo.OptionB
-	updateUser.LastUpdateBy = user_id
-	updateUser.LastUpdateDate = time.Now()
-
-	//3、更新用户信息
-	//_, err = c.Db.Table(new(models.SysUser)).ID(userInfo.Id).Update(map[string]interface{}{"name": userInfo.Name, "email": userInfo.Email, "org_id": userInfo.OrgId, "last_update_by": user_id, "last_update_date": time.Now()})
-
-	_, err = c.Db.Id(userInfo.Id).Update(&updateUser)
-
-	if err != nil {
-		session.Rollback()
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
+	login_id := c.Ctx.Query("login_id")
+password := c.Ctx.Query("password")
+org_id := c.Ctx.Query("org_id")
+email := c.Ctx.Query("email")
 
-	session.Commit()
-*/
-	ret := __none_func_system__()
+	ret := __none_func_system__(login_id,password,org_id,email)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _AddRole
 // @Title _AddRole
-// @Description 添加角色
-// @Param	name    string  false  "角色名称"
-// @Param	remark    string  false  "备注"
-// @Success 200 {object} models.Account
+// @Description 添加角色         
+// @Param	name    string  false  "角色名称"  
+// @Param	remark    string  false  "备注"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_AddRole(c *entitys.CtrlContext) {
-	var role sysmodel.SysRole
-	c.Ctx.BindJSON(&role)
-
-	user_id := c.Ctx.GetString("user_id")
+	name := c.Ctx.Query("name")
+remark := c.Ctx.Query("remark")
 
-	role.Id = utils.NewUUID()
-	role.DelFlag = 0
-	role.CreateBy = user_id
-	role.LastUpdateBy = user_id
-	role.CreateTime = time.Now()
-	role.LastUpdateDate = time.Now()
-
-	_, err := c.Db.Insert(&role)
-
-	ret := __none_func_system__()
-	if ret && err == nil {
+	ret := __none_func_system__(name,remark)
+	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _DelRole
 // @Title _DelRole
-// @Description 添加角色
-// @Param	id    string  false  "角色ID"
-// @Success 200 {object} models.Account
+// @Description 添加角色         
+// @Param	id    string  false  "角色ID"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelRole(c *entitys.CtrlContext) {
-	type Param struct {
-		Id string `json:"id"`
-	}
-
-	var params []Param
-	c.Ctx.BindJSON(&params)
-	fmt.Println(params, "-----------")
-	ids := []string{}
-	for _, param := range params {
-		ids = append(ids, param.Id)
-	}
-
-	_, err := c.Db.Table(new(sysmodel.SysRole)).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
+	id := c.Ctx.Query("id")
 
-	ret := __none_func_system__()
+	ret := __none_func_system__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _UpdateRole
 // @Title _UpdateRole
-// @Description 修改角色
-// @Param	id    string  false  "角色ID"
-// @Param	name    string  false  "角色名称"
-// @Param	remark    string  false  "备注"
-// @Success 200 {object} models.Account
+// @Description 修改角色         
+// @Param	id    string  false  "角色ID"  
+// @Param	name    string  false  "角色名称"  
+// @Param	remark    string  false  "备注"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateRole(c *entitys.CtrlContext) {
+	id := c.Ctx.Query("id")
+name := c.Ctx.Query("name")
+remark := c.Ctx.Query("remark")
 
-	var role sysmodel.SysRole
-	c.Ctx.BindJSON(&role)
-
-	user_id := c.Ctx.GetString("user_id")
-
-	role.LastUpdateBy = user_id
-	role.LastUpdateDate = time.Now()
-
-	c.Db.ID(role.Id).Update(&role)
-
-	ret := __none_func_system__()
+	ret := __none_func_system__(id,name,remark)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _FindRolePage
 // @Title _FindRolePage
-// @Description 角色分页
-// @Param	page      false  "分页参数"
-// @Success 200 {object} models.Account
+// @Description 角色分页         
+// @Param	page      false  "分页参数"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_FindRolePage(c *entitys.CtrlContext) {
-	var getpageinfo sysmodel.GetPageInfo
-	c.Ctx.BindJSON(&getpageinfo)
-
-	page := sysmodel.PageResult{}
-	var roles []sysmodel.SysRole
-	err := c.Db.SQL(sysmodel.Selectall_sys_role).Limit(getpageinfo.PageSize, (getpageinfo.PageNum-1)*getpageinfo.PageSize).Find(&roles)
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-	fmt.Println("-----------", len(roles))
-	page.Content = roles
-	page.PageSize = getpageinfo.PageSize
-	page.PageNum = getpageinfo.PageNum
-	page.TotalSize = 1
-
-	ret := __none_func_system__(getpageinfo)
+	var paramObj0 models.GetPageInfo 
+	c.Ctx.BindJSON(&paramObj0)
+	ret := __none_func_system__(paramObj0)
 	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", page})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _FindRoleMenu
 // @Title _FindRoleMenu
-// @Description 查找角色权限
-// @Param	user    string  false  "用户id"
-// @Success 200 {object} models.Account
+// @Description 查找角色权限         
+// @Param	role_id    string  false  "角色id"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_FindRoleMenu(c *entitys.CtrlContext) {
+	role_id := c.Ctx.Query("role_id")
 
-	role_id, b := c.Ctx.GetQuery("roleId")
-	if !b {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "roleId is null", nil})
-		return
-	}
-
-	menus := []sysmodel.SysMenu{}
-	c.Db.SQL(sysmodel.SqlFindRoleMenu, role_id).Find(&menus)
-
-	ret := __none_func_system__()
+	ret := __none_func_system__(role_id)
 	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", menus})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _SaveRoleMenu
 // @Title _SaveRoleMenu
-// @Description 保存角色权限
-// @Param	role_menu    string  false  "角色权限"
-// @Success 200 {object} models.Account
+// @Description 保存角色权限         
+// @Param	role_menu    string  false  "角色权限"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_SaveRoleMenu(c *entitys.CtrlContext) {
-	var saverolemenu []sysmodel.SysRoleMenu
-
-	c.Ctx.BindJSON(&saverolemenu)
-
-	if len(saverolemenu) < 1 {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "role menu length is error", nil})
-		return
-	}
-
-	session := c.Db.NewSession()
-	defer session.Close()
-	err := session.Begin()
-
-	//删除角色下的menu
-	_, err = c.Db.Exec("delete from sys_role_menu where role_id = ?", saverolemenu[0].RoleId)
-	//_, err = c.Db.Exec("delete from sys_role_menu where id = 1")
-	if err != nil {
-		session.Rollback()
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	for i, _ := range saverolemenu {
-		saverolemenu[i].Id = utils.NewUUID()
-		saverolemenu[i].DelFlag = 1
-	}
-
-	_, err = c.Db.Insert(&saverolemenu)
-	if err != nil {
-		session.Rollback()
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	session.Commit()
-
-	ret := __none_func_system__(&saverolemenu)
+	var paramObj0 []models.SaveRoleMenu 
+	c.Ctx.BindJSON(&paramObj0)
+	ret := __none_func_system__(paramObj0)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _RoleAll
 // @Title _RoleAll
-// @Description 查找所有角色
-// @Success 200 {object} models.Account
+// @Description 查找所有角色         
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_RoleAll(c *entitys.CtrlContext) {
-
-	var roles []sysmodel.SysRole
-	err := c.Db.SQL(sysmodel.Selectall_sys_role).Find(&roles)
-
+	
 	ret := __none_func_system__()
-	if ret && err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", roles})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _FindPermissions
 // @Title _FindPermissions
-// @Description 查找用户权限
-// @Success 200 {object} models.Account
+// @Description 查找用户权限         
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_FindPermissions(c *entitys.CtrlContext) {
-
-	user_id := c.Ctx.GetString("user_id")
-
-	//result, err := c.Db.Query(models.SqlFindUserPermissions, op.UserId)
-
-	result, err := c.Db.QueryString(sysmodel.SqlFindUserPermissions, user_id)
-
-	strs := []string{}
-	for _, v := range result {
-		strs = append(strs, v["perms"])
-	}
-
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-	}
-
+	
 	ret := __none_func_system__()
-
-	//strs = []string{"sys:menu:add", "sys:menu:view", "sys:menu:edit", "sys:menu:delete", "sys:user:edit", "sys:user:delete", "sys:user:add", "sys:role:view", "sys:role:edit", "sys:role:delete", "sys:role:add"}
-
 	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strs})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _AddMenu
 // @Title _AddMenu
-// @Description 添加菜单
-// @Param	    string  false  "菜单"
-// @Success 200 {object} models.Account
+// @Description 添加菜单         
+// @Param	    string  false  "菜单"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_AddMenu(c *entitys.CtrlContext) {
-	var sysmenu sysmodel.SysMenu
-	c.Ctx.BindJSON(&sysmenu)
-
-	user_id := c.Ctx.GetString("user_id")
-
-	sysmenu.Id = utils.NewUUID()
-	sysmenu.CreateBy = user_id
-	sysmenu.LastUpdateBy = user_id
-	sysmenu.LastUpdateDate = time.Now()
-	sysmenu.CreateTime = time.Now()
-	sysmenu.DelFlag = 0
-
-	_, err := c.Db.Insert(&sysmenu)
-	if err != nil {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	ret := __none_func_system__(sysmenu)
+	var paramObj0 models.SysMenu 
+	c.Ctx.BindJSON(&paramObj0)
+	ret := __none_func_system__(paramObj0)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
+	}else{
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _DelMenu
 // @Title _DelMenu
-// @Description 删除菜单
-// @Param	id    string  false  "菜单ID"
-// @Success 200 {object} models.Account
+// @Description 删除菜单         
+// @Param	id    string  false  "菜单ID"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelMenu(c *entitys.CtrlContext) {
-	type Param struct {
-		Id string `json:"id"`
-	}
-
-	var params []Param
-	c.Ctx.BindJSON(&params)
-	fmt.Println(params, "-----------")
-	ids := []string{}
-	for _, param := range params {
-		ids = append(ids, param.Id)
-	}
+	id := c.Ctx.Query("id")
 
-	_, err := c.Db.Table(new(sysmodel.SysMenu)).In("id", ids).Update(map[string]interface{}{"del_flag": 0})
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	ret := __none_func_system__()
+	ret := __none_func_system__(id)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}else{
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
 // _UpdateMenu
 // @Title _UpdateMenu
-// @Description 更新菜单
-// @Param	    string  false  "菜单"
-// @Success 200 {object} models.Account
+// @Description 更新菜单         
+// @Param	    string  false  "菜单"  
+// @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_UpdateMenu(c *entitys.CtrlContext) {
-	var sysmenu sysmodel.SysMenu
-	err := c.Ctx.BindJSON(&sysmenu)
-	if err != nil{
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	user_id := c.Ctx.GetString("user_id")
-
-	whereMenu := &sysmodel.SysMenu{}
-	whereMenu.Id = sysmenu.Id
-
-	sysmenu.LastUpdateBy = user_id
-	sysmenu.LastUpdateDate = time.Now()
-
-	_, err = c.Db.Update(&sysmenu, whereMenu)
-
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	ret := __none_func_system__(sysmenu)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
-	}
-}
-
-// _AddOrg
-// @Title _AddOrg
-// @Description 添加组织
-// @Param	    string  false  "组织"
-// @Success 200 {object} models.Account
-// @Failure 403 :id is empty
-func System_AddOrg(c *entitys.CtrlContext) {
-	var sysorg sysmodel.SysOrg
-	c.Ctx.BindJSON(&sysorg)
-
-	user_id := c.Ctx.GetString("user_id")
-
-	sysorg.Id = utils.NewUUID()
-	sysorg.CreateBy = user_id
-	sysorg.LastUpdateBy = user_id
-	sysorg.LastUpdateDate = time.Now()
-	sysorg.CreateTime = time.Now()
-	sysorg.DelFlag = 0
-
-	_, err := c.Db.Insert(&sysorg)
-	if err != nil {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	ret := __none_func_system__(sysorg)
+	var paramObj0 models.SysMenu 
+	c.Ctx.BindJSON(&paramObj0)
+	ret := __none_func_system__(paramObj0)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
+	}else{
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
 	}
 }
 
-// _DelOrg
-// @Title _DelOrg
-// @Description 删除组织
-// @Param	id    string  false  "组织ID"
-// @Success 200 {object} models.Account
-// @Failure 403 :id is empty
-func System_DelOrg(c *entitys.CtrlContext) {
-	type Param struct {
-		Id string `json:"id"`
-	}
-
-	var params []Param
-	c.Ctx.BindJSON(&params)
-	fmt.Println(params, "-----------")
-	ids := []string{}
-	for _, param := range params {
-		ids = append(ids, param.Id)
-	}
-
-	_, err := c.Db.Table(new(sysmodel.SysOrg)).In("id", ids).Update(map[string]interface{}{"del_flag": 0})
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	ret := __none_func_system__()
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
-	}
-}
-
-// _UpdateOrg
-// @Title _UpdateOrg
-// @Description 更新组织
-// @Param	    string  false  "组织"
-// @Success 200 {object} models.Account
-// @Failure 403 :id is empty
-func System_UpdateOrg(c *entitys.CtrlContext) {
-	var sysorg sysmodel.SysOrg
-	c.Ctx.BindJSON(&sysorg)
-
-	user_id := c.Ctx.GetString("user_id")
-
-	sysorg.LastUpdateBy = user_id
-	sysorg.LastUpdateDate = time.Now()
-
-	_, err := c.Db.ID(sysorg.Id).Update(&sysorg)
-
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	ret := __none_func_system__(sysorg)
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
-	}
-}
-
-// _GetOrg
-// @Title _GetOrg
-// @Description 根据ID获取组织
-// @Param	    string  false  "组织ID"
-// @Success 200 {object} models.Account
-// @Failure 403 :id is empty
-func System_GetOrg(c *entitys.CtrlContext) {
-	var param struct {
-		Id string `json:"id"`
-	}
-
-	c.Ctx.BindJSON(&param)
-	fmt.Println(param, "-----------")
-
-	org := sysmodel.SysOrg{}
-	err := c.Db.Table(new(sysmodel.SysOrg)).ID(param.Id).Find(&org)
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	ret := __none_func_system__()
-	if ret {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", org})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
-	}
-}
-
-// _PageOrg
-// @Title _PageOrg
-// @Description 分页获取组织
-// @Param	    string  false  "组织"
-// @Success 200 {object} models.Account
-// @Failure 403 :id is empty
-func System_PageOrg(c *entitys.CtrlContext) {
-	var getpageinfo sysmodel.GetPageInfo
-	c.Ctx.BindJSON(&getpageinfo)
-
-	/*
-	ret := __none_func_system__(getpageinfo)
-
-	page := sysmodel.PageResult{}
-	var orgs []sysmodel.SysOrg
-	dbSession := c.Db.Table("sys_organization")
-	dbSession = dbSession.Select("sys_organization.*")
-
-	countSession := c.Db.Table("sys_organization")
-
-	JoinTables := []sysmodel.Join{}
-	//JoinTables = append(JoinTables, sysmodel.Join{TabelName: "subject", Condition: "lesson.subject_id = subject.id", JoinOperator: "left"})
-
-	for _, join := range JoinTables {
-		dbSession = dbSession.Join(join.JoinOperator, join.TabelName, join.Condition)
-		countSession = countSession.Join(join.JoinOperator, join.TabelName, join.Condition)
-	}
-
-	whereStr, datas, err := getpageinfo.Filter.Parse("")
-
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-		return
-	}
-
-	dbSession = dbSession.Where(whereStr, datas...)
-	countSession = countSession.Where(whereStr, datas...)
-
-	sidx := strings.Split(getpageinfo.Sidx, ",")
-	for _, order := range sidx {
-		order = strings.TrimSpace(order)
-		if len(order) == 0 {
-			continue
-		}
-
-		if strings.ToLower(getpageinfo.Sord) == "desc" {
-			dbSession = dbSession.OrderBy(order + " desc")
-		} else {
-			dbSession = dbSession.OrderBy(order + " asc")
-		}
-
-	}
-
-	totalPage, _ := countSession.Count()
-	err = dbSession.Limit(getpageinfo.PageSize, (getpageinfo.PageNum-1)*getpageinfo.PageSize).Find(&orgs)
-	if err != nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
-	}
-	page.Content = orgs
-	page.PageSize = getpageinfo.PageSize
-	page.PageNum = getpageinfo.PageNum
-	page.TotalSize = int(totalPage)
-*/
-	if true {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
-	}
-}
-
-func System_TreeList(c *entitys.CtrlContext) {
-	/*tbName := c.Ctx.Query("tb_name")
-	parentFiled := c.Ctx.Query("parent_filed")
-	if parentFiled == "" {
-		parentFiled = c.Ctx.Query("parent_field")
-	}
-	parentValue := c.Ctx.Query("parent_value")
-	textFiled := c.Ctx.Query("text_filed")
-	if textFiled == "" {
-		textFiled = c.Ctx.Query("text_field")
-		if textFiled == "" {
-			textFiled = c.Ctx.Query("name_field")
-		}
-	}
-	valueFiled := c.Ctx.Query("value_filed")
-	if valueFiled == "" {
-		valueFiled = c.Ctx.Query("value_field")
-		if valueFiled == "" {
-			valueFiled = c.Ctx.Query("id_field")
-		}
-	}
-	domainchk := c.Ctx.Query("domainchk")
-	if domainchk == "" {
-		domainchk = "1" // 默认需要domain过滤
-	}
-	cntparent := c.Ctx.Query("cnt_parent")
-	if cntparent == "" {
-		cntparent = "0"
-	}
-	filter := c.Ctx.Query("filters")
-	if filter == "" {
-		filter = c.Ctx.Query("filter")
-	}
-	sord := c.Ctx.Query("sord")
-
-	user, exists := c.Ctx.Get("token")
-	if !exists {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "token is not exists", nil})
-		return
-	}
-	nodes, err := sysdb.TreeList(c, user.(*entitys.Token), tbName, parentFiled, parentValue, textFiled, valueFiled, cntparent, domainchk, filter, sord)
-	if err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nodes})
-	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
-	}
-	*/
-}
 
-func __none_func_system__(params ...interface{}) bool {
+func __none_func_system__(params ... interface{}) bool{
 	return true
 }

models/model.go

@@ -33,3 +33,63 @@ func SyncDb(db *xorm.Engine) {
 	db.Sync2(new (SysDomain))
 
 }
+
+
+var ModelNameList []string =[]string{
+
+	"sys_user",
+
+	"sys_org",
+
+	"sys_role",
+
+	"sys_user_role",
+
+	"sys_menu",
+
+	"sys_role_menu",
+
+	"sys_permission",
+
+	"sys_role_permission",
+
+	"sys_attachment",
+
+	"sys_domain",
+
+
+	"sys_menu_tree",
+
+	"sys_org_tree",
+
+	"user_info",
+
+	"login_info",
+
+	"login_return_info",
+
+	"get_page_info",
+
+	"column_filters",
+
+	"column_filter",
+
+	"sys_user_page_info",
+
+	"sys_return",
+
+	"sys_role_page_info",
+
+	"save_role_menu",
+
+	"storage_result",
+
+	"page_result",
+
+	"tree_node",
+
+	"join",
+
+	"page_query_param",
+
+}