refactor🎨: request name cancel

app/admin/apis/sys_api.go

@@ -9,7 +9,7 @@ import (
 
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 )
 
@@ -32,7 +32,7 @@ type SysApi struct {
 // @Security Bearer
 func (e SysApi) GetPage(c *gin.Context) {
 	s := service.SysApi{}
-	req := request.SysApiGetPageReq{}
+	req := dto.SysApiGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -64,7 +64,7 @@ func (e SysApi) GetPage(c *gin.Context) {
 // @Router /api/v1/sys-api/{id} [get]
 // @Security Bearer
 func (e SysApi) Get(c *gin.Context) {
-	req := request.SysApiGetReq{}
+	req := dto.SysApiGetReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -97,7 +97,7 @@ func (e SysApi) Get(c *gin.Context) {
 // @Router /api/v1/sys-api/{id} [put]
 // @Security Bearer
 func (e SysApi) Update(c *gin.Context) {
-	req := request.SysApiUpdateReq{}
+	req := dto.SysApiUpdateReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -127,7 +127,7 @@ func (e SysApi) Update(c *gin.Context) {
 // @Router /api/v1/sys-api [delete]
 // @Security Bearer
 func (e SysApi) DeleteSysApi(c *gin.Context) {
-	req := request.SysApiDeleteReq{}
+	req := dto.SysApiDeleteReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().

app/admin/apis/sys_config.go

@@ -8,7 +8,7 @@ import (
 
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysConfig struct {
@@ -30,7 +30,7 @@ type SysConfig struct {
 // @Security Bearer
 func (e SysConfig) GetPage(c *gin.Context) {
 	s := service.SysConfig{}
-	req := request.SysConfigSearch{}
+	req := dto.SysConfigSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -60,7 +60,7 @@ func (e SysConfig) GetPage(c *gin.Context) {
 // @Router /api/v1/sys-config/{id} [get]
 // @Security Bearer
 func (e SysConfig) Get(c *gin.Context) {
-	req := request.SysConfigById{}
+	req := dto.SysConfigById{}
 	s := service.SysConfig{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -95,7 +95,7 @@ func (e SysConfig) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysConfig) Insert(c *gin.Context) {
 	s := service.SysConfig{}
-	req := request.SysConfigControl{}
+	req := dto.SysConfigControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -128,7 +128,7 @@ func (e SysConfig) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysConfig) Update(c *gin.Context) {
 	s := service.SysConfig{}
-	req := request.SysConfigControl{}
+	req := dto.SysConfigControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -158,7 +158,7 @@ func (e SysConfig) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysConfig) Delete(c *gin.Context) {
 	s := service.SysConfig{}
-	req := request.SysConfigById{}
+	req := dto.SysConfigById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -186,7 +186,7 @@ func (e SysConfig) Delete(c *gin.Context) {
 // @Success 200 {object} response.Response{data=map[string]string} "{"code": 200, "data": [...]}"
 // @Router /api/v1/app-config [get]
 func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
-	req := request.SysConfigSearch{}
+	req := dto.SysConfigSearch{}
 	s := service.SysConfig{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -226,7 +226,7 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
 // @Security Bearer
 func (e SysConfig) Get2Set(c *gin.Context) {
 	s := service.SysConfig{}
-	req := make([]request.GetSetSysConfigReq, 0)
+	req := make([]dto.GetSetSysConfigReq, 0)
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -260,7 +260,7 @@ func (e SysConfig) Get2Set(c *gin.Context) {
 // @Security Bearer
 func (e SysConfig) Update2Set(c *gin.Context) {
 	s := service.SysConfig{}
-	req := make([]request.GetSetSysConfigReq, 0)
+	req := make([]dto.GetSetSysConfigReq, 0)
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -291,8 +291,8 @@ func (e SysConfig) Update2Set(c *gin.Context) {
 // @Security Bearer
 func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
 	var s = new(service.SysConfig)
-	var req = new(request.SysConfigByKeyReq)
-	var resp = new(request.GetSysConfigByKEYForServiceResp)
+	var req = new(dto.SysConfigByKeyReq)
+	var resp = new(dto.GetSysConfigByKEYForServiceResp)
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(req, nil).

app/admin/apis/sys_dept.go

@@ -10,7 +10,7 @@ import (
 	"go-admin/app/admin/models"
 
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysDept struct {
@@ -29,7 +29,7 @@ type SysDept struct {
 // @Security Bearer
 func (e SysDept) GetPage(c *gin.Context) {
 	s := service.SysDept{}
-	req := request.SysDeptSearch{}
+	req := dto.SysDeptSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -60,7 +60,7 @@ func (e SysDept) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysDept) Get(c *gin.Context) {
 	s := service.SysDept{}
-	req := request.SysDeptById{}
+	req := dto.SysDeptById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -95,7 +95,7 @@ func (e SysDept) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysDept) Insert(c *gin.Context) {
 	s := service.SysDept{}
-	req := request.SysDeptControl{}
+	req := dto.SysDeptControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -131,7 +131,7 @@ func (e SysDept) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysDept) Update(c *gin.Context) {
 	s := service.SysDept{}
-	req := request.SysDeptControl{}
+	req := dto.SysDeptControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -162,7 +162,7 @@ func (e SysDept) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysDept) Delete(c *gin.Context) {
 	s := service.SysDept{}
-	req := request.SysDeptById{}
+	req := dto.SysDeptById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -185,7 +185,7 @@ func (e SysDept) Delete(c *gin.Context) {
 // Get2Tree 用户管理 左侧部门树
 func (e SysDept) Get2Tree(c *gin.Context) {
 	s := service.SysDept{}
-	req := request.SysDeptSearch{}
+	req := dto.SysDeptSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req,binding.Form).
@@ -196,7 +196,7 @@ func (e SysDept) Get2Tree(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
-	list := make([]request.DeptLabel, 0)
+	list := make([]dto.DeptLabel, 0)
 	list, err = s.SetDeptTree(&req)
 	if err != nil {
 		e.Error(500, err, "查询失败")

app/admin/apis/sys_dict_data.go

@@ -9,7 +9,7 @@ import (
 	"go-admin/app/admin/models"
 
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysDictData struct {
@@ -30,7 +30,7 @@ type SysDictData struct {
 // @Security Bearer
 func (e SysDictData) GetPage(c *gin.Context) {
 	s := service.SysDictData{}
-	req := request.SysDictDataSearch{}
+	req := dto.SysDictDataSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -63,7 +63,7 @@ func (e SysDictData) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysDictData) Get(c *gin.Context) {
 	s := service.SysDictData{}
-	req := request.SysDictDataById{}
+	req := dto.SysDictDataById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -100,7 +100,7 @@ func (e SysDictData) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysDictData) Insert(c *gin.Context) {
 	s := service.SysDictData{}
-	req := request.SysDictDataControl{}
+	req := dto.SysDictDataControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -134,7 +134,7 @@ func (e SysDictData) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysDictData) Update(c *gin.Context) {
 	s := service.SysDictData{}
-	req := request.SysDictDataControl{}
+	req := dto.SysDictDataControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -165,7 +165,7 @@ func (e SysDictData) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysDictData) Delete(c *gin.Context) {
 	s := service.SysDictData{}
-	req := request.SysDictDataById{}
+	req := dto.SysDictDataById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -196,7 +196,7 @@ func (e SysDictData) Delete(c *gin.Context) {
 // @Security Bearer
 func (e SysDictData) GetSysDictDataAll(c *gin.Context) {
 	s := service.SysDictData{}
-	req := request.SysDictDataSearch{}
+	req := dto.SysDictDataSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).

app/admin/apis/sys_dict_type.go

@@ -10,7 +10,7 @@ import (
 	"go-admin/app/admin/models"
 
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysDictType struct {
@@ -31,7 +31,7 @@ type SysDictType struct {
 // @Security Bearer
 func (e SysDictType) GetPage(c *gin.Context) {
 	s := service.SysDictType{}
-	req := request.SysDictTypeSearch{}
+	req :=dto.SysDictTypeSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -62,7 +62,7 @@ func (e SysDictType) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysDictType) Get(c *gin.Context) {
 	s := service.SysDictType{}
-	req := request.SysDictTypeById{}
+	req :=dto.SysDictTypeById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -95,7 +95,7 @@ func (e SysDictType) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysDictType) Insert(c *gin.Context) {
 	s := service.SysDictType{}
-	req := request.SysDictTypeControl{}
+	req :=dto.SysDictTypeControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -129,7 +129,7 @@ func (e SysDictType) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysDictType) Update(c *gin.Context) {
 	s := service.SysDictType{}
-	req := request.SysDictTypeControl{}
+	req :=dto.SysDictTypeControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -160,7 +160,7 @@ func (e SysDictType) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysDictType) Delete(c *gin.Context) {
 	s := service.SysDictType{}
-	req := request.SysDictTypeById{}
+	req :=dto.SysDictTypeById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -192,7 +192,7 @@ func (e SysDictType) Delete(c *gin.Context) {
 // @Security Bearer
 func (e SysDictType) GetAll(c *gin.Context) {
 	s := service.SysDictType{}
-	req := request.SysDictTypeSearch{}
+	req :=dto.SysDictTypeSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).

app/admin/apis/sys_login_log.go

@@ -7,7 +7,7 @@ import (
 	"go-admin/app/admin/models"
 
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysLoginLog struct {
@@ -29,7 +29,7 @@ type SysLoginLog struct {
 // @Security Bearer
 func (e SysLoginLog) GetPage(c *gin.Context) {
 	s := service.SysLoginLog{}
-	req := request.SysLoginLogSearch {}
+	req :=dto.SysLoginLogSearch {}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -60,7 +60,7 @@ func (e SysLoginLog) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysLoginLog) Get(c *gin.Context) {
 	s := service.SysLoginLog{}
-	req := request.SysLoginLogGetReq{}
+	req :=dto.SysLoginLogGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -90,7 +90,7 @@ func (e SysLoginLog) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysLoginLog) Delete(c *gin.Context) {
 	s := service.SysLoginLog{}
-	req := request.SysLoginLogDeleteReq{}
+	req :=dto.SysLoginLogDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).

app/admin/apis/sys_menu.go

@@ -8,7 +8,7 @@ import (
 	"go-admin/app/admin/models"
 
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysMenu struct {
@@ -26,7 +26,7 @@ type SysMenu struct {
 // @Security Bearer
 func (e SysMenu) GetPage(c *gin.Context) {
 	s := service.SysMenu{}
-	req := request.SysMenuSearch{}
+	req := dto.SysMenuSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -55,7 +55,7 @@ func (e SysMenu) GetPage(c *gin.Context) {
 // @Router /api/v1/menu/{id} [get]
 // @Security Bearer
 func (e SysMenu) Get(c *gin.Context) {
-	req := request.SysMenuById{}
+	req := dto.SysMenuById{}
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -88,7 +88,7 @@ func (e SysMenu) Get(c *gin.Context) {
 // @Router /api/v1/menu [post]
 // @Security Bearer
 func (e SysMenu) Insert(c *gin.Context) {
-	req := request.SysMenuControl{}
+	req := dto.SysMenuControl{}
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -122,7 +122,7 @@ func (e SysMenu) Insert(c *gin.Context) {
 // @Router /api/v1/menu/{id} [put]
 // @Security Bearer
 func (e SysMenu) Update(c *gin.Context) {
-	req := request.SysMenuControl{}
+	req := dto.SysMenuControl{}
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -153,7 +153,7 @@ func (e SysMenu) Update(c *gin.Context) {
 // @Router /api/v1/menu [delete]
 // @Security Bearer
 func (e SysMenu) Delete(c *gin.Context) {
-	control := new(request.SysMenuById)
+	control := new(dto.SysMenuById)
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -254,7 +254,7 @@ func (e SysMenu) GetMenuRole(c *gin.Context) {
 func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
 	m := service.SysMenu{}
 	r := service.SysRole{}
-	req := request.SelectRole{}
+	req :=dto.SelectRole{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&m.Service).

app/admin/apis/sys_opera_log.go

@@ -7,7 +7,7 @@ import (
 	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysOperaLog struct {
@@ -31,7 +31,7 @@ type SysOperaLog struct {
 // @Security Bearer
 func (e SysOperaLog) GetPage(c *gin.Context) {
 	s := service.SysOperaLog{}
-	req := new(request.SysOperaLogGetPageReq)
+	req := new(dto.SysOperaLogGetPageReq)
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(req, binding.Form).
@@ -65,7 +65,7 @@ func (e SysOperaLog) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysOperaLog) Get(c *gin.Context) {
 	s := new(service.SysOperaLog)
-	req := request.SysOperaLogGetReq{}
+	req :=dto.SysOperaLogGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -96,7 +96,7 @@ func (e SysOperaLog) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysOperaLog) Delete(c *gin.Context) {
 	s := new(service.SysOperaLog)
-	req := request.SysOperaLogDeleteReq{}
+	req :=dto.SysOperaLogDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).

app/admin/apis/sys_post.go

@@ -10,7 +10,7 @@ import (
 
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 )
 
 type SysPost struct {
@@ -30,7 +30,7 @@ type SysPost struct {
 // @Security Bearer
 func (e SysPost) GetPage(c *gin.Context) {
 	s := service.SysPost{}
-	req := request.SysPostPageReq{}
+	req :=dto.SysPostPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -64,7 +64,7 @@ func (e SysPost) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysPost) Get(c *gin.Context) {
 	s := service.SysPost{}
-	req := request.SysPostGetReq{}
+	req :=dto.SysPostGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -99,7 +99,7 @@ func (e SysPost) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysPost) Insert(c *gin.Context) {
 	s := service.SysPost{}
-	req := request.SysPostInsertReq{}
+	req :=dto.SysPostInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -132,7 +132,7 @@ func (e SysPost) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysPost) Update(c *gin.Context) {
 	s := service.SysPost{}
-	req := request.SysPostUpdateReq{}
+	req :=dto.SysPostUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -165,7 +165,7 @@ func (e SysPost) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysPost) Delete(c *gin.Context) {
 	s := service.SysPost{}
-	req := request.SysPostDeleteReq{}
+	req :=dto.SysPostDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).

app/admin/apis/sys_role.go

@@ -13,7 +13,7 @@ import (
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	"go-admin/common/global"
 )
 
@@ -35,7 +35,7 @@ type SysRole struct {
 // @Security Bearer
 func (e SysRole) GetPage(c *gin.Context) {
 	s := service.SysRole{}
-	req := request.SysRoleSearch{}
+	req := dto.SysRoleSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -69,7 +69,7 @@ func (e SysRole) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysRole) Get(c *gin.Context) {
 	s := service.SysRole{}
-	req := request.SysRoleById{}
+	req := dto.SysRoleById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -104,7 +104,7 @@ func (e SysRole) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysRole) Insert(c *gin.Context) {
 	s := service.SysRole{}
-	req := request.SysRoleControl{}
+	req := dto.SysRoleControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -148,7 +148,7 @@ func (e SysRole) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysRole) Update(c *gin.Context) {
 	s := service.SysRole{}
-	req := request.SysRoleControl{}
+	req := dto.SysRoleControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil, binding.JSON).
@@ -186,7 +186,7 @@ func (e SysRole) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysRole) Delete(c *gin.Context) {
 	s := new(service.SysRole)
-	req := request.SysRoleById{}
+	req := dto.SysRoleById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -224,7 +224,7 @@ func (e SysRole) Delete(c *gin.Context) {
 // @Security Bearer
 func (e SysRole) Update2Status(c *gin.Context) {
 	s := service.SysRole{}
-	req := request.UpdateStatusReq{}
+	req := dto.UpdateStatusReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -256,7 +256,7 @@ func (e SysRole) Update2Status(c *gin.Context) {
 // @Security Bearer
 func (e SysRole) Update2DataScope(c *gin.Context) {
 	s := service.SysRole{}
-	req := request.RoleDataScopeReq{}
+	req := dto.RoleDataScopeReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).

app/admin/apis/sys_user.go

@@ -12,7 +12,7 @@ import (
 	"github.com/google/uuid"
 
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 )
 
@@ -30,7 +30,7 @@ type SysUser struct {
 // @Security Bearer
 func (e SysUser) GetPage(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.SysUserGetPageReq{}
+	req :=dto.SysUserGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -67,7 +67,7 @@ func (e SysUser) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Get(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.SysUserById{}
+	req :=dto.SysUserById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -101,7 +101,7 @@ func (e SysUser) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Insert(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.SysUserControl{}
+	req :=dto.SysUserInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -136,7 +136,7 @@ func (e SysUser) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Update(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.SysUserControl{}
+	req :=dto.SysUserUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -171,7 +171,7 @@ func (e SysUser) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Delete(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.SysUserById{}
+	req :=dto.SysUserById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -208,7 +208,7 @@ func (e SysUser) Delete(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) InsetAvatar(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.UpdateSysUserAvatarReq{}
+	req :=dto.UpdateSysUserAvatarReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -257,7 +257,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) UpdateStatus(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.UpdateSysUserStatusReq{}
+	req :=dto.UpdateSysUserStatusReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -294,7 +294,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) ResetPwd(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.ResetSysUserPwdReq{}
+	req :=dto.ResetSysUserPwdReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -331,7 +331,7 @@ func (e SysUser) ResetPwd(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) UpdatePwd(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.PassWord{}
+	req :=dto.PassWord{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -364,7 +364,7 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) GetProfile(c *gin.Context) {
 	s := service.SysUser{}
-	req := request.SysUserById{}
+	req :=dto.SysUserById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -401,7 +401,7 @@ func (e SysUser) GetProfile(c *gin.Context) {
 // @Router /api/v1/getinfo [get]
 // @Security Bearer
 func (e SysUser) GetInfo(c *gin.Context) {
-	req := request.SysUserById{}
+	req :=dto.SysUserById{}
 	s := service.SysUser{}
 	r := service.SysRole{}
 	err := e.MakeContext(c).

app/admin/service/dto/sys_api.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_config.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_dept.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_dict_data.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_dict_type.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_login_log.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_menu.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_opera_log.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"time"

app/admin/service/dto/sys_post.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_role.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"

app/admin/service/dto/sys_user.go

@@ -1,4 +1,4 @@
-package request
+package dto
 
 import (
 	"go-admin/app/admin/models"
@@ -88,7 +88,7 @@ func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) {
 	model.Status = s.Status
 }
 
-type SysUserControl struct {
+type SysUserInsertReq struct {
 	UserId   int    `json:"userId" comment:"用户ID"` // 用户ID
 	Username string `json:"username" comment:"用户名" binding:"required"`
 	Password string `json:"password" comment:"密码"`
@@ -105,7 +105,7 @@ type SysUserControl struct {
 	common.ControlBy
 }
 
-func (s *SysUserControl) Generate(model *models.SysUser) {
+func (s *SysUserInsertReq) Generate(model *models.SysUser) {
 	if s.UserId != 0 {
 		model.UserId = s.UserId
 	}
@@ -123,7 +123,44 @@ func (s *SysUserControl) Generate(model *models.SysUser) {
 	model.Status = s.Status
 }
 
-func (s *SysUserControl) GetId() interface{} {
+func (s *SysUserInsertReq) GetId() interface{} {
+	return s.UserId
+}
+
+type SysUserUpdateReq struct {
+	UserId   int    `json:"userId" comment:"用户ID"` // 用户ID
+	Username string `json:"username" comment:"用户名" binding:"required"`
+	NickName string `json:"nickName" comment:"昵称" binding:"required"`
+	Phone    string `json:"phone" comment:"手机号" binding:"required"`
+	RoleId   int    `json:"roleId" comment:"角色ID"`
+	Avatar   string `json:"avatar" comment:"头像"`
+	Sex      string `json:"sex" comment:"性别"`
+	Email    string `json:"email" comment:"邮箱" binding:"required,email"`
+	DeptId   int    `json:"deptId" comment:"部门" binding:"required"`
+	PostId   int    `json:"postId" comment:"岗位"`
+	Remark   string `json:"remark" comment:"备注"`
+	Status   string `json:"status" comment:"状态" binding:"required" default:"1"`
+	common.ControlBy
+}
+
+func (s *SysUserUpdateReq) Generate(model *models.SysUser) {
+	if s.UserId != 0 {
+		model.UserId = s.UserId
+	}
+	model.Username = s.Username
+	model.NickName = s.NickName
+	model.Phone = s.Phone
+	model.RoleId = s.RoleId
+	model.Avatar = s.Avatar
+	model.Sex = s.Sex
+	model.Email = s.Email
+	model.DeptId = s.DeptId
+	model.PostId = s.PostId
+	model.Remark = s.Remark
+	model.Status = s.Status
+}
+
+func (s *SysUserUpdateReq) GetId() interface{} {
 	return s.UserId
 }
 

app/admin/service/sys_api.go

@@ -9,7 +9,7 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
 )
@@ -19,7 +19,7 @@ type SysApi struct {
 }
 
 // GetPage 获取SysApi列表
-func (e *SysApi) GetPage(c *request.SysApiGetPageReq, p *actions.DataPermission, list *[]models.SysApi, count *int64) error {
+func (e *SysApi) GetPage(c *dto.SysApiGetPageReq, p *actions.DataPermission, list *[]models.SysApi, count *int64) error {
 	var err error
 	var data models.SysApi
 
@@ -39,7 +39,7 @@ func (e *SysApi) GetPage(c *request.SysApiGetPageReq, p *actions.DataPermission,
 }
 
 // Get 获取SysApi对象with id
-func (e *SysApi) Get(d *request.SysApiGetReq, p *actions.DataPermission, model *models.SysApi) *SysApi {
+func (e *SysApi) Get(d *dto.SysApiGetReq, p *actions.DataPermission, model *models.SysApi) *SysApi {
 	var data models.SysApi
 	err := e.Orm.Model(&data).
 		Scopes(
@@ -61,7 +61,7 @@ func (e *SysApi) Get(d *request.SysApiGetReq, p *actions.DataPermission, model *
 }
 
 // Update 修改SysApi对象
-func (e *SysApi) Update(c *request.SysApiUpdateReq, p *actions.DataPermission) error {
+func (e *SysApi) Update(c *dto.SysApiUpdateReq, p *actions.DataPermission) error {
 	var model = models.SysApi{}
 	db := e.Orm.Debug().First(&model, c.GetId())
 	if db.RowsAffected == 0 {
@@ -78,7 +78,7 @@ func (e *SysApi) Update(c *request.SysApiUpdateReq, p *actions.DataPermission) e
 }
 
 // Remove 删除SysApi
-func (e *SysApi) Remove(d *request.SysApiDeleteReq, p *actions.DataPermission) error {
+func (e *SysApi) Remove(d *dto.SysApiDeleteReq, p *actions.DataPermission) error {
 	var data models.SysApi
 
 	db := e.Orm.Model(&data).

app/admin/service/sys_config.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
@@ -16,7 +16,7 @@ type SysConfig struct {
 }
 
 // GetPage 获取SysConfig列表
-func (e *SysConfig) GetPage(c *request.SysConfigSearch, list *[]models.SysConfig, count *int64) error {
+func (e *SysConfig) GetPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error {
 	err := e.Orm.
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
@@ -32,7 +32,7 @@ func (e *SysConfig) GetPage(c *request.SysConfigSearch, list *[]models.SysConfig
 }
 
 // Get 获取SysConfig对象
-func (e *SysConfig) Get(d *request.SysConfigById, model *models.SysConfig) error {
+func (e *SysConfig) Get(d *dto.SysConfigById, model *models.SysConfig) error {
 	err := e.Orm.First(model, d.GetId()).Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		err = errors.New("查看对象不存在或无权查看")
@@ -47,7 +47,7 @@ func (e *SysConfig) Get(d *request.SysConfigById, model *models.SysConfig) error
 }
 
 // Insert 创建SysConfig对象
-func (e *SysConfig) Insert(c *request.SysConfigControl) error {
+func (e *SysConfig) Insert(c *dto.SysConfigControl) error {
 	var err error
 	var data models.SysConfig
 	c.Generate(&data)
@@ -60,7 +60,7 @@ func (e *SysConfig) Insert(c *request.SysConfigControl) error {
 }
 
 // Update 修改SysConfig对象
-func (e *SysConfig) Update(c *request.SysConfigControl) error {
+func (e *SysConfig) Update(c *dto.SysConfigControl) error {
 	var err error
 	var model = models.SysConfig{}
 	e.Orm.First(&model, c.GetId())
@@ -79,7 +79,7 @@ func (e *SysConfig) Update(c *request.SysConfigControl) error {
 }
 
 // SetSysConfig 修改SysConfig对象
-func (e *SysConfig) SetSysConfig(c *[]request.GetSetSysConfigReq) error {
+func (e *SysConfig) SetSysConfig(c *[]dto.GetSetSysConfigReq) error {
 	var err error
 	for _, req := range *c {
 		var model = models.SysConfig{}
@@ -100,7 +100,7 @@ func (e *SysConfig) SetSysConfig(c *[]request.GetSetSysConfigReq) error {
 	return nil
 }
 
-func (e *SysConfig) GetForSet(c *[]request.GetSetSysConfigReq) error {
+func (e *SysConfig) GetForSet(c *[]dto.GetSetSysConfigReq) error {
 	var err error
 	var data models.SysConfig
 
@@ -113,7 +113,7 @@ func (e *SysConfig) GetForSet(c *[]request.GetSetSysConfigReq) error {
 	return nil
 }
 
-func (e *SysConfig) UpdateForSet(c *[]request.GetSetSysConfigReq) error {
+func (e *SysConfig) UpdateForSet(c *[]dto.GetSetSysConfigReq) error {
 	m := *c
 	for _, req := range m {
 		var data models.SysConfig
@@ -137,7 +137,7 @@ func (e *SysConfig) UpdateForSet(c *[]request.GetSetSysConfigReq) error {
 }
 
 // Remove 删除SysConfig
-func (e *SysConfig) Remove(d *request.SysConfigById) error {
+func (e *SysConfig) Remove(d *dto.SysConfigById) error {
 	var err error
 	var data models.SysConfig
 
@@ -155,7 +155,7 @@ func (e *SysConfig) Remove(d *request.SysConfigById) error {
 }
 
 // GetWithKey 根据Key获取SysConfig
-func (e *SysConfig) GetWithKey(c *request.SysConfigByKeyReq, resp *request.GetSysConfigByKEYForServiceResp) error {
+func (e *SysConfig) GetWithKey(c *dto.SysConfigByKeyReq, resp *dto.GetSysConfigByKEYForServiceResp) error {
 	var err error
 	var data models.SysConfig
 	err = e.Orm.Table(data.TableName()).Where("config_key = ?", c.ConfigKey).First(resp).Error
@@ -167,7 +167,7 @@ func (e *SysConfig) GetWithKey(c *request.SysConfigByKeyReq, resp *request.GetSy
 	return nil
 }
 
-func (e *SysConfig) GetWithKeyList(c *request.SysConfigSearch, list *[]models.SysConfig) error {
+func (e *SysConfig) GetWithKeyList(c *dto.SysConfigSearch, list *[]models.SysConfig) error {
 	var err error
 	err = e.Orm.
 		Scopes(

app/admin/service/sys_dept.go

@@ -9,7 +9,7 @@ import (
 
 	"gorm.io/gorm"
 
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
@@ -20,7 +20,7 @@ type SysDept struct {
 }
 
 // GetPage 获取SysDept列表
-func (e *SysDept) GetPage(c *request.SysDeptSearch, list *[]models.SysDept) error {
+func (e *SysDept) GetPage(c *dto.SysDeptSearch, list *[]models.SysDept) error {
 	var err error
 	var data models.SysDept
 
@@ -37,7 +37,7 @@ func (e *SysDept) GetPage(c *request.SysDeptSearch, list *[]models.SysDept) erro
 }
 
 // Get 获取SysDept对象
-func (e *SysDept) Get(d *request.SysDeptById, model *models.SysDept) error {
+func (e *SysDept) Get(d *dto.SysDeptById, model *models.SysDept) error {
 	var err error
 	var data models.SysDept
 
@@ -57,7 +57,7 @@ func (e *SysDept) Get(d *request.SysDeptById, model *models.SysDept) error {
 }
 
 // Insert 创建SysDept对象
-func (e *SysDept) Insert(c *request.SysDeptControl) error {
+func (e *SysDept) Insert(c *dto.SysDeptControl) error {
 	var err error
 	var data models.SysDept
 	c.Generate(&data)
@@ -92,7 +92,7 @@ func (e *SysDept) Insert(c *request.SysDeptControl) error {
 }
 
 // Update 修改SysDept对象
-func (e *SysDept) Update(c *request.SysDeptControl) error {
+func (e *SysDept) Update(c *dto.SysDeptControl) error {
 	var err error
 	var model = models.SysDept{}
 	tx := e.Orm.Debug().Begin()
@@ -127,7 +127,7 @@ func (e *SysDept) Update(c *request.SysDeptControl) error {
 }
 
 // Remove 删除SysDept
-func (e *SysDept) Remove(d *request.SysDeptById) error {
+func (e *SysDept) Remove(d *dto.SysDeptById) error {
 	var err error
 	var data models.SysDept
 
@@ -145,7 +145,7 @@ func (e *SysDept) Remove(d *request.SysDeptById) error {
 }
 
 // GetSysDeptList 获取组织数据
-func (e *SysDept) getList(c *request.SysDeptSearch, list *[]models.SysDept) error {
+func (e *SysDept) getList(c *dto.SysDeptSearch, list *[]models.SysDept) error {
 	var err error
 	var data models.SysDept
 
@@ -162,16 +162,16 @@ func (e *SysDept) getList(c *request.SysDeptSearch, list *[]models.SysDept) erro
 }
 
 // SetDeptTree 设置组织数据
-func (e *SysDept) SetDeptTree(c *request.SysDeptSearch) (m []request.DeptLabel, err error) {
+func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err error) {
 	var list []models.SysDept
 	err = e.getList(c, &list)
 
-	m = make([]request.DeptLabel, 0)
+	m = make([]dto.DeptLabel, 0)
 	for i := 0; i < len(list); i++ {
 		if list[i].ParentId != 0 {
 			continue
 		}
-		e := request.DeptLabel{}
+		e := dto.DeptLabel{}
 		e.Id = list[i].DeptId
 		e.Label = list[i].DeptName
 		deptsInfo := deptTreeCall(&list, e)
@@ -182,14 +182,14 @@ func (e *SysDept) SetDeptTree(c *request.SysDeptSearch) (m []request.DeptLabel,
 }
 
 // Call 递归构造组织数据
-func deptTreeCall(deptList *[]models.SysDept, dept request.DeptLabel) request.DeptLabel {
+func deptTreeCall(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel {
 	list := *deptList
-	min := make([]request.DeptLabel, 0)
+	min := make([]dto.DeptLabel, 0)
 	for j := 0; j < len(list); j++ {
 		if dept.Id != list[j].ParentId {
 			continue
 		}
-		mi := request.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []request.DeptLabel{}}
+		mi := dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}}
 		ms := deptTreeCall(deptList, mi)
 		min = append(min, ms)
 	}
@@ -198,7 +198,7 @@ func deptTreeCall(deptList *[]models.SysDept, dept request.DeptLabel) request.De
 }
 
 // SetDeptPage 设置dept页面数据
-func (e *SysDept) SetDeptPage(c *request.SysDeptSearch) (m []models.SysDept, err error) {
+func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err error) {
 	var list []models.SysDept
 	err = e.getList(c, &list)
 	for i := 0; i < len(list); i++ {
@@ -240,7 +240,7 @@ func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept)
 // GetRoleDeptId 获取角色的部门ID集合
 func (e *SysDept) GetWithRoleId(roleId int) ([]int, error) {
 	deptIds := make([]int, 0)
-	deptList := make([]request.DeptIdList, 0)
+	deptList := make([]dto.DeptIdList, 0)
 	if err := e.Orm.Table("sys_role_dept").
 		Select("sys_role_dept.dept_id").
 		Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").
@@ -255,20 +255,20 @@ func (e *SysDept) GetWithRoleId(roleId int) ([]int, error) {
 	return deptIds, nil
 }
 
-func (e *SysDept) SetDeptLabel() (m []request.DeptLabel, err error) {
+func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) {
 	list := make([]models.SysDept, 0)
 	err = e.Orm.Find(&list).Error
 	if err != nil {
 		log.Error("find dept list error, %s", err.Error())
 		return
 	}
-	m = make([]request.DeptLabel, 0)
-	var item request.DeptLabel
+	m = make([]dto.DeptLabel, 0)
+	var item dto.DeptLabel
 	for i := range list {
 		if list[i].ParentId != 0 {
 			continue
 		}
-		item = request.DeptLabel{}
+		item = dto.DeptLabel{}
 		item.Id = list[i].DeptId
 		item.Label = list[i].DeptName
 		deptInfo := deptLabelCall(&list, item)
@@ -278,15 +278,15 @@ func (e *SysDept) SetDeptLabel() (m []request.DeptLabel, err error) {
 }
 
 // deptLabelCall
-func deptLabelCall(deptList *[]models.SysDept, dept request.DeptLabel) request.DeptLabel {
+func deptLabelCall(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel {
 	list := *deptList
-	var mi request.DeptLabel
-	min := make([]request.DeptLabel, 0)
+	var mi dto.DeptLabel
+	min := make([]dto.DeptLabel, 0)
 	for j := 0; j < len(list); j++ {
 		if dept.Id != list[j].ParentId {
 			continue
 		}
-		mi = request.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []request.DeptLabel{}}
+		mi = dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}}
 		ms := deptLabelCall(deptList, mi)
 		min = append(min, ms)
 	}

app/admin/service/sys_dict_data.go

@@ -7,7 +7,7 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 )
 
@@ -16,7 +16,7 @@ type SysDictData struct {
 }
 
 // GetPage 获取列表
-func (e *SysDictData) GetPage(c *request.SysDictDataSearch, list *[]models.SysDictData, count *int64) error {
+func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]models.SysDictData, count *int64) error {
 	var err error
 	var data models.SysDictData
 
@@ -35,7 +35,7 @@ func (e *SysDictData) GetPage(c *request.SysDictDataSearch, list *[]models.SysDi
 }
 
 // Get 获取对象
-func (e *SysDictData) Get(d *request.SysDictDataById, model *models.SysDictData) error {
+func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) error {
 	var err error
 	var data models.SysDictData
 
@@ -55,7 +55,7 @@ func (e *SysDictData) Get(d *request.SysDictDataById, model *models.SysDictData)
 }
 
 // Insert 创建对象
-func (e *SysDictData) Insert(c *request.SysDictDataControl) error {
+func (e *SysDictData) Insert(c *dto.SysDictDataControl) error {
 	var err error
 	var data = new(models.SysDictData)
 	c.Generate(data)
@@ -68,7 +68,7 @@ func (e *SysDictData) Insert(c *request.SysDictDataControl) error {
 }
 
 // Update 修改对象
-func (e *SysDictData) Update(c *request.SysDictDataControl) error {
+func (e *SysDictData) Update(c *dto.SysDictDataControl) error {
 	var err error
 	var model = models.SysDictData{}
 	e.Orm.First(&model, c.GetId())
@@ -86,7 +86,7 @@ func (e *SysDictData) Update(c *request.SysDictDataControl) error {
 }
 
 // Remove 删除
-func (e *SysDictData) Remove(c *request.SysDictDataById) error {
+func (e *SysDictData) Remove(c *dto.SysDictDataById) error {
 	var err error
 	var data models.SysDictData
 
@@ -104,7 +104,7 @@ func (e *SysDictData) Remove(c *request.SysDictDataById) error {
 }
 
 // GetAll 获取所有
-func (e *SysDictData) GetAll(c *request.SysDictDataSearch, list *[]models.SysDictData) error {
+func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]models.SysDictData) error {
 	var err error
 	var data models.SysDictData
 

app/admin/service/sys_dict_type.go

@@ -7,7 +7,7 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 )
 
@@ -16,7 +16,7 @@ type SysDictType struct {
 }
 
 // GetPage 获取列表
-func (e *SysDictType) GetPage(c *request.SysDictTypeSearch, list *[]models.SysDictType, count *int64) error {
+func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictType, count *int64) error {
 	var err error
 	var data models.SysDictType
 
@@ -35,7 +35,7 @@ func (e *SysDictType) GetPage(c *request.SysDictTypeSearch, list *[]models.SysDi
 }
 
 // Get 获取对象
-func (e *SysDictType) Get(d *request.SysDictTypeById, model *models.SysDictType) error {
+func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error {
 	var err error
 
 	db := e.Orm.First(model, d.GetId())
@@ -53,7 +53,7 @@ func (e *SysDictType) Get(d *request.SysDictTypeById, model *models.SysDictType)
 }
 
 // Insert 创建对象
-func (e *SysDictType) Insert(c *request.SysDictTypeControl) error {
+func (e *SysDictType) Insert(c *dto.SysDictTypeControl) error {
 	var err error
 	var data models.SysDictType
 	c.Generate(&data)
@@ -71,7 +71,7 @@ func (e *SysDictType) Insert(c *request.SysDictTypeControl) error {
 }
 
 // Update 修改对象
-func (e *SysDictType) Update(c *request.SysDictTypeControl) error {
+func (e *SysDictType) Update(c *dto.SysDictTypeControl) error {
 	var err error
 	var model = models.SysDictType{}
 	e.Orm.First(&model, c.GetId())
@@ -89,7 +89,7 @@ func (e *SysDictType) Update(c *request.SysDictTypeControl) error {
 }
 
 // Remove 删除
-func (e *SysDictType) Remove(d *request.SysDictTypeById) error {
+func (e *SysDictType) Remove(d *dto.SysDictTypeById) error {
 	var err error
 	var data models.SysDictType
 
@@ -107,7 +107,7 @@ func (e *SysDictType) Remove(d *request.SysDictTypeById) error {
 }
 
 // GetAll 获取所有
-func (e *SysDictType) GetAll(c *request.SysDictTypeSearch, list *[]models.SysDictType) error {
+func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]models.SysDictType) error {
 	var err error
 	var data models.SysDictType
 

app/admin/service/sys_login_log.go

@@ -7,7 +7,7 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 )
 
@@ -16,7 +16,7 @@ type SysLoginLog struct {
 }
 
 // GetSysLoginLogPage 获取SysLoginLog列表
-func (e *SysLoginLog) GetPage(c *request.SysLoginLogSearch, list *[]models.SysLoginLog, count *int64) error {
+func (e *SysLoginLog) GetPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginLog, count *int64) error {
 	var err error
 	var data models.SysLoginLog
 
@@ -35,7 +35,7 @@ func (e *SysLoginLog) GetPage(c *request.SysLoginLogSearch, list *[]models.SysLo
 }
 
 // Get 获取SysLoginLog对象
-func (e *SysLoginLog) Get(d *request.SysLoginLogGetReq, model *models.SysLoginLog) error {
+func (e *SysLoginLog) Get(d *dto.SysLoginLogGetReq, model *models.SysLoginLog) error {
 	var err error
 	db := e.Orm.First(model, d.GetId())
 	err = db.Error
@@ -52,7 +52,7 @@ func (e *SysLoginLog) Get(d *request.SysLoginLogGetReq, model *models.SysLoginLo
 }
 
 // Remove 删除SysLoginLog
-func (e *SysLoginLog) Remove(c *request.SysLoginLogDeleteReq) error {
+func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error {
 	var err error
 	var data models.SysLoginLog
 

app/admin/service/sys_menu.go

@@ -7,7 +7,7 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 	cModels "go-admin/common/models"
 
@@ -19,7 +19,7 @@ type SysMenu struct {
 }
 
 // GetPage 获取SysMenu列表
-func (e *SysMenu) GetPage(c *request.SysMenuSearch, menus *[]models.SysMenu) *SysMenu {
+func (e *SysMenu) GetPage(c *dto.SysMenuSearch, menus *[]models.SysMenu) *SysMenu {
 	var menu = make([]models.SysMenu, 0)
 	err := e.getPage(c, &menu).Error
 	if err != nil {
@@ -37,7 +37,7 @@ func (e *SysMenu) GetPage(c *request.SysMenuSearch, menus *[]models.SysMenu) *Sy
 }
 
 // getPage 菜单分页列表
-func (e *SysMenu) getPage(c *request.SysMenuSearch, list *[]models.SysMenu) *SysMenu {
+func (e *SysMenu) getPage(c *dto.SysMenuSearch, list *[]models.SysMenu) *SysMenu {
 	var err error
 	var data models.SysMenu
 
@@ -56,7 +56,7 @@ func (e *SysMenu) getPage(c *request.SysMenuSearch, list *[]models.SysMenu) *Sys
 }
 
 // Get 获取SysMenu对象
-func (e *SysMenu) Get(d *request.SysMenuById, model *models.SysMenu) *SysMenu {
+func (e *SysMenu) Get(d *dto.SysMenuById, model *models.SysMenu) *SysMenu {
 	var err error
 	var data models.SysMenu
 
@@ -83,7 +83,7 @@ func (e *SysMenu) Get(d *request.SysMenuById, model *models.SysMenu) *SysMenu {
 }
 
 // Insert 创建SysMenu对象
-func (e *SysMenu) Insert(c *request.SysMenuControl) *SysMenu {
+func (e *SysMenu) Insert(c *dto.SysMenuControl) *SysMenu {
 	var err error
 	var data models.SysMenu
 	c.Generate(&data)
@@ -115,7 +115,7 @@ func (e *SysMenu) initPaths(menu *models.SysMenu) error {
 }
 
 // Update 修改SysMenu对象
-func (e *SysMenu) Update(c *request.SysMenuControl) *SysMenu {
+func (e *SysMenu) Update(c *dto.SysMenuControl) *SysMenu {
 	var err error
 	tx := e.Orm.Debug().Begin()
 	defer func() {
@@ -151,7 +151,7 @@ func (e *SysMenu) Update(c *request.SysMenuControl) *SysMenu {
 }
 
 // Remove 删除SysMenu
-func (e *SysMenu) Remove(d *request.SysMenuById) *SysMenu {
+func (e *SysMenu) Remove(d *dto.SysMenuById) *SysMenu {
 	var err error
 	var data models.SysMenu
 
@@ -169,7 +169,7 @@ func (e *SysMenu) Remove(d *request.SysMenuById) *SysMenu {
 }
 
 // GetList 获取菜单数据
-func (e *SysMenu) GetList(c *request.SysMenuSearch, list *[]models.SysMenu) error {
+func (e *SysMenu) GetList(c *dto.SysMenuSearch, list *[]models.SysMenu) error {
 	var err error
 	var data models.SysMenu
 
@@ -186,16 +186,16 @@ func (e *SysMenu) GetList(c *request.SysMenuSearch, list *[]models.SysMenu) erro
 }
 
 // SetLabel 修改角色中 设置菜单基础数据
-func (e *SysMenu) SetLabel() (m []request.MenuLabel, err error) {
+func (e *SysMenu) SetLabel() (m []dto.MenuLabel, err error) {
 	var list []models.SysMenu
-	err = e.GetList(&request.SysMenuSearch{}, &list)
+	err = e.GetList(&dto.SysMenuSearch{}, &list)
 
-	m = make([]request.MenuLabel, 0)
+	m = make([]dto.MenuLabel, 0)
 	for i := 0; i < len(list); i++ {
 		if list[i].ParentId != 0 {
 			continue
 		}
-		e := request.MenuLabel{}
+		e := dto.MenuLabel{}
 		e.Id = list[i].MenuId
 		e.Label = list[i].Title
 		deptsInfo := menuLabelCall(&list, e)
@@ -239,19 +239,19 @@ func (e *SysMenu) GetSysMenuByRoleName(roleName ...string) ([]models.SysMenu, er
 }
 
 // menuLabelCall 递归构造组织数据
-func menuLabelCall(eList *[]models.SysMenu, dept request.MenuLabel) request.MenuLabel {
+func menuLabelCall(eList *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel {
 	list := *eList
 
-	min := make([]request.MenuLabel, 0)
+	min := make([]dto.MenuLabel, 0)
 	for j := 0; j < len(list); j++ {
 
 		if dept.Id != list[j].ParentId {
 			continue
 		}
-		mi := request.MenuLabel{}
+		mi := dto.MenuLabel{}
 		mi.Id = list[j].MenuId
 		mi.Label = list[j].Title
-		mi.Children = []request.MenuLabel{}
+		mi.Children = []dto.MenuLabel{}
 		if list[j].MenuType != "F" {
 			ms := menuLabelCall(eList, mi)
 			min = append(min, ms)

app/admin/service/sys_opera_log.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
@@ -16,7 +16,7 @@ type SysOperaLog struct {
 }
 
 // GetPage 获取SysOperaLog列表
-func (e *SysOperaLog) GetPage(c *request.SysOperaLogGetPageReq, list *[]models.SysOperaLog, count *int64) error {
+func (e *SysOperaLog) GetPage(c *dto.SysOperaLogGetPageReq, list *[]models.SysOperaLog, count *int64) error {
 	var err error
 	var data models.SysOperaLog
 
@@ -35,7 +35,7 @@ func (e *SysOperaLog) GetPage(c *request.SysOperaLogGetPageReq, list *[]models.S
 }
 
 // Get 获取SysOperaLog对象
-func (e *SysOperaLog) Get(d *request.SysOperaLogGetReq, model *models.SysOperaLog) error {
+func (e *SysOperaLog) Get(d *dto.SysOperaLogGetReq, model *models.SysOperaLog) error {
 	var data models.SysOperaLog
 
 	err := e.Orm.Model(&data).
@@ -67,7 +67,7 @@ func (e *SysOperaLog) Insert(model *models.SysOperaLog) error {
 }
 
 // Remove 删除SysOperaLog
-func (e *SysOperaLog) Remove(d *request.SysOperaLogDeleteReq) error {
+func (e *SysOperaLog) Remove(d *dto.SysOperaLogDeleteReq) error {
 	var err error
 	var data models.SysOperaLog
 

app/admin/service/sys_post.go

@@ -7,7 +7,7 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 )
 
@@ -16,7 +16,7 @@ type SysPost struct {
 }
 
 // GetPage 获取SysPost列表
-func (e *SysPost) GetPage(c *request.SysPostPageReq, list *[]models.SysPost, count *int64) error {
+func (e *SysPost) GetPage(c *dto.SysPostPageReq, list *[]models.SysPost, count *int64) error {
 	var err error
 	var data models.SysPost
 
@@ -35,7 +35,7 @@ func (e *SysPost) GetPage(c *request.SysPostPageReq, list *[]models.SysPost, cou
 }
 
 // Get 获取SysPost对象
-func (e *SysPost) Get(d *request.SysPostGetReq, model *models.SysPost) error {
+func (e *SysPost) Get(d *dto.SysPostGetReq, model *models.SysPost) error {
 	var err error
 	var data models.SysPost
 
@@ -55,7 +55,7 @@ func (e *SysPost) Get(d *request.SysPostGetReq, model *models.SysPost) error {
 }
 
 // Insert 创建SysPost对象
-func (e *SysPost) Insert(c *request.SysPostInsertReq) error {
+func (e *SysPost) Insert(c *dto.SysPostInsertReq) error {
 	var err error
 	var data models.SysPost
 	c.Generate(&data)
@@ -68,7 +68,7 @@ func (e *SysPost) Insert(c *request.SysPostInsertReq) error {
 }
 
 // Update 修改SysPost对象
-func (e *SysPost) Update(c *request.SysPostUpdateReq) error {
+func (e *SysPost) Update(c *dto.SysPostUpdateReq) error {
 	var err error
 	var model = models.SysPost{}
 	e.Orm.First(&model, c.GetId())
@@ -87,7 +87,7 @@ func (e *SysPost) Update(c *request.SysPostUpdateReq) error {
 }
 
 // Remove 删除SysPost
-func (e *SysPost) Remove(d *request.SysPostDeleteReq) error {
+func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
 	var err error
 	var data models.SysPost
 

app/admin/service/sys_role.go

@@ -10,7 +10,7 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 )
 
@@ -19,7 +19,7 @@ type SysRole struct {
 }
 
 // GetPage 获取SysRole列表
-func (e *SysRole) GetPage(c *request.SysRoleSearch, list *[]models.SysRole, count *int64) error {
+func (e *SysRole) GetPage(c *dto.SysRoleSearch, list *[]models.SysRole, count *int64) error {
 	var err error
 	var data models.SysRole
 
@@ -38,7 +38,7 @@ func (e *SysRole) GetPage(c *request.SysRoleSearch, list *[]models.SysRole, coun
 }
 
 // Get 获取SysRole对象
-func (e *SysRole) Get(d *request.SysRoleById, model *models.SysRole) error {
+func (e *SysRole) Get(d *dto.SysRoleById, model *models.SysRole) error {
 	var err error
 	db := e.Orm.First(model, d.GetId())
 	err = db.Error
@@ -60,7 +60,7 @@ func (e *SysRole) Get(d *request.SysRoleById, model *models.SysRole) error {
 }
 
 // Insert 创建SysRole对象
-func (e *SysRole) Insert(c *request.SysRoleControl, cb *casbin.SyncedEnforcer) error {
+func (e *SysRole) Insert(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error {
 	var err error
 	var data models.SysRole
 	var dataMenu []models.SysMenu
@@ -106,7 +106,7 @@ func (e *SysRole) Insert(c *request.SysRoleControl, cb *casbin.SyncedEnforcer) e
 }
 
 // Update 修改SysRole对象
-func (e *SysRole) Update(c *request.SysRoleControl, cb *casbin.SyncedEnforcer) error {
+func (e *SysRole) Update(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error {
 	var err error
 	tx := e.Orm.Debug().Begin()
 	defer func() {
@@ -153,7 +153,7 @@ func (e *SysRole) Update(c *request.SysRoleControl, cb *casbin.SyncedEnforcer) e
 }
 
 // Remove 删除SysRole
-func (e *SysRole) Remove(c *request.SysRoleById) error {
+func (e *SysRole) Remove(c *dto.SysRoleById) error {
 	var err error
 	tx := e.Orm.Begin()
 	defer func() {
@@ -192,7 +192,7 @@ func (e *SysRole) GetRoleMenuId(roleId int) ([]int, error) {
 	return menuIds, nil
 }
 
-func (e *SysRole) UpdateDataScope(c *request.RoleDataScopeReq) *SysRole {
+func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
 	var err error
 	tx := e.Orm.Begin()
 	defer func() {
@@ -228,7 +228,7 @@ func (e *SysRole) UpdateDataScope(c *request.RoleDataScopeReq) *SysRole {
 }
 
 // UpdateStatus 修改SysRole对象status
-func (e *SysRole) UpdateStatus(c *request.UpdateStatusReq) error {
+func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
 	var err error
 	tx := e.Orm.Debug().Begin()
 	defer func() {
@@ -253,7 +253,7 @@ func (e *SysRole) UpdateStatus(c *request.UpdateStatusReq) error {
 }
 
 // GetWithName 获取SysRole对象
-func (e *SysRole) GetWithName(d *request.SysRoleByName, model *models.SysRole) *SysRole {
+func (e *SysRole) GetWithName(d *dto.SysRoleByName, model *models.SysRole) *SysRole {
 	var err error
 	db := e.Orm.Where("role_name = ?", d.RoleName).First(model)
 	err = db.Error

app/admin/service/sys_user.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 	"go-admin/app/admin/models"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 
 	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
@@ -19,7 +19,7 @@ type SysUser struct {
 }
 
 // GetPage 获取SysUser列表
-func (e *SysUser) GetPage(c *request.SysUserGetPageReq, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
+func (e *SysUser) GetPage(c *dto.SysUserGetPageReq, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
 	var err error
 	var data models.SysUser
 
@@ -39,7 +39,7 @@ func (e *SysUser) GetPage(c *request.SysUserGetPageReq, p *actions.DataPermissio
 }
 
 // Get 获取SysUser对象
-func (e *SysUser) Get(d *request.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
+func (e *SysUser) Get(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
 	var data models.SysUser
 
 	err := e.Orm.Model(&data).Debug().
@@ -60,7 +60,7 @@ func (e *SysUser) Get(d *request.SysUserById, p *actions.DataPermission, model *
 }
 
 // Insert 创建SysUser对象
-func (e *SysUser) Insert(c *request.SysUserControl) error {
+func (e *SysUser) Insert(c *dto.SysUserControl) error {
 	var err error
 	var data models.SysUser
 	var i int64
@@ -84,7 +84,7 @@ func (e *SysUser) Insert(c *request.SysUserControl) error {
 }
 
 // Update 修改SysUser对象
-func (e *SysUser) Update(c *request.SysUserControl, p *actions.DataPermission) error {
+func (e *SysUser) Update(c *dto.SysUserControl, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -108,7 +108,7 @@ func (e *SysUser) Update(c *request.SysUserControl, p *actions.DataPermission) e
 }
 
 // UpdateSysUserAvatar 更新用户头像
-func (e *SysUser) UpdateSysUserAvatar(c *request.UpdateSysUserAvatarReq, p *actions.DataPermission) error {
+func (e *SysUser) UpdateSysUserAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -132,7 +132,7 @@ func (e *SysUser) UpdateSysUserAvatar(c *request.UpdateSysUserAvatarReq, p *acti
 }
 
 // UpdateSysUserStatus 更新用户状态
-func (e *SysUser) UpdateSysUserStatus(c *request.UpdateSysUserStatusReq, p *actions.DataPermission) error {
+func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -156,7 +156,7 @@ func (e *SysUser) UpdateSysUserStatus(c *request.UpdateSysUserStatusReq, p *acti
 }
 
 // ResetSysUserPwd 重置用户密码
-func (e *SysUser) ResetSysUserPwd(c *request.ResetSysUserPwdReq, p *actions.DataPermission) error {
+func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -179,7 +179,7 @@ func (e *SysUser) ResetSysUserPwd(c *request.ResetSysUserPwdReq, p *actions.Data
 }
 
 // Remove 删除SysUser
-func (e *SysUser) Remove(c *request.SysUserById, p *actions.DataPermission) error {
+func (e *SysUser) Remove(c *dto.SysUserById, p *actions.DataPermission) error {
 	var err error
 	var data models.SysUser
 
@@ -243,7 +243,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
 	return nil
 }
 
-func (e *SysUser) GetSysUserProfile(c *request.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
+func (e *SysUser) GetSysUserProfile(c *dto.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
 	err := e.Orm.Preload("Dept").First(user, c.GetId()).Error
 	if err != nil {
 		return err

app/other/apis/tools/gen.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/request"
+	"go-admin/app/admin/service/dto"
 	"strconv"
 	"strings"
 	"text/template"
@@ -305,7 +305,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	tab, _ := table.Get(e.Orm,true)
 	tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1)
 
-	Mmenu := request.SysMenuControl{}
+	Mmenu := dto.SysMenuControl{}
 	Mmenu.Title = tab.TableComment
 	Mmenu.Icon = "pass"
 	Mmenu.Path = "/" + tab.MLTBName
@@ -320,7 +320,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	Mmenu.CreateBy = 1
 	s.Insert(&Mmenu)
 
-	Cmenu := request.SysMenuControl{}
+	Cmenu := dto.SysMenuControl{}
 	Cmenu.MenuName = tab.ClassName + "Manage"
 	Cmenu.Title = tab.TableComment
 	Cmenu.Icon = "pass"
@@ -338,7 +338,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	Cmenu.UpdateBy = 1
 	s.Insert(&Cmenu)
 
-	MList := request.SysMenuControl{}
+	MList := dto.SysMenuControl{}
 	MList.MenuName = ""
 	MList.Title = "分页获取" + tab.TableComment
 	MList.Icon = ""
@@ -355,7 +355,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MList.UpdateBy = 1
 	s.Insert(&MList)
 
-	MCreate := request.SysMenuControl{}
+	MCreate := dto.SysMenuControl{}
 	MCreate.MenuName = ""
 	MCreate.Title = "创建" + tab.TableComment
 	MCreate.Icon = ""
@@ -372,7 +372,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MCreate.UpdateBy = 1
 	s.Insert(&MCreate)
 
-	MUpdate := request.SysMenuControl{}
+	MUpdate := dto.SysMenuControl{}
 	MUpdate.MenuName = ""
 	MUpdate.Title = "修改" + tab.TableComment
 	MUpdate.Icon = ""
@@ -389,7 +389,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MUpdate.UpdateBy = 1
 	s.Insert(&MUpdate)
 
-	MDelete := request.SysMenuControl{}
+	MDelete := dto.SysMenuControl{}
 	MDelete.MenuName = ""
 	MDelete.Title = "删除" + tab.TableComment
 	MDelete.Icon = ""