增加用户增、删

controllers/SystemController.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"fmt"
+	"light-apiengine/models"
 	"strconv"
 	"strings"
 	"time"
@@ -177,8 +178,16 @@ func System_FindUserPage(c *SystemController) {
 	__none_func_system__(getpageinfo)
 	fmt.Println(getpageinfo)
 	page := sysmodel.SysUserPageInfo{}
-	var users []sysmodel.SysUser
-	err := c.Db.SQL(sysmodel.Selectall_sys_user).Limit(getpageinfo.PageSize, (getpageinfo.PageNum-1)*getpageinfo.PageSize).Find(&users)
+	var users []sysmodel.UserInfo
+	err := c.Db.SQL(sysmodel.SqlUserInfoPage).Limit(getpageinfo.PageSize, (getpageinfo.PageNum-1)*getpageinfo.PageSize).Find(&users)
+
+	//查找每个用户的角色
+	for i, user := range users {
+		roles := []sysmodel.SysUserRole{}
+		c.Db.SQL(sysmodel.SqlSelectUserRoles, user.Id).Find(&roles)
+		users[i].UserRole = roles
+	}
+
 	page.Content = users
 	page.PageSize = getpageinfo.PageSize
 	page.PageNum = getpageinfo.PageNum
@@ -192,18 +201,176 @@ func System_FindUserPage(c *SystemController) {
 
 }
 
-// _FindPermissions
-// @Title _FindPermissions
-// @Description 查找用户的菜单权限标识集合
-// @Param	user    string  false  "用户id"
-// @Success 200 {object} sysmodel.Account
+// _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
 // @Failure 403 :id is empty
-func System_FindPermissions(c *SystemController) {
-	//获取用户id
+func System_AddUser(c *SystemController) {
+
+	var user sysmodel.SysUser
+	c.Ctx.BindJSON(&user)
+
+	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 == 0 {
+			oldUser.DelFlag = 1
+			_, err := c.Db.Id("id").Cols("del_flag").Update(&oldUser)
+			if err != nil {
+				c.Ctx.JSON(200, sysmodel.SysReturn{500, "login_id exit, update err: " + err.Error(), nil})
+			}
+		} else {
+			c.Ctx.JSON(200, sysmodel.SysReturn{500, "login_id exit", nil})
+			return
+		}
+	}
+
 	tk, _ := c.Ctx.Get("token")
-	user := tk.(*entitys.Token)
+	op := tk.(*entitys.Token)
+
+	user.Id = utils.NewUUID()
+	user.Name = user.LoginId
+	user.CreateTime = time.Now()
+	user.LastUpdateDate = time.Now()
+	user.CreateBy = op.UserId
+	user.LastUpdateBy = op.UserId
+	user.DelFlag = 1
+	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 {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+	}
+}
+
+// _DelUser
+// @Title _DelUser
+// @Description 删除用户
+// @Param	id    string  false  "用户ID"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_DelUser(c *SystemController) {
+	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(models.SysUser)).In("id", ids).Update(map[string]interface{}{"del_flag": 0})
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	_, err = c.Db.Table(new(models.SysUserRole)).In("user_id", ids).Update(map[string]interface{}{"del_flag": 0})
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	session.Commit()
+
+	ret := __none_func_system__()
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, 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
+// @Failure 403 :id is empty
+func System_UpdateUser(c *SystemController) {
+	tk, _ := c.Ctx.Get("token")
+	op := tk.(*entitys.Token)
+
+	var userInfo sysmodel.UserInfo
+	c.Ctx.BindJSON(&userInfo)
+
+	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
+	}
 
-	//user := c.Ctx.Param(":user")
+	//2、修改角色
+	for i, _ := range userInfo.UserRole {
+		userInfo.UserRole[i].Id = utils.NewUUID()
+		userInfo.UserRole[i].CreateBy = op.UserId
+		userInfo.UserRole[i].LastUpdateBy = op.UserId
+		userInfo.UserRole[i].CreateTime = time.Now()
+		userInfo.UserRole[i].LastUpdateDate = time.Now()
+		userInfo.UserRole[i].DelFlag = 1
+	}
+	_, err = c.Db.Insert(userInfo.UserRole)
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	//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": op.UserId, "last_update_date": time.Now()})
+	if err != nil {
+		session.Rollback()
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		return
+	}
+
+	session.Commit()
+
+	ret := __none_func_system__()
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
+
+// _FindRoleMenu
+// @Title _FindRoleMenu
+// @Description 查找角色权限
+// @Param	user    string  false  "用户id"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_FindRoleMenu(c *SystemController) {
+	user := c.Ctx.Param(":user")
 	ret := __none_func_system__(user)
 	if ret {
 		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
@@ -212,36 +379,73 @@ func System_FindPermissions(c *SystemController) {
 	}
 }
 
