feat✨ 结构统一调整

app/admin/apis/captcha.go

@@ -2,12 +2,12 @@ package apis
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/captcha"
-	"go-admin/common/apis"
 )
 
 type System struct {
-	apis.Api
+	api.Api
 }
 
 func (e System) GenerateCaptchaHandler(c *gin.Context) {

app/admin/apis/sys_api.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
@@ -11,11 +12,10 @@ import (
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
-	"go-admin/common/apis"
 )
 
 type SysApi struct {
-	apis.Api
+	api.Api
 }
 
 // GetSysApiList 获取接口管理列表

app/admin/apis/sys_config.go

@@ -1,20 +1,20 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
+	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 )
 
 type SysConfig struct {
-	apis.Api
+	api.Api
 }
 
 func (e SysConfig) GetSysConfigList(c *gin.Context) {

app/admin/apis/sys_dept.go

@@ -6,16 +6,16 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 )
 
 type SysDept struct {
-	apis.Api
+	api.Api
 }
 
 // @Summary 分页部门列表数据

app/admin/apis/sys_dict_data.go

@@ -5,17 +5,17 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 	common "go-admin/common/models"
 )
 
 type SysDictData struct {
-	apis.Api
+	api.Api
 }
 
 // @Summary 字典数据列表

app/admin/apis/sys_dict_type.go

@@ -5,17 +5,17 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 	common "go-admin/common/models"
 )
 
 type SysDictType struct {
-	apis.Api
+	api.Api
 }
 
 // @Summary 字典类型列表数据

app/admin/apis/sys_login_log.go

@@ -5,15 +5,15 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 )
 
 type SysLoginLog struct {
-	apis.Api
+	api.Api
 }
 
 func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) {

app/admin/apis/sys_menu.go

@@ -5,17 +5,18 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 )
 
 type SysMenu struct {
-	apis.Api
+	api.Api
 }
 
+// GetSysMenuList Menu列表数据
 // @Summary Menu列表数据
 // @Description 获取JSON
 // @Tags 菜单
