Merge branch 'v2' of https://git.qianqiusoft.com/qianqiusoft/light-apiengine into v2

controllers/gen/SystemController_gen.go

@@ -435,3 +435,30 @@ func (c *SystemController) GetDomainMenuTree(ctx *gin.Context) {
 	partial.System_GetDomainMenuTree(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
 }
 
+// GetRoleMenuTree
+// @Title GetRoleMenuTree
+// @Description 获取角色权限菜单         
+// @Param	role_id    string  false  "角色id"  
+// @Success 200 {object} sysReturn
+// @Failure 403 :id is empty
+// @router /get_role_menu_tree  [get]
+func (c *SystemController) GetRoleMenuTree(ctx *gin.Context) {
+	//
+	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	partial.System_GetRoleMenuTree(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
+}
+
+// AddRoleMenu
+// @Title AddRoleMenu
+// @Description 添加角色菜单         
+// @Param	menu_id      false  "菜单id"  
+// @Param	role_id    string  false  "角色id"  
+// @Success 200 {object} sysReturn
+// @Failure 403 :id is empty
+// @router /add_role_menu  [post]
+func (c *SystemController) AddRoleMenu(ctx *gin.Context) {
+	//
+	db:=c.apiengine.BusinessOrmEngine[ctx.GetString("domain")]
+	partial.System_AddRoleMenu(&entitys.CtrlContext{c.apiengine, ctx, db, c.apiengine.PlatformOrmEngine})
+}
+

controllers/partial/SystemController.go

@@ -188,7 +188,7 @@ func System_AddUser(c *entitys.CtrlContext) {
 	user_id := c.Ctx.GetString("user_id")
 	user.Id = sysutils.NewUUID()
 	user.Name = user.LoginId
-	user.CreateTime = time.Now()
+	user.CreateTime = models.NowLocal()
 	user.LastUpdateTime = time.Now().UnixNano()
 	user.CreateBy = user_id
 	user.LastUpdateBy = user_id
@@ -281,11 +281,11 @@ func System_GetUser(c *entitys.CtrlContext) {
 	user_id := c.Ctx.Query("user_id")
 
 	var user sysmodel.SysUser
-	err := c.Db.SqlMapClient("selectone_sys_user",map[string]interface{}{"id": user_id}).Find(&user)
+	err := c.Db.SqlMapClient("selectone_sys_user", map[string]interface{}{"id": user_id}).Find(&user)
 
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", user})
-	}else{
+	} else {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
@@ -307,7 +307,7 @@ func System_AddRole(c *entitys.CtrlContext) {
 	paramObj0.Id = sysutils.NewUUID()
 	paramObj0.CreateBy = user.UserId
 	paramObj0.LastUpdateBy = user.UserId
-	paramObj0.CreateTime = time.Now()
+	paramObj0.CreateTime = models.NowLocal()
 	paramObj0.LastUpdateTime = time.Now().UnixNano()
 	paramObj0.DelFlag = 0
 
@@ -358,15 +358,21 @@ func System_DelRole(c *entitys.CtrlContext) {
 // @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
+	err := c.Ctx.BindJSON(&role)
 
-	ret := __none_func_system__(id, name, remark)
-	if ret {
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	paramMap, _ := sysutils.BeanToMap(&role)
+	_, err = c.Db.SqlMapClient("update_sys_role", paramMap).Execute()
+
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -380,7 +386,10 @@ func System_FindRolePage(c *entitys.CtrlContext) {
 	page, _ := strconv.Atoi(c.Ctx.DefaultQuery("page", "1"))
 	rows, _ := strconv.Atoi(c.Ctx.DefaultQuery("rows", "10"))
 
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows}
+	name := c.Ctx.DefaultQuery("name", "")
+	code := c.Ctx.DefaultQuery("code", "")
+
+	paramMap_i_t := map[string]interface{}{"name": name, "code": code, "page": page, "rows": rows}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_role_page", "sys_role", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
@@ -403,10 +412,11 @@ func System_FindMenuPage(c *entitys.CtrlContext) {
 	cn_id := c.Ctx.DefaultQuery("cn_id", "")
 	_type := c.Ctx.DefaultQuery("type", "")
 	type_op := c.Ctx.DefaultQuery("type_op", "")
+	hidden := c.Ctx.DefaultQuery("hidden", "")
 
 	op := template.HTML(type_op)
 
-	paramMap_i_t := map[string]interface{}{"page": page, "rows": rows, "type": _type, "type_op": op, "name": name, "code": code, "cn_id": cn_id}
+	paramMap_i_t := map[string]interface{}{"hidden": hidden, "page": page, "rows": rows, "type": _type, "type_op": op, "name": name, "code": code, "cn_id": cn_id}
 	result, err := sysutils.PageSearch(c.Db, "system", "find_menu_page", "sys_menu", paramMap_i_t)
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", result})
@@ -660,13 +670,22 @@ func System_AddOrg(c *entitys.CtrlContext) {
 // @Success 200 {object} Account
 // @Failure 403 :id is empty
 func System_DelOrg(c *entitys.CtrlContext) {
-	id := c.Ctx.Query("id")
+	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)
+	}
 
-	ret := __none_func_system__(id)
-	if ret {
+	_, err := c.Db.Table(new(models.SysOrg)).In("id", ids).Update(map[string]interface{}{"del_flag": 1})
+
+	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
-		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
 	}
 }
 
@@ -682,13 +701,13 @@ func System_UpdateOrg(c *entitys.CtrlContext) {
 	//name := c.Ctx.Query("name")
 	//domain := c.Ctx.Query("domain")
 	//parent := c.Ctx.Query("parent")
-	
+
 	var paramObj0 models.SysOrg
 	err := c.Ctx.BindJSON(&paramObj0)
-	
+
 	tk, _ := c.Ctx.Get("token")
 	user := tk.(*entitys.Token)
-	
+
 	if paramObj0.Parent != "" {
 		parentNodes := []sysmodel.SysOrg{}
 		err := c.Db.SqlMapClient("one_sys_org", paramObj0.Parent).Find(&parentNodes)
@@ -700,13 +719,13 @@ func System_UpdateOrg(c *entitys.CtrlContext) {
 	} else {
 		paramObj0.Inheritance = fmt.Sprintf("|%s|", paramObj0.Id)
 	}
-	
+
 	paramObj0.LastUpdateBy = user.UserId
 	paramObj0.LastUpdateTime = time.Now().UnixNano()
-	
+
 	paramMap, err := sysutils.BeanToMap(&paramObj0)
 	_, err = c.Db.SqlMapClient("update_sys_org", paramMap).Execute()
-	
+
 	if err == nil {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
 	} else {
@@ -858,17 +877,21 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 	var paramObj0 struct {
 
 		//域名ID
-		DomainId   string `json:"domain_id"`
+		DomainId string `json:"domain_id"`
 		//菜单
-		Menus   []sysmodel.SysMenu `json:"menus"`
-
+		Menus []sysmodel.SysMenu `json:"menus"`
 	}
 	err := c.Ctx.BindJSON(&paramObj0)
-	if err != nil{
+	if err != nil {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "BindJSON error: " + err.Error(), nil})
 		return
 	}
 
+	if len(paramObj0.Menus) <= 0 {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "the menus is empty", nil})
+		return
+	}
+
 	var domain sysmodel.SysDomain
 	param := map[string]interface{}{"id": paramObj0.DomainId}
 	_, err = c.Db.SqlMapClient("selectone_sys_domain", &param).Get(&domain)
@@ -877,6 +900,25 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 		return
 	}
 
+	var menuIds = make([]string, len(paramObj0.Menus))
+	for i := range paramObj0.Menus {
+		menuIds[i] = paramObj0.Menus[i].Id
+	}
+	var menus []sysmodel.SysMenu
+	err = c.Db.In("id", menuIds).Find(&menus)
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "find menu error: " + err.Error(), nil})
+		return
+	}
+	for i := range menus {
+		for j := range paramObj0.Menus {
+			if menus[i].Id == paramObj0.Menus[j].Id {
+				menus[i].Name = paramObj0.Menus[j].Name
+				break
+			}
+		}
+	}
+
 	session := c.App.GetBusinessDb(domain.Domain).NewSession()
 	defer session.Close()
 	session.Begin()
@@ -886,7 +928,7 @@ func System_AddDomainMenu(c *entitys.CtrlContext) {
 		c.Ctx.JSON(500, sysmodel.SysReturn{500, "Insert menu error: " + err.Error(), nil})
 		return
 	}
-	if len(paramObj0.Menus) <= 0{
+	if len(paramObj0.Menus) <= 0 {
 		session.Rollback()
 		c.Ctx.JSON(200, sysmodel.SysReturn{500, "the menus is empty", nil})
 		return
@@ -944,8 +986,8 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 	}
 
 	var sysMenusMap map[string]map[string]interface{}
-	sysMenusMap = make(map[string]map[string]interface{},0)
-	for _, menu := range sysMenus{
+	sysMenusMap = make(map[string]map[string]interface{}, 0)
+	for _, menu := range sysMenus {
 		sysMenusMap[menu["id"].(string)] = menu
 	}
 
@@ -955,7 +997,7 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 	//}
 
 	var sysMenuRest []map[string]interface{}
-	for _, menu := range sysMenusMap{
+	for _, menu := range sysMenusMap {
 		sysMenuRest = append(sysMenuRest, menu)
 	}
 
@@ -969,6 +1011,93 @@ func System_GetDomainMenuTree(c *entitys.CtrlContext) {
 	}
 }
 
+// _GetUserMenuTree
+// @Title _GetUserMenuTree
+// @Description 获取用户权限菜单
+// @Param	user_id    string  false  "用户id"
+// @Success 200 {object} Account
+// @Failure 403 :id is empty
+func System_GetRoleMenuTree(c *entitys.CtrlContext) {
+	role_id := c.Ctx.Query("role_id")
+
+	op := template.HTML(">=")
+
+	paramMap := map[string]interface{}{"sort": "name", "type": 0, "type_op": op, "hidden": 0}
+	sysTree, err := sysutils.TreeSearch(c.Db, "system", "get_menu_tree", "sys_menu", paramMap)
+	if err != nil {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	paramMap2 := map[string]interface{}{"role_id": role_id}
+	//roleTree, err := sysutils.TreeSearch(c.Db, "system", "get_role_menu_tree", "sys_menu", paramMap2)
+	roleMenu, _ := c.Db.SqlMapClient("get_role_menu_tree", paramMap2).Query().List()
+
+	roleTree, err := sysutils.BuildTree("", roleMenu)
+
+	ret := __none_func_system__(role_id)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", map[string]interface{}{"sys_tree": sysTree, "role_tree": roleTree}})
+	} else {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
+// _AddRoleMenu
+// @Title _AddRoleMenu
+// @Description 添加角色菜单
+// @Param	menu_id      false  "菜单id"
+// @Param	role_id    string  false  "角色id"
+// @Success 200 {object} Account
+// @Failure 403 :id is empty
+func System_AddRoleMenu(c *entitys.CtrlContext) {
+	tk, _ := c.Ctx.Get("token")
+	user := tk.(*entitys.Token)
+
+	var paramObj0 struct {
+		MenuIds []string `json:"menu_ids"`
+		RoleId  string   `json:"role_id"`
+	}
+
+	c.Ctx.BindJSON(&paramObj0)
+
+	session := c.Db.NewSession()
+	defer session.Close()
+	session.Begin()
+	_, err := session.SqlMapClient("del_role_menu", paramObj0.RoleId).Execute()
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	var roleMenus []*sysmodel.SysRoleMenu
+	for _, menu := range paramObj0.MenuIds {
+		roleMenu := &sysmodel.SysRoleMenu{}
+		roleMenu.Id = sysutils.NewUUID()
+		roleMenu.MenuId = menu
+		roleMenu.RoleId = paramObj0.RoleId
+		roleMenu.CreateBy = user.UserId
+
+		roleMenus = append(roleMenus, roleMenu)
+	}
+
+	_, err = session.InsertMulti(&roleMenus)
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	session.Commit()
+	ret := __none_func_system__(paramObj0)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(500, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
 func __none_func_system__(params ...interface{}) bool {
 	return true
 }

engine/system_init.go

@@ -60,7 +60,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Domain:         "qianqiuiot.com",
 			OrgId:          "287c50a4-caad-4557-80c8-aca81af9f370",
 			Password:       utils.HashPassword("123456", ""),
-			CreateTime:     time.Now(),
+			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
 		},
 	}
@@ -69,7 +69,7 @@ func initPlatformDbData(db *xorm.Engine) {
 		{
 			Id:             "487c50a4-caad-4557-80c8-aca81af9f370",
 			Name:           "超级管理员",
-			CreateTime:     time.Now(),
+			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
 		},
 	}
@@ -90,7 +90,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Name:           "系统管理",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 10000,
+			OrderNum:       10000,
 		},
 		{
 			Id:             "64994cad-559f-445e-b1be-3009c9a4e850",
@@ -100,7 +100,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/domain",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1001,
+			OrderNum:       1001,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f374",
@@ -110,7 +110,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/menu",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1002,
+			OrderNum:       1002,
 		},
 		{
 			Id:             "f9928388-7861-4551-9273-e74858962ff8",
@@ -120,7 +120,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/app_menu",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1003,
+			OrderNum:       1003,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f371",
@@ -130,7 +130,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/user",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1004,
+			OrderNum:       1004,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f372",
@@ -140,7 +140,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/org",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1005,
+			OrderNum:       1005,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f373",
@@ -150,7 +150,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/role",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1006,
+			OrderNum:       1006,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f375",
@@ -160,7 +160,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/dic",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1007,
+			OrderNum:       1007,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f376",
@@ -170,7 +170,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/log",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-			OrderNum: 1008,
+			OrderNum:       1008,
 		},
 	}
 
@@ -221,21 +221,21 @@ func initOrmEngine(orm *xorm.Engine, driverName string) {
 	createDatabase(orm)
 }
 
-func initBusinessDbData(domainid, login_id, domain string, db *xorm.Engine,platform_db *xorm.Engine) {
+func initBusinessDbData(domainid, login_id, domain string, db *xorm.Engine, platform_db *xorm.Engine) {
 	users := models.SysUser{
 		Id:         domainid,
 		Name:       "管理员",
 		LoginId:    login_id,
 		Domain:     domain,
 		Password:   utils.HashPassword("123456", ""),
-		CreateTime: time.Now(),
+		CreateTime: models.NowLocal(),
 	}
 
 	roles := []models.SysRole{
 		{
 			Id:         domainid,
 			Name:       "管理员",
-			CreateTime: time.Now(),
+			CreateTime: models.NowLocal(),
 		},
 	}
 

light-apiengine.xml

@@ -243,6 +243,21 @@
                     <failure ref="$sys_return"></failure>
                 </return>
             </api>
+            <api name="get_role_menu_tree" desc="获取角色权限菜单" method="get">
+                <param name="role_id"  type="string" desc="角色id"/>
+                <return>
+                    <success ref="$sys_return"></success>
+                    <failure ref="$sys_return"></failure>
+                </return>
+            </api>
+            <api name="add_role_menu" desc="添加角色菜单" method="post">
+                <param name="menu_id"  ref="string array" desc="菜单id"/>
+                <param name="role_id"  type="string" desc="角色id"/>
+                <return>
+                    <success ref="$sys_return"></success>
+                    <failure ref="$sys_return"></failure>
+                </return>
+            </api>
         </controller>
         <controller name="api" desc="api接口">
             <api name="api_doc" method="get" desc="api文档">
@@ -335,7 +350,7 @@
             <column isNull="false" name="avatar" caption="头像" type="string" size="255" dbtype="varchar(255)"/>
             <column isNull="false" name="domain" caption="域" type="string" size="50" dbtype="varchar(50)"/>
             <column isNull="false" name="create_by" caption="创建人" type="string" size="36" dbtype="varchar(36)"/>
-            <column isNull="false" name="create_time" caption="创建时间" type="datetime" />
+            <column isNull="false" name="create_time" caption="创建时间" type="local_time" />
             <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="last_update_time" caption="最后更新时间" type="int64" />
             <column isNull="false" name="del_flag" caption="是否删除 1：删除   0：正常" type="int32"/>
@@ -373,7 +388,7 @@
             <column name="status" caption="状态 0：禁用   1：正常" type="int32"/>
             <column isNull="false" name="domain" caption="域" type="string" size="50" dbtype="varchar(50)"/>
             <column isNull="false" name="create_by" caption="创建人" type="string" size="36" dbtype="varchar(36)"/>
-            <column isNull="false" name="create_time" caption="创建时间" type="datetime" />
+            <column isNull="false" name="create_time" caption="创建时间" type="local_time" />
             <column isNull="false" name="last_update_by" caption="最后更新人" type="string" size="36" dbtype="varchar(36)"/>
             <column isNull="false" name="last_update_time" caption="最后更新时间" type="int64" />
             <column isNull="false" name="del_flag" caption="是否删除 1：删除   0：正常" type="int32"/>

models/LoginReturnInfo_gen.go

@@ -1,7 +1,6 @@
 
 package models
 import (
-"time"
 //__import_packages__
 )
 
@@ -37,7 +36,7 @@ type LoginReturnInfo struct {
 	//创建人
 	CreateBy string `json:"create_by"`
 	//创建时间
-	CreateTime time.Time `json:"create_time"`
+	CreateTime LocalTime `json:"create_time"`
 	//最后更新人
 	LastUpdateBy string `json:"last_update_by"`
 	//最后更新时间

models/SysRole_gen.go

@@ -1,8 +1,7 @@
 
 package models
 import (
-	"time"
-//__import_packages__
+	//__import_packages__
 )
 
 type SysRole struct {
@@ -21,7 +20,7 @@ type SysRole struct {
 	//创建人
 	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
 	//创建时间
-	CreateTime   time.Time    `xorm:"'create_time' notnull "json:"create_time"`
+	CreateTime   LocalTime    `xorm:"'create_time' notnull "json:"create_time"`
 	//最后更新人
 	LastUpdateBy   string    `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
 	//最后更新时间

models/SysUser_gen.go

@@ -1,8 +1,7 @@
 
 package models
 import (
-	"time"
-//__import_packages__
+	//__import_packages__
 )
 
 type SysUser struct {
@@ -35,7 +34,7 @@ type SysUser struct {
 	//创建人
 	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
 	//创建时间
-	CreateTime   time.Time    `xorm:"'create_time' notnull "json:"create_time"`
+	CreateTime   LocalTime    `xorm:"'create_time' notnull "json:"create_time"`
 	//最后更新人
 	LastUpdateBy   string    `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
 	//最后更新时间

models/UserInfo_gen.go

@@ -1,7 +1,6 @@
 
 package models
 import (
-"time"
 //__import_packages__
 )
 
@@ -37,7 +36,7 @@ type UserInfo struct {
 	//创建人
 	CreateBy string `json:"create_by"`
 	//创建时间
-	CreateTime time.Time `json:"create_time"`
+	CreateTime LocalTime `json:"create_time"`
 	//最后更新人
 	LastUpdateBy string `json:"last_update_by"`
 	//最后更新时间

routers/system_gen.go

@@ -117,5 +117,11 @@ func registerSystemRouter(e *engine.ApiEngine){
 	v1.GET("/get_domain_menu_tree",ctrler.GetDomainMenuTree)
 	//v1.POST("/get_domain_menu_tree",ctrler.GetDomainMenuTree)
 
+	v1.GET("/get_role_menu_tree",ctrler.GetRoleMenuTree)
+	//v1.POST("/get_role_menu_tree",ctrler.GetRoleMenuTree)
+
+	//v1.GET("/add_role_menu",ctrler.AddRoleMenu)
+	v1.POST("/add_role_menu",ctrler.AddRoleMenu)
+
 }
 

sqlconfig/light-apiengine-develop/sys_role.xml

@@ -0,0 +1,13 @@
+<sqlMap>
+    <sql id="get_role_menu_tree">
+        select sys_menu.* from sys_menu, sys_role_menu
+        where
+        sys_menu.id = sys_role_menu.menu_id
+        and sys_role_menu.role_id = ?role_id
+        and sys_menu.del_flag = 0
+        and sys_menu.hidden = 0
+    </sql>
+    <sql id="del_role_menu">
+        delete from sys_role_menu where role_id = ?
+    </sql>
+</sqlMap>

sqlconfig/system_controller/system_find_role_page_count.tpl

@@ -1,7 +1,13 @@
-
-select
-    count(*) records
-from
-    sys_role
-where
-	del_flag = 0
+
+select
+    count(*) records
+from
+    sys_role
+where
+	del_flag = 0
+{{if ne .name ""}}
+    and name like '%{{.name}}%'
+{{end}}
+{{if ne .code ""}}
+    and code like '%{{.code}}%'
+{{end}}

sqlconfig/system_controller/system_find_role_page_select.tpl

@@ -1,8 +1,14 @@
-
-select
-    *
-from
-    sys_role
-where
-    del_flag = 0
-LIMIT {{.rows}} OFFSET {{.offset}}
+
+select
+    *
+from
+    sys_role
+where
+    del_flag = 0
+{{if ne .name ""}}
+    and name like '%{{.name}}%'
+{{end}}
+{{if ne .code ""}}
+    and code like '%{{.code}}%'
+{{end}}
+LIMIT {{.rows}} OFFSET {{.offset}}