-// _AddPermission
-// @Title _AddPermission
-// @Description 查找用户的菜单权限标识集合
+// _RoleAll
+// @Title _RoleAll
+// @Description 查找所有角色
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_RoleAll(c *SystemController) {
+
+	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})
+	}
+}
+
+// _AddMenu
+// @Title _AddMenu
+// @Description 增加菜单
 // @Param	perms    string  false  "权限标识"
 // @Param	domain    string  false  "域"
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
-func System_AddPermission(c *SystemController) {
+func System_AddMenu(c *SystemController) {
 	perms := c.Ctx.Param(":perms")
 	domain := c.Ctx.Param(":domain")
 	ret := __none_func_system__(perms, domain)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
 
-	//查找此权限标识符是否存在
-	//c.Db.Where().Get()
+// _DelMenu
+// @Title _DelMenu
+// @Description 删除菜单
+// @Param	id    string  false  "ID"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_DelMenu(c *SystemController) {
+	id := c.Ctx.Param(":id")
+	ret := __none_func_system__(id)
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	} else {
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
+	}
+}
 
-	tk, _ := c.Ctx.Get("token")
-	user := tk.(*entitys.Token)
+// _FindPermissions
+// @Title _FindPermissions
+// @Description 查找用户权限
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_FindPermissions(c *SystemController) {
 
-	permiss := &sysmodel.SysPermission{}
-	permiss.Id = utils.NewUUID()
-	permiss.Perms = perms
-	permiss.Domain = domain
-	permiss.CreateBy = user.UserId
-	permiss.CreateTime = time.Now()
-	_, err := c.Db.Insert(permiss)
+	ret := __none_func_system__()
 
-	if ret && err == nil {
-		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", nil})
+	strs := []string{"sys:user:edit", "sys:user:delete", "sys:user:add"}
+
+	if ret {
+		c.Ctx.JSON(200, sysmodel.SysReturn{200, "", strs})
 	} else {
-		c.Ctx.JSON(200, sysmodel.SysReturn{500, err.Error(), nil})
+		c.Ctx.JSON(200, sysmodel.SysReturn{500, "", nil})
 	}
 }
 

controllers/SystemController_gen.go

@@ -1,29 +1,30 @@
+
 package controllers
 
 import (
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/entitys"
 	"github.com/gin-gonic/gin"
 	"github.com/xormplus/xorm"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
 )
 
 // SystemController operations for System
 type SystemController struct {
-	Ctx    *gin.Context
-	Db     *xorm.Engine
+	Ctx *gin.Context
+	Db *xorm.Engine
 	engine *engine.ApiEngine
-	Token  *entitys.Token
 }
 
 func NewSystemController(c *gin.Context, e *engine.ApiEngine) *SystemController {
-	controller := &SystemController{c, e.OrmEngine, e, nil}
+	controller := &SystemController{c,e.OrmEngine,e}
 	return controller
 }
 
+
+
 // Login
 // @Title Login
-// @Description 用户登录
-// @Param	logininfo      false  "登录信息"
+// @Description 用户登录         
+// @Param	logininfo      false  "登录信息"  
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /login  [post,get,put]
@@ -34,7 +35,7 @@ func (c *SystemController) Login() {
 
 // Logout
 // @Title Logout
-// @Description 用户退出
+// @Description 用户退出         
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /logout  [post,get]
@@ -45,8 +46,8 @@ func (c *SystemController) Logout() {
 
 // GetMenuTree
 // @Title GetMenuTree
-// @Description 获取系统菜单
-// @Param	user    string  false  "用户id"
+// @Description 获取系统菜单         
+// @Param	user    string  false  "用户id"  
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /get_menu_tree  [post,get]
@@ -57,8 +58,8 @@ func (c *SystemController) GetMenuTree() {
 
 // FindUserPage
 // @Title FindUserPage
-// @Description 获取用户分布数据
-// @Param	page      false  "分页参数"
+// @Description 获取用户分布数据         
+// @Param	page      false  "分页参数"  
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /find_user_page  [post,get]
@@ -69,7 +70,7 @@ func (c *SystemController) FindUserPage() {
 
 // GetOrgTree
 // @Title GetOrgTree
-// @Description 获取组织架构树
+// @Description 获取组织架构树         
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /get_org_tree  [post,get]
@@ -78,10 +79,99 @@ func (c *SystemController) GetOrgTree() {
 	System_GetOrgTree(c)
 }
 
+// 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
+// @Failure 403 :id is empty
+// @router /add_user  [post,get,put]
+func (c *SystemController) AddUser() {
+	//
+	System_AddUser(c)
+}
+
+// DelUser
+// @Title DelUser
+// @Description 删除用户         
+// @Param	id    string  false  "用户ID"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /del_user  [post,get,put]
+func (c *SystemController) DelUser() {
+	//
+	System_DelUser(c)
+}
+
+// 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
+// @Failure 403 :id is empty
+// @router /update_user  [post,get,put]
+func (c *SystemController) UpdateUser() {
+	//
+	System_UpdateUser(c)
+}
+
+// FindRoleMenu
+// @Title FindRoleMenu
+// @Description 查找角色权限         
+// @Param	user    string  false  "用户id"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /find_role_menu  [post,get,put]
+func (c *SystemController) FindRoleMenu() {
+	//
+	System_FindRoleMenu(c)
+}
+
+// RoleAll
+// @Title RoleAll
+// @Description 查找所有角色         
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /role_all  [post,get,put]
+func (c *SystemController) RoleAll() {
+	//
+	System_RoleAll(c)
+}
+
+// AddMenu
+// @Title AddMenu
+// @Description 增加菜单         
+// @Param	perms    string  false  "权限标识"  
+// @Param	domain    string  false  "域"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /add_menu  [post,get,put]
+func (c *SystemController) AddMenu() {
+	//
+	System_AddMenu(c)
+}
+
+// DelMenu
+// @Title DelMenu
+// @Description 删除菜单         
+// @Param	id    string  false  "ID"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /del_menu  [post,get,put]
+func (c *SystemController) DelMenu() {
+	//
+	System_DelMenu(c)
+}
+
 // FindPermissions
 // @Title FindPermissions
-// @Description 查找用户的菜单权限标识集合
-// @Param	user    string  false  "用户id"
+// @Description 查找用户权限         
 // @Success 200 {object} models.Account
 // @Failure 403 :id is empty
 // @router /find_permissions  [post,get,put]
@@ -90,15 +180,3 @@ func (c *SystemController) FindPermissions() {
 	System_FindPermissions(c)
 }
 
-// AddPermission
-// @Title AddPermission
-// @Description 查找用户的菜单权限标识集合
-// @Param	perms    string  false  "权限标识"
-// @Param	domain    string  false  "域"
-// @Success 200 {object} models.Account
-// @Failure 403 :id is empty
-// @router /add_permission  [post,get,put]
-func (c *SystemController) AddPermission() {
-	//
-	System_AddPermission(c)
-}

middleware/login_ware.go

@@ -8,14 +8,20 @@ import (
 
 func LoginWare() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		//fmt.Println("--LoginWare----")
 		//验证登陆
 		token := c.GetHeader("token")
+
+		//fmt.Println("--LoginWare----token: ", token)
+
 		if token == "" {
-			c.AbortWithStatusJSON(200, sysmodel.SysReturn{500, "token is empty", ""})
+			c.AbortWithStatusJSON(200, sysmodel.SysReturn{401, "token is empty", ""})
 		}
 
 		tk := utils.GlobalTokenStore.Get(token)
+		if tk == nil {
+			c.AbortWithStatusJSON(200, sysmodel.SysReturn{401, "token Invalid", ""})
+		}
+
 		c.Set("token", tk)
 		c.Next()
 	}

models/Sql_SysPermission.go

@@ -0,0 +1,12 @@
+package models
+
+var SqlUserPermission = `SELECT 
+  sys_permission.* ,
+FROM
+  sys_user 
+  LEFT JOIN sys_user_role 
+    ON sys_user.id = sys_user_role.user_id 
+  LEFT JOIN sys_role_permission 
+    ON sys_role_permission.role_id = sys_user_role.role_id 
+  LEFT JOIN sys_permission
+    ON sys_permission.id = sys_role_permission.permission_id`

models/Sql_SysUser.go

@@ -4,5 +4,27 @@ var SqlUserLogin = `
         select 
 			id,login_id,password,name,full_name,email,org_id,type,status,domain,create_by,create_time,last_update_by,last_update_date,del_flag
         from sys_user
-		where login_id = ?
-`
+		where login_id = ?`
+
+var SqlUserInfoPage = `SELECT 
+  sys_user.*,
+  sys_org.name org_name,
+  GROUP_CONCAT(sys_role.name) role_name
+FROM
+  sys_user 
+LEFT JOIN
+  sys_org
+  ON
+  sys_user.org_id=sys_org.id
+  LEFT JOIN
+  sys_user_role
+  ON
+  sys_user_role.user_id = sys_user.id
+  LEFT JOIN
+  sys_role
+  ON
+  sys_role.id = sys_user_role.role_id
+  WHERE
+  sys_user.del_flag = 1
+  GROUP BY
+  sys_user.id`

models/Sql_SysUserRole.go

@@ -0,0 +1,7 @@
+package models
+
+//删除用户角色
+var SqlDeleteUserRoles = `delete from sys_user_role where user_id=?`
+
+//获取用户角色
+var SqlSelectUserRoles = `select sys_user_role.* from sys_user_role where sys_user_role.user_id = ? and sys_user_role.del_flag = 1`

models/Sql_SysUser_gen.go

@@ -1,11 +1,11 @@
 
 package models
-    var Insert_sys_user = "insert into sys_user(`id`,`login_id`,`password`,`name`,`full_name`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?login_id,?password,?name,?full_name,?email,?org_id,?type,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
+    var Insert_sys_user = "insert into sys_user(`id`,`login_id`,`password`,`name`,`full_name`,`mobile`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag`) values (?id,?login_id,?password,?name,?full_name,?mobile,?email,?org_id,?type,?status,?domain,?create_by,?create_time,?last_update_by,?last_update_date,?del_flag)"
 
-    var Update_sys_user = "update sys_user set `login_id` = ?login_id,`password` = ?password,`name` = ?name,`full_name` = ?full_name,`email` = ?email,`org_id` = ?org_id,`type` = ?type,`status` = ?status,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
+    var Update_sys_user = "update sys_user set `login_id` = ?login_id,`password` = ?password,`name` = ?name,`full_name` = ?full_name,`mobile` = ?mobile,`email` = ?email,`org_id` = ?org_id,`type` = ?type,`status` = ?status,`domain` = ?domain,`create_by` = ?create_by,`create_time` = ?create_time,`last_update_by` = ?last_update_by,`last_update_date` = ?last_update_date,`del_flag` = ?del_flag where id = ?id"
 
     var Deleteone_sys_user = "delete from sys_userwhere id =?id"
 
-    var Selectone_sys_user = "select `id`,`login_id`,`password`,`name`,`full_name`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user where id = ?id"
+    var Selectone_sys_user = "select `id`,`login_id`,`password`,`name`,`full_name`,`mobile`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user where id = ?id"
 
-    var Selectall_sys_user = "select `id`,`login_id`,`password`,`name`,`full_name`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user"
+    var Selectall_sys_user = "select `id`,`login_id`,`password`,`name`,`full_name`,`mobile`,`email`,`org_id`,`type`,`status`,`domain`,`create_by`,`create_time`,`last_update_by`,`last_update_date`,`del_flag` from sys_user"

models/SysUserPageInfo_gen.go

@@ -13,6 +13,6 @@ type SysUserPageInfo struct {
 	//总页数
 	TotalSize   int `json:"totalSize"`
 	//内容
-	Content   []SysUser `json:"content"`
+	Content   []UserInfo `json:"content"`
 
 }

models/SysUser_gen.go

@@ -15,6 +15,8 @@ type SysUser struct {
 	Name   string    `xorm:"'name' varchar(36) notnull "json:"name"`
 	//全名
 	FullName   string    `xorm:"'full_name' varchar(36) notnull "json:"full_name"`
+	//电话
+	Mobile   string    `xorm:"'mobile' varchar(50) notnull "json:"mobile"`
 	//邮箱
 	Email   string    `xorm:"'email' varchar(50) notnull "json:"email"`
 	//组织ID

models/UserInfo_gen.go

@@ -0,0 +1,48 @@
+
+package models
+import (
+"time"
+)
+
+type UserInfo struct {
+		//主键
+	Id string `json:"id"`
+	//登录ID
+	LoginId string `json:"login_id"`
+	//密码
+	Password string `json:"password"`
+	//名字
+	Name string `json:"name"`
+	//全名
+	FullName string `json:"full_name"`
+	//电话
+	Mobile string `json:"mobile"`
+	//邮箱
+	Email string `json:"email"`
+	//组织ID
+	OrgId string `json:"org_id"`
+	//用户类型
+	Type int32 `json:"type"`
+	//状态 0：禁用   1：正常
+	Status int32 `json:"status"`
+	//域
+	Domain string `json:"domain"`
+	//创建人
+	CreateBy string `json:"create_by"`
+	//创建时间
+	CreateTime time.Time `json:"create_time"`
+	//最后更新人
+	LastUpdateBy string `json:"last_update_by"`
+	//最后更新时间
+	LastUpdateDate time.Time `json:"last_update_date"`
+	//是否删除 0：删除   1：正常
+	DelFlag int32 `json:"del_flag"`
+
+	//部门名称
+	OrgName   string `json:"org_name"`
+	//角色名称
+	RoleName   string `json:"role_name"`
+	//用户角色
+	UserRole   []SysUserRole `json:"user_role"`
+
+}

routers/router_gen.go

@@ -35,12 +35,36 @@ func systemController_get_org_tree(c *gin.Context) {
 	controllers.NewSystemController(c, g_engine).GetOrgTree()
 }
 
-func systemController_find_permissions(c *gin.Context) {
-	controllers.NewSystemController(c, g_engine).FindPermissions()
+func systemController_add_user(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).AddUser()
+}
+
+func systemController_del_user(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).DelUser()
+}
+
+func systemController_update_user(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).UpdateUser()
+}
+
+func systemController_find_role_menu(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).FindRoleMenu()
+}
+
+func systemController_role_all(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).RoleAll()
+}
+
+func systemController_add_menu(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).AddMenu()
 }
 