@@ -65,28 +66,20 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) {
 // @Security Bearer
 func (e SysMenu) GetSysMenu(c *gin.Context) {
 	control := new(dto.SysMenuById)
-
-	e.Context = c
-	log := e.GetLogger()
-
-	db, err := e.GetOrm()
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(control, nil).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
+		e.Error(http.StatusInternalServerError, err, err.Error())
+		e.Logger.Error(err)
 		return
 	}
 	var object models.SysMenu
 
-	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.Log = log
-	serviceSysMenu.Orm = db
-	err = serviceSysMenu.GetSysMenu(control, &object)
+	err = s.GetSysMenu(control, &object)
 	if err != nil {
 		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
 		return
@@ -179,58 +172,45 @@ func (e SysMenu) UpdateSysMenu(c *gin.Context) {
 // @Router /api/v1/menu/ [delete]
 func (e SysMenu) DeleteSysMenu(c *gin.Context) {
 	control := new(dto.SysMenuById)
-
-	e.Context = c
-	log := e.GetLogger()
-
-	db, err := e.GetOrm()
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(control).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
+		e.Logger.Error(err)
 		return
 	}
-
-	//删除操作
-	err = control.Bind(c)
+	err = s.RemoveSysMenu(control).Error
 	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-
-	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.Orm = db
-	serviceSysMenu.Log = log
-	err = serviceSysMenu.RemoveSysMenu(control)
-	if err != nil {
-		log.Errorf("RemoveSysMenu error, %s", err)
+		e.Logger.Errorf("RemoveSysMenu error, %s", err)
 		e.Error(http.StatusInternalServerError, err, "删除失败")
 		return
 	}
 	e.OK(control.GetId(), "删除成功")
 }
 
-// GetMenuRole 根据角色名称获取菜单列表数据（左菜单使用）
-// @Summary 根据角色名称获取菜单列表数据（左菜单使用）
+// GetMenuRole 根据登录角色名称获取菜单列表数据（左菜单使用）
+// @Summary 根据登录角色名称获取菜单列表数据（左菜单使用）
 // @Description 获取JSON
 // @Tags 菜单
-// @Param id path int true "id"
 // @Success 200 {string} string "{"code": 200, "data": [...]}"
 // @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
 // @Router /api/v1/menurole [get]
 // @Security Bearer
 func (e SysMenu) GetMenuRole(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
+		e.Logger.Error(err)
 		return
 	}
 
-	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.Log = log
-	serviceSysMenu.Orm = db
-	result, err := serviceSysMenu.SetMenuRole(user.GetRoleName(c))
+	result, err := s.SetMenuRole(user.GetRoleName(c))
 
 	if err != nil {
 		e.Error(http.StatusInternalServerError, err, "查询失败")
@@ -250,19 +230,21 @@ func (e SysMenu) GetMenuRole(c *gin.Context) {
 // @Router /api/v1/menuids/{id} [get]
 // @Security Bearer
 func (e SysMenu) GetMenuIDS(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
+		e.Logger.Error(err)
 		return
 	}
 	var data models.RoleMenu
 	data.RoleName = c.GetString("role")
 	data.UpdateBy = user.GetUserId(c)
-	result, err := data.GetIDS(db)
+	result, err := data.GetIDS(s.Orm)
 	if err != nil {
-		log.Errorf("GetIDS error, %s", err.Error())
+		e.Logger.Errorf("GetIDS error, %s", err.Error())
 		e.Error(http.StatusInternalServerError, err, "获取失败")
 		return
 	}
@@ -280,38 +262,35 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) {
 // @Router /api/v1/menuTreeselect [get]
 // @Security Bearer
 func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
+	s := new(service.SysMenu)
+	sr := new(service.SysRole)
 	d := new(dto.SelectRole)
-
-	err = c.BindUri(d)
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		MakeService(&sr.Service).
+		Bind(&d, nil).
+		Errors
 	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
+		e.Logger.Error(err)
+		e.Error(http.StatusUnprocessableEntity, err, err.Error())
 		return
 	}
 
-	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.Log = log
-	serviceSysMenu.Orm = db
-	result, err := serviceSysMenu.SetSysMenuLabel()
+	result, err := s.SetSysMenuLabel()
 	if err != nil {
 		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
 		return
 	}
-	s := service.SysRole{}
-	s.Log = log
-	s.Orm = db
-	menuIds, err := s.GetRoleMenuId(db, d.RoleId)
-	if err != nil {
-		log.Errorf("GetIDS error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "")
-		return
+
+	menuIds := make([]int, 0)
+	if d.RoleId != 0 {
+		menuIds, err = sr.GetRoleMenuId(d.RoleId)
+		if err != nil {
+			e.Logger.Errorf("GetRoleMenuId error, %s", err.Error())
+			e.Error(http.StatusInternalServerError, err, "")
+			return
+		}
 	}
 	e.OK(gin.H{
 		"menus":       result,

app/admin/apis/sys_opera_log.go

@@ -5,15 +5,15 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 )
 
 type SysOperaLog struct {
-	apis.Api
+	api.Api
 }
 
 func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) {

app/admin/apis/sys_post.go

@@ -1,20 +1,20 @@
 package apis
 
 import (
-	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 )
 
 type SysPost struct {
-	apis.Api
+	api.Api
 }
 
 // @Summary 岗位列表数据

app/admin/apis/sys_role.go

@@ -1,21 +1,22 @@
 package apis
 
 import (
+	"github.com/go-admin-team/go-admin-core/sdk"
 	"go-admin/app/admin/models"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/apis"
 	"go-admin/common/global"
 )
 
 type SysRole struct {
-	apis.Api
+	api.Api
 }
 
 // @Summary 角色列表数据
@@ -109,38 +110,27 @@ func (e SysRole) GetSysRole(c *gin.Context) {
 // @Router /api/v1/role [post]
 // @Security Bearer
 func (e SysRole) InsertSysRole(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysRoleControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "模型生成失败")
-		return
-	}
-	// 设置创建人
-	object.CreateBy = user.GetUserId(c)
-	if object.Status == "" {
-		object.Status = "2"
-	}
-
 	s := service.SysRole{}
-	s.Orm = db
-	s.Log = log
-	err = s.InsertSysRole(object)
+	control := new(dto.SysRoleControl)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(control).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
+		e.Logger.Error(err)
+		return
+	}
+
+	// 设置创建人
+	control.CreateBy = user.GetUserId(c)
+	if control.Status == "" {
+		control.Status = "2"
+	}
+
+	err = s.InsertSysRole(control)
+	if err != nil {
+		e.Logger.Error(err)
 		e.Error(http.StatusInternalServerError, err, "创建失败")
 		return
 	}
@@ -149,9 +139,10 @@ func (e SysRole) InsertSysRole(c *gin.Context) {
 		e.Error(http.StatusInternalServerError, err, "")
 		return
 	}
-	e.OK(object.GetId(), "创建成功")
+	e.OK(control.GetId(), "创建成功")
 }
 
+// UpdateSysRole 修改用户角色
 // @Summary 修改用户角色
 // @Description 获取JSON
 // @Tags 角色/Role
@@ -163,34 +154,24 @@ func (e SysRole) InsertSysRole(c *gin.Context) {
 // @Router /api/v1/role/{id} [put]
 // @Security Bearer
 func (e SysRole) UpdateSysRole(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysRoleControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "模型生成失败")
-		return
-	}
-	object.UpdateBy = user.GetUserId(c)
-
 	s := service.SysRole{}
-	s.Orm = db
-	s.Log = log
-	err = s.UpdateSysRole(object)
+	control := new(dto.SysRoleControl)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(control).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
+		e.Logger.Error(err)
+		return
+	}
+	cb :=sdk.Runtime.GetCasbinKey(c.Request.Host)
+
+	control.SetUpdateBy(user.GetUserId(c))
+
+	err = s.UpdateSysRole(control,cb)
+	if err != nil {
+		e.Logger.Error(err)
 		return
 	}
 	_, err = global.LoadPolicy(c)
@@ -198,7 +179,7 @@ func (e SysRole) UpdateSysRole(c *gin.Context) {
 		e.Error(http.StatusInternalServerError, err, "")
 		return
 	}
-	e.OK(object.GetId(), "更新成功")
+	e.OK(control.GetId(), "更新成功")
 }
 
 // @Summary 删除用户角色

app/admin/apis/sys_user.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"github.com/google/uuid"
@@ -12,12 +13,11 @@ import (
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
-	"go-admin/common/apis"
 	common "go-admin/common/models"
 )
 
 type SysUser struct {
-	apis.Api
+	api.Api
 }
 
 // @Summary 列表用户信息数据

app/admin/apis/tools/gen.go

@@ -15,11 +15,10 @@ import (
 
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/models/tools"
-	"go-admin/common/apis"
 )
 
 type Gen struct {
-	apis.Api
+	api.Api
 }
 
 func (e Gen) Preview(c *gin.Context) {

app/admin/apis/tools/systables.go

@@ -5,17 +5,17 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models/tools"
-	"go-admin/common/apis"
 )
 
 type SysTable struct {
-	apis.Api
+	api.Api
 }
 
 // GetSysTableList 分页列表数据
@@ -348,4 +348,4 @@ func (e *SysTable) DeleteSysTables(c *gin.Context) {
 		return
 	}
 	e.OK(nil, "删除成功")
-}
+}