调整整体架构写法

调整db用法
调整日志用法
调整模版

app/admin/apis/system/sys_menu/sys_menu.go

@@ -1,27 +1,37 @@
 package sys_menu
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
+
 	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
-	"go-admin/common/log"
 	"go-admin/tools"
-	"go-admin/tools/app"
-	"net/http"
 )
 
 type SysMenu struct {
 	apis.Api
 }
 
+// @Summary Menu列表数据
+// @Description 获取JSON
+// @Tags 菜单
+// @Param menuName query string false "menuName"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/menulist [get]
+// @Security Bearer
 func (e *SysMenu) GetSysMenuList(c *gin.Context) {
-	msgID := tools.GenerateMsgIDFromContext(c)
+	log := e.GetLogger(c)
 	d := new(dto.SysMenuSearch)
 	db, err := tools.GetOrm(c)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -32,9 +42,9 @@ func (e *SysMenu) GetSysMenuList(c *gin.Context) {
 		return
 	}
 
-	var list *[]models.SysMenu
+	var list *[]system.SysMenu
 	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.MsgID = msgID
+	serviceSysMenu.Log = log
 	serviceSysMenu.Orm = db
 	list, err = serviceSysMenu.GetSysMenuPage(d)
 	if err != nil {
@@ -45,25 +55,36 @@ func (e *SysMenu) GetSysMenuList(c *gin.Context) {
 	e.OK(c, list, "查询成功")
 }
 
+// @Summary Menu详情数据
+// @Description 获取JSON
+// @Tags 菜单
+// @Param menuName query string false "menuName"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/menu/{id} [get]
+// @Security Bearer
 func (e *SysMenu) GetSysMenu(c *gin.Context) {
 	control := new(dto.SysMenuById)
+
+	log := e.GetLogger(c)
+
 	db, err := tools.GetOrm(c)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
-	msgID := tools.GenerateMsgIDFromContext(c)
 	//查看详情
 	err = control.Bind(c)
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object models.SysMenu
+	var object system.SysMenu
 
 	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.MsgID = msgID
+	serviceSysMenu.Log = log
 	serviceSysMenu.Orm = db
 	err = serviceSysMenu.GetSysMenu(control, &object)
 	if err != nil {
@@ -74,15 +95,33 @@ func (e *SysMenu) GetSysMenu(c *gin.Context) {
 	e.OK(c, object, "查看成功")
 }
 
+// @Summary 创建菜单
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/x-www-form-urlencoded
+// @Product application/x-www-form-urlencoded
+// @Param menuName formData string true "menuName"
+// @Param Path formData string false "Path"
+// @Param Action formData string true "Action"
+// @Param Permission formData string true "Permission"
+// @Param ParentId formData string true "ParentId"
+// @Param IsDel formData string true "IsDel"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/menu [post]
+// @Security Bearer
 func (e *SysMenu) InsertSysMenu(c *gin.Context) {
 	control := new(dto.SysMenuControl)
+
+	log := e.GetLogger(c)
+
 	db, err := tools.GetOrm(c)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
-	msgID := tools.GenerateMsgIDFromContext(c)
 	//新增操作
 	err = control.Bind(c)
 	if err != nil {
@@ -99,7 +138,7 @@ func (e *SysMenu) InsertSysMenu(c *gin.Context) {
 
 	serviceSysMenu := service.SysMenu{}
 	serviceSysMenu.Orm = db
-	serviceSysMenu.MsgID = msgID
+	serviceSysMenu.Log = log
 	err = serviceSysMenu.InsertSysMenu(object)
 	if err != nil {
 		log.Error(err)
@@ -110,15 +149,29 @@ func (e *SysMenu) InsertSysMenu(c *gin.Context) {
 	e.OK(c, object.GetId(), "创建成功")
 }
 
+// @Summary 修改菜单
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/x-www-form-urlencoded
+// @Product application/x-www-form-urlencoded
+// @Param id path int true "id"
+// @Param data body models.Menu true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "修改成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "修改失败"}"
+// @Router /api/v1/menu/{id} [put]
+// @Security Bearer
 func (e *SysMenu) UpdateSysMenu(c *gin.Context) {
 	control := new(dto.SysMenuControl)
+
+	log := e.GetLogger(c)
+
 	db, err := tools.GetOrm(c)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
-	msgID := tools.GenerateMsgIDFromContext(c)
 	//更新操作
 	err = control.Bind(c)
 	if err != nil {
@@ -134,7 +187,7 @@ func (e *SysMenu) UpdateSysMenu(c *gin.Context) {
 
 	serviceSysMenu := service.SysMenu{}
 	serviceSysMenu.Orm = db
-	serviceSysMenu.MsgID = msgID
+	serviceSysMenu.Log = log
 	err = serviceSysMenu.UpdateSysMenu(object)
 	if err != nil {
 		log.Error(err)
@@ -143,29 +196,40 @@ func (e *SysMenu) UpdateSysMenu(c *gin.Context) {
 	e.OK(c, object.GetId(), "更新成功")
 }
 
+// @Summary 删除菜单
+// @Description 删除数据
+// @Tags 菜单
+// @Param data body []int true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/menu/ [delete]
 func (e *SysMenu) DeleteSysMenu(c *gin.Context) {
 	control := new(dto.SysMenuById)
+
+	log := e.GetLogger(c)
+
 	db, err := tools.GetOrm(c)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
-	msgID := tools.GenerateMsgIDFromContext(c)
 	//删除操作
 	err = control.Bind(c)
 	if err != nil {
-		log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
+		log.Errorf("Bind error: %s", err)
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
 
 	serviceSysMenu := service.SysMenu{}
 	serviceSysMenu.Orm = db
-	serviceSysMenu.MsgID = msgID
+	serviceSysMenu.Log = log
 	err = serviceSysMenu.RemoveSysMenu(control)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("RemoveSysMenu error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "删除失败")
 		return
 	}
 	e.OK(c, control.GetId(), "删除成功")
@@ -180,24 +244,25 @@ func (e *SysMenu) DeleteSysMenu(c *gin.Context) {
 // @Router /api/v1/menurole [get]
 // @Security Bearer
 func (e *SysMenu) GetMenuRole(c *gin.Context) {
-	msgID := tools.GenerateMsgIDFromContext(c)
+	log := e.GetLogger(c)
 	db, err := tools.GetOrm(c)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.MsgID = msgID
+	serviceSysMenu.Log = log
 	serviceSysMenu.Orm = db
 	result, err := serviceSysMenu.SetMenuRole(tools.GetRoleName(c))
 
 	if err != nil {
-		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
 		return
 	}
 
-	app.OK(c, result, "")
+	e.OK(c, result, "")
 }
 
 // @Summary 获取角色对应的菜单id数组
@@ -209,41 +274,52 @@ func (e *SysMenu) GetMenuRole(c *gin.Context) {
 // @Router /api/v1/menuids/{id} [get]
 // @Security Bearer
 func (e *SysMenu) GetMenuIDS(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := tools.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
 	var data models.RoleMenu
 	data.RoleName = c.GetString("role")
 	data.UpdateBy = tools.GetUserIdStr(c)
-	result, err := data.GetIDS()
-	tools.HasError(err, "获取失败", 500)
-	app.OK(c, result, "")
-}
-
-// GetMenuTreeRoleselect 角色修改中的菜单列表
-func (e *SysMenu) GetMenuTreeRoleselect(c *gin.Context) {
-	var Menu models.Menu
-	var SysRole models.SysRole
-
-	id, err := tools.StringToInt(c.Param("roleId"))
-	SysRole.RoleId = id
-	//var r *models.SysRole
-	r, err := SysRole.Get()
-
-	var result *[]models.MenuLable
-	menuIds := make([]int, 0)
-	if r.RoleKey != "admin" {
-		result, err = Menu.SetMenuLabel()
-		tools.HasError(err, "抱歉未找到相关信息", -1)
-		if id != 0 {
-			menuIds, err = SysRole.GetRoleMeunId()
-			tools.HasError(err, "抱歉未找到相关信息", -1)
-		}
+	result, err := data.GetIDS(db)
+	if err != nil {
+		log.Errorf("GetIDS error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "获取失败")
+		return
 	}
-	app.Custum(c, gin.H{
-		"code":        200,
-		"menus":       result,
-		"checkedKeys": menuIds,
-	})
+	e.OK(c, result, "")
 }
 
+//// GetMenuTreeRoleselect 角色修改中的菜单列表
+//func (e *SysMenu) GetMenuTreeRoleselect(c *gin.Context) {
+//	var Menu models.Menu
+//	var SysRole models.SysRole
+//
+//	id, err := tools.StringToInt(c.Param("roleId"))
+//	SysRole.RoleId = id
+//	//var r *models.SysRole
+//	r, err := SysRole.Get()
+//
+//	var result *[]models.MenuLable
+//	menuIds := make([]int, 0)
+//	if r.RoleKey != "admin" {
+//		result, err = Menu.SetMenuLabel()
+//		tools.HasError(err, "抱歉未找到相关信息", -1)
+//		if id != 0 {
+//			menuIds, err = SysRole.GetRoleMeunId()
+//			tools.HasError(err, "抱歉未找到相关信息", -1)
+//		}
+//	}
+//	app.Custum(c, gin.H{
+//		"code":        200,
+//		"menus":       result,
+//		"checkedKeys": menuIds,
+//	})
+//}
+
 // @Summary 获取菜单树
 // @Description 获取JSON
 // @Tags 菜单
@@ -254,14 +330,16 @@ func (e *SysMenu) GetMenuTreeRoleselect(c *gin.Context) {
 // @Router /api/v1/menuTreeselect [get]
 // @Security Bearer
 func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) {
-	msgID := tools.GenerateMsgIDFromContext(c)
-	d := new(dto.SysMenuSearch)
+	log := e.GetLogger(c)
 	db, err := tools.GetOrm(c)
 	if err != nil {
-		log.Error(err)
+		log.Errorf("get db connection error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
+	d := new(dto.SysMenuSearch)
+
 	err = d.Bind(c)
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
@@ -269,7 +347,7 @@ func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) {
 	}
 
 	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.MsgID = msgID
+	serviceSysMenu.Log = log
 	serviceSysMenu.Orm = db
 	result, err := serviceSysMenu.SetSysMenuLabel(d)