-func systemController_add_permission(c *gin.Context) {
-	controllers.NewSystemController(c, g_engine).AddPermission()
+func systemController_del_menu(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).DelMenu()
+}
+
+func systemController_find_permissions(c *gin.Context) {
+	controllers.NewSystemController(c, g_engine).FindPermissions()
 }
 
 func apiController_api_doc(c *gin.Context) {
@@ -77,8 +101,8 @@ func InitRouter(e *engine.ApiEngine) {
 	system.GET("/login", systemController_login)
 	system.POST("/login", systemController_login)
 	system.PUT("/login", systemController_login)
-	system.GET("/system/logout", systemController_logout)
-	system.POST("/system/logout", systemController_logout)
+	system.GET("/logout", systemController_logout)
+	system.POST("/logout", systemController_logout)
 
 	v1.Use(middleware.LoginWare())
 
@@ -98,14 +122,38 @@ func InitRouter(e *engine.ApiEngine) {
 	v1.POST("/system/get_org_tree", systemController_get_org_tree)
 	//v1.PUT("/system/get_org_tree",systemController_get_org_tree)
 
+	v1.GET("/system/add_user", systemController_add_user)
+	v1.POST("/system/add_user", systemController_add_user)
+	v1.PUT("/system/add_user", systemController_add_user)
+
+	v1.GET("/system/del_user", systemController_del_user)
+	v1.POST("/system/del_user", systemController_del_user)
+	v1.PUT("/system/del_user", systemController_del_user)
+
+	v1.GET("/system/update_user", systemController_update_user)
+	v1.POST("/system/update_user", systemController_update_user)
+	v1.PUT("/system/update_user", systemController_update_user)
+
+	v1.GET("/system/find_role_menu", systemController_find_role_menu)
+	v1.POST("/system/find_role_menu", systemController_find_role_menu)
+	v1.PUT("/system/find_role_menu", systemController_find_role_menu)
+
+	v1.GET("/system/role_all", systemController_role_all)
+	v1.POST("/system/role_all", systemController_role_all)
+	v1.PUT("/system/role_all", systemController_role_all)
+
+	v1.GET("/system/add_menu", systemController_add_menu)
+	v1.POST("/system/add_menu", systemController_add_menu)
+	v1.PUT("/system/add_menu", systemController_add_menu)
+
+	v1.GET("/system/del_menu", systemController_del_menu)
+	v1.POST("/system/del_menu", systemController_del_menu)
+	v1.PUT("/system/del_menu", systemController_del_menu)
+
 	v1.GET("/system/find_permissions", systemController_find_permissions)
 	v1.POST("/system/find_permissions", systemController_find_permissions)
 	v1.PUT("/system/find_permissions", systemController_find_permissions)
 
-	v1.GET("/system/add_permission", systemController_add_permission)
-	v1.POST("/system/add_permission", systemController_add_permission)
-	v1.PUT("/system/add_permission", systemController_add_permission)
-
 	v1.GET("/api/api_doc", apiController_api_doc)
 	//v1.POST("/api/api_doc",apiController_api_doc)
 	//v1.PUT("/api/api_doc",apiController_api_doc)