feat✨ apis路径简化

app/admin/apis/captcha.go

@@ -11,7 +11,7 @@ type System struct {
 }
 
 func (e System) GenerateCaptchaHandler(c *gin.Context) {
-	e.Context = c
+	e.MakeContext(c)
 	log := e.GetLogger()
 	id, b64s, err := captcha.DriverDigitFunc()
 	if err != nil {
@@ -25,4 +25,4 @@ func (e System) GenerateCaptchaHandler(c *gin.Context) {
 		"id":   id,
 		"msg":  "success",
 	})
-}
+}

app/admin/apis/sys_api.go

@@ -88,7 +88,7 @@ func (e SysApi) GetSysApi(c *gin.Context) {
 	control := new(dto.SysApiById)
 
 	//查看详情
-	err = control.Bind(c)
+	err = e.Bind(control)
 	if err != nil {
 		log.Warnf("request body bind error, %s", err.Error())
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
@@ -112,56 +112,6 @@ func (e SysApi) GetSysApi(c *gin.Context) {
 	e.OK(object, "查看成功")
 }
 
-// InsertSysApi 创建接口管理
-// @Summary 创建接口管理
-// @Description 创建接口管理
-// @Tags 接口管理
-// @Accept application/json
-// @Product application/json
-// @Param data body dto.SysApiControl true "data"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "添加成功"}"
-// @Router /api/v1/sys_api [post]
-// @Security Bearer
-//func (e SysApi) InsertSysApi(c *gin.Context) {
-//	e.MakeContext(c)
-//	log := e.GetLogger()
-//	db, err := e.GetOrm()
-//	if err != nil {
-//		log.Error(err)
-//		return
-//	}
-//
-//	control := new(dto.SysApiControl)
-//
-//	//新增操作
-//	err = control.Bind(c)
-//	if err != nil {
-//		log.Warnf("request body bind error, %s", err.Error())
-//		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-//		return
-//	}
-//	object, err := control.GenerateM()
-//	if err != nil {
-//		log.Errorf("generate SysApi model error, %s", err.Error())
-//		e.Error(http.StatusInternalServerError, err, "模型生成失败")
-//		return
-//	}
-//	// 设置创建人
-//	object.SetCreateBy(user.GetUserId(c))
-//
-//	serviceSysApi := service.SysApi{}
-//	serviceSysApi.Orm = db
-//	serviceSysApi.Log = log
-//	err = serviceSysApi.InsertSysApi(object.(*models.SysApi))
-//	if err != nil {
-//		log.Errorf("Insert SysApi error, %s", err.Error())
-//		e.Error(http.StatusInternalServerError, err, "创建失败")
-//		return
-//	}
-//
-//	e.OK(object.GetId(), "创建成功")
-//}
-
 // UpdateSysApi 修改接口管理
 // @Summary 修改接口管理
 // @Description 修改接口管理

app/admin/apis/sys_config.go

@@ -2,12 +2,12 @@ package apis
 
 import (
 	"github.com/gin-gonic/gin/binding"
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -35,7 +35,7 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysConfig, 0)
+	list := make([]models.SysConfig, 0)
 	var count int64
 	s := service.SysConfig{}
 	s.Log = log
@@ -69,7 +69,7 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
 	// 控制只读前台的数据
 	d.IsFrontend = 1
 
-	list := make([]system.SysConfig, 0)
+	list := make([]models.SysConfig, 0)
 	s := service.SysConfig{}
 	s.Log = log
 	s.Orm = db
@@ -107,7 +107,7 @@ func (e SysConfig) GetSysConfig(c *gin.Context) {
 		e.Error(500, err, "Orm获取失败")
 		return
 	}
-	var object system.SysConfig
+	var object models.SysConfig
 
 	serviceSysLoginLog := service.SysConfig{}
 	serviceSysLoginLog.Log = log

app/admin/apis/sys_dept.go

@@ -2,13 +2,13 @@ package apis
 
 import (
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -44,7 +44,7 @@ func (e SysDept) GetSysDeptList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysDept, 0)
+	list := make([]models.SysDept, 0)
 	serviceStudent := service.SysDept{}
 	serviceStudent.Log = log
 	serviceStudent.Orm = db
@@ -81,7 +81,7 @@ func (e SysDept) GetSysDept(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysDept
+	var object models.SysDept
 
 	serviceSysOperlog := service.SysDept{}
 	serviceSysOperlog.Log = log
@@ -291,4 +291,4 @@ func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
 		"depts":       result,
 		"checkedKeys": menuIds,
 	}, "")
-}
+}

app/admin/apis/sys_dict_data.go

@@ -1,13 +1,13 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -48,7 +48,7 @@ func (e SysDictData) GetSysDictDataList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysDictData, 0)
+	list := make([]models.SysDictData, 0)
 	var count int64
 	s := service.SysDictData{}
 	s.Log = log
@@ -87,7 +87,7 @@ func (e SysDictData) GetSysDictData(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysDictData
+	var object models.SysDictData
 
 	s := service.SysDictData{}
 	s.Log = log
@@ -136,7 +136,7 @@ func (e SysDictData) InsertSysDictData(c *gin.Context) {
 	s := service.SysDictData{}
 	s.Orm = db
 	s.Log = log
-	err = s.Insert(object.(*system.SysDictData))
+	err = s.Insert(object.(*models.SysDictData))
 	if err != nil {
 		log.Errorf("Insert error, %s", err)
 		e.Error(http.StatusInternalServerError, err, "创建失败")
@@ -179,7 +179,7 @@ func (e SysDictData) UpdateSysDictData(c *gin.Context) {
 	s := service.SysDictData{}
 	s.Orm = db
 	s.Log = log
-	err = s.Update(object.(*system.SysDictData))
+	err = s.Update(object.(*models.SysDictData))
 	if err != nil {
 		log.Errorf("Update error, %s", err)
 		e.Error(http.StatusInternalServerError, err, "更新失败")
@@ -226,7 +226,7 @@ func (e SysDictData) DeleteSysDictData(c *gin.Context) {
 	s := service.SysDictData{}
 	s.Orm = db
 	s.Log = log
-	err = s.Remove(req, object.(*system.SysDictData))
+	err = s.Remove(req, object.(*models.SysDictData))
 	if err != nil {
 		log.Errorf("Remove error, %s", err)
 		e.Error(http.StatusInternalServerError, err, "删除失败")
@@ -254,7 +254,7 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysDictData, 0)
+	list := make([]models.SysDictData, 0)
 	s := service.SysDictData{}
 	s.Log = log
 	s.Orm = db
@@ -266,4 +266,4 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) {
 	}
 
 	e.OK(list, "查询成功")
-}
+}

app/admin/apis/sys_dict_type.go

@@ -1,13 +1,13 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -47,7 +47,7 @@ func (e SysDictType) GetSysDictTypeList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysDictType, 0)
+	list := make([]models.SysDictType, 0)
 	var count int64
 	s := service.SysDictType{}
 	s.Log = log
@@ -84,7 +84,7 @@ func (e SysDictType) GetSysDictType(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysDictType
+	var object models.SysDictType
 
 	s := service.SysDictType{}
 	s.Log = log
@@ -131,7 +131,7 @@ func (e SysDictType) InsertSysDictType(c *gin.Context) {
 	s := service.SysDictType{}
 	s.Orm = db
 	s.Log = log
-	err = s.Insert(object.(*system.SysDictType))
+	err = s.Insert(object.(*models.SysDictType))
 	if err != nil {
 		log.Error(err)
 		e.Error(http.StatusInternalServerError, err, "创建失败")
@@ -173,7 +173,7 @@ func (e SysDictType) UpdateSysDictType(c *gin.Context) {
 	s := service.SysDictType{}
 	s.Orm = db
 	s.Log = log
-	err = s.Update(object.(*system.SysDictType))
+	err = s.Update(object.(*models.SysDictType))
 	if err != nil {
 		log.Error(err)
 		return
@@ -218,7 +218,7 @@ func (e SysDictType) DeleteSysDictType(c *gin.Context) {
 	s := service.SysDictType{}
 	s.Orm = db
 	s.Log = log
-	err = s.Remove(req, object.(*system.SysDictType))
+	err = s.Remove(req, object.(*models.SysDictType))
 	if err != nil {
 		log.Error(err)
 		return
@@ -253,7 +253,7 @@ func (e SysDictType) GetSysDictTypeAll(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysDictType, 0)
+	list := make([]models.SysDictType, 0)
 	s := service.SysDictType{}
 	s.Log = log
 	s.Orm = db
@@ -264,4 +264,4 @@ func (e SysDictType) GetSysDictTypeAll(c *gin.Context) {
 	}
 
 	e.OK(list, "查询成功")
-}
+}

app/admin/apis/sys_login_log.go

@@ -1,12 +1,12 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -33,7 +33,7 @@ func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysLoginLog, 0)
+	list := make([]models.SysLoginLog, 0)
 	var count int64
 	serviceStudent := service.SysLoginLog{}
 	serviceStudent.Log = log
@@ -63,7 +63,7 @@ func (e SysLoginLog) GetSysLoginLog(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysLoginLog
+	var object models.SysLoginLog
 
 	serviceSysLoginLog := service.SysLoginLog{}
 	serviceSysLoginLog.Log = log
@@ -185,4 +185,4 @@ func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) {
 		return
 	}
 	e.OK(object.GetId(), "删除成功")
-}
+}

app/admin/apis/sys_menu.go

@@ -1,12 +1,12 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -41,7 +41,7 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) {
 		return
 	}
 
-	var list *[]system.SysMenu
+	var list *[]models.SysMenu
 	serviceSysMenu := service.SysMenu{}
 	serviceSysMenu.Log = log
 	serviceSysMenu.Orm = db
@@ -54,6 +54,7 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) {
 	e.OK(list, "查询成功")
 }
 
+// GetSysMenu 获取菜单详情
 // @Summary Menu详情数据
 // @Description 获取JSON
 // @Tags 菜单
@@ -80,7 +81,7 @@ func (e SysMenu) GetSysMenu(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysMenu
+	var object models.SysMenu
 
 	serviceSysMenu := service.SysMenu{}
 	serviceSysMenu.Log = log
@@ -94,6 +95,8 @@ func (e SysMenu) GetSysMenu(c *gin.Context) {
 	e.OK(object, "查看成功")
 }
 
+
+// InsertSysMenu 创建菜单
 // @Summary 创建菜单
 // @Description 获取JSON
 // @Tags 菜单
@@ -148,6 +151,7 @@ func (e SysMenu) InsertSysMenu(c *gin.Context) {
 	e.OK(object.GetId(), "创建成功")
 }
 
+// UpdateSysMenu 修改菜单
 // @Summary 修改菜单
 // @Description 获取JSON
 // @Tags 菜单
@@ -280,7 +284,7 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) {
 		log.Error(err)
 		return
 	}
-	var data system.RoleMenu
+	var data models.RoleMenu
 	data.RoleName = c.GetString("role")
 	data.UpdateBy = user.GetUserId(c)
 	result, err := data.GetIDS(db)
@@ -366,4 +370,4 @@ func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
 		"menus":       result,
 		"checkedKeys": menuIds,
 	}, "获取成功")
-}
+}

app/admin/apis/sys_opera_log.go

@@ -1,12 +1,12 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -33,7 +33,7 @@ func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysOperaLog, 0)
+	list := make([]models.SysOperaLog, 0)
 	var count int64
 	serviceStudent := service.SysOperaLog{}
 	serviceStudent.Log = log
@@ -63,7 +63,7 @@ func (e SysOperaLog) GetSysOperaLog(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysOperaLog
+	var object models.SysOperaLog
 
 	serviceSysOperlog := service.SysOperaLog{}
 	serviceSysOperlog.Log = log
@@ -175,4 +175,4 @@ func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) {
 		return
 	}
 	e.OK(control.GetId(), "删除成功")
-}
+}

app/admin/apis/sys_post.go

@@ -1,13 +1,13 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -44,7 +44,7 @@ func (e SysPost) GetSysPostList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysPost, 0)
+	list := make([]models.SysPost, 0)
 	var count int64
 	serviceStudent := service.SysPost{}
 	serviceStudent.Log = log
@@ -81,7 +81,7 @@ func (e SysPost) GetSysPost(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysPost
+	var object models.SysPost
 
 	serviceSysOperlog := service.SysPost{}
 	serviceSysOperlog.Log = log
@@ -220,4 +220,4 @@ func (e SysPost) DeleteSysPost(c *gin.Context) {
 		return
 	}
 	e.OK(control.GetId(), "删除成功")
-}
+}

app/admin/apis/sys_role.go

@@ -1,13 +1,13 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/apis"
@@ -46,7 +46,7 @@ func (e SysRole) GetSysRoleList(c *gin.Context) {
 		return
 	}
 
-	list := make([]system.SysRole, 0)
+	list := make([]models.SysRole, 0)
 	var count int64
 	s := service.SysRole{}
 	s.Log = log
@@ -84,7 +84,7 @@ func (e SysRole) GetSysRole(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysRole
+	var object models.SysRole
 
 	s := service.SysRole{}
 	s.Log = log
@@ -261,7 +261,7 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	data := &system.SysRole{
+	data := &models.SysRole{
 		RoleId:    control.RoleId,
 		DataScope: control.DataScope,
 		DeptIds:   control.DeptIds,
@@ -276,4 +276,4 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) {
 		return
 	}
 	e.OK(nil, "操作成功")
-}
+}

app/admin/apis/sys_user.go

@@ -1,6 +1,7 @@
 package apis
 
 import (
+	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -8,7 +9,6 @@ import (
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"github.com/google/uuid"
 
-	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
@@ -51,7 +51,7 @@ func (e SysUser) GetSysUserList(c *gin.Context) {
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	list := make([]system.SysUser, 0)
+	list := make([]models.SysUser, 0)
 	var count int64
 	serviceStudent := service.SysUser{}
 	serviceStudent.Log = log
@@ -89,7 +89,7 @@ func (e SysUser) GetSysUser(c *gin.Context) {
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	var object system.SysUser
+	var object models.SysUser
 
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
@@ -288,7 +288,7 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) {
 		}
 	}
 
-	object := &system.SysUser{
+	object := &models.SysUser{
 		UserId: p.UserId,
 		Avatar: "/" + filPath,
 	}
@@ -363,9 +363,9 @@ func (e SysUser) GetSysUserProfile(c *gin.Context) {
 	serviceSysUser := service.SysUser{}
 	serviceSysUser.Log = log
 	serviceSysUser.Orm = db
-	user := new(system.SysUser)
-	roles := make([]system.SysRole, 0)
-	posts := make([]system.SysPost, 0)
+	user := new(models.SysUser)
+	roles := make([]models.SysRole, 0)
+	posts := make([]models.SysPost, 0)
 	err = serviceSysUser.GetSysUserProfile(id, user, &roles, &posts)
 	if err != nil {
 		log.Errorf("get user profile error, %s", err.Error())
@@ -432,7 +432,7 @@ func (e SysUser) GetInfo(c *gin.Context) {
 	var buttons = make([]string, 1)
 	buttons[0] = "*:*:*"
 
-	RoleMenu := system.RoleMenu{}
+	RoleMenu := models.RoleMenu{}
 	RoleMenu.RoleId = user.GetRoleId(c)
 
 	var mp = make(map[string]interface{})
@@ -446,7 +446,7 @@ func (e SysUser) GetInfo(c *gin.Context) {
 		mp["buttons"] = list
 	}
 
-	var sysUser system.SysUser
+	var sysUser models.SysUser
 	req := new(dto.SysUserById)
 	req.Id = user.GetUserId(c)
 	serviceSysUser := service.SysUser{}
@@ -469,4 +469,4 @@ func (e SysUser) GetInfo(c *gin.Context) {
 	mp["deptId"] = sysUser.DeptId
 	mp["name"] = sysUser.NickName
 	e.OK(mp, "")
-}
+}