Merge pull request #469 from go-admin-team/dev

DEV (#468)

app/admin/apis/captcha.go

@@ -10,6 +10,12 @@ type System struct {
 	api.Api
 }
 
+// GenerateCaptchaHandler 获取验证码
+// @Summary 获取验证码
+// @Description 获取验证码
+// @Tags 登陆
+// @Success 200 {object} response.Response{data=string,id=string,msg=string} "{"code": 200, "data": [...]}"
+// @Router /api/v1/captcha [get]
 func (e System) GenerateCaptchaHandler(c *gin.Context) {
 	err := e.MakeContext(c).Errors
 	if err != nil {

app/admin/apis/go_admin.go

@@ -33,7 +33,7 @@ $(function(){
 </html>
 `
 
-func HelloWorld(c *gin.Context) {
+func GoAdmin(c *gin.Context) {
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	c.String(200, INDEX)
 }

app/admin/apis/sys_api.go

@@ -32,7 +32,7 @@ type SysApi struct {
 // @Security Bearer
 func (e SysApi) GetPage(c *gin.Context) {
 	s := service.SysApi{}
-	req := dto.SysApiSearch{}
+	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 := dto.SysApiById{}
+	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 := dto.SysApiControl{}
+	req := dto.SysApiUpdateReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -127,18 +127,17 @@ func (e SysApi) Update(c *gin.Context) {
 // @Router /api/v1/sys-api [delete]
 // @Security Bearer
 func (e SysApi) DeleteSysApi(c *gin.Context) {
-	req := dto.SysApiById{}
+	req := dto.SysApiDeleteReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.Form).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
 		e.Logger.Error(err)
 		return
 	}
-	req.SetUpdateBy(user.GetUserId(c))
 	p := actions.GetPermissionFromContext(c)
 	err = s.Remove(&req, p)
 	if err != nil {

app/admin/apis/sys_config.go

@@ -180,12 +180,11 @@ func (e SysConfig) Delete(c *gin.Context) {
 }
 
 // GetSysConfigBySysApp 获取系统配置信息
-// @Summary 获取系统前台配置信息，主要注意这里不在验证数据权限
-// @Description 获取系统配置信息，主要注意这里不在验证数据权限
+// @Summary 获取系统前台配置信息，主要注意这里不在验证权限
+// @Description 获取系统配置信息，主要注意这里不在验证权限
 // @Tags 配置管理
 // @Success 200 {object} response.Response{data=map[string]string} "{"code": 200, "data": [...]}"
 // @Router /api/v1/app-config [get]
-// @Security Bearer
 func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
 	req := dto.SysConfigSearch{}
 	s := service.SysConfig{}

app/admin/apis/sys_dept.go

@@ -32,7 +32,7 @@ func (e SysDept) GetPage(c *gin.Context) {
 	req := dto.SysDeptSearch{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.Form).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -134,7 +134,7 @@ func (e SysDept) Update(c *gin.Context) {
 	req := dto.SysDeptControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.JSON, nil).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -159,6 +159,7 @@ func (e SysDept) Update(c *gin.Context) {
 // @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/dept [delete]
+// @Security Bearer
 func (e SysDept) Delete(c *gin.Context) {
 	s := service.SysDept{}
 	req := dto.SysDeptById{}

app/admin/apis/sys_dict_data.go

@@ -1,14 +1,12 @@
 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"
 	_ "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"
@@ -82,7 +80,7 @@ func (e SysDictData) Get(c *gin.Context) {
 	err = s.Get(&req, &object)
 	if err != nil {
 		e.Logger.Warnf("Get error: %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "查询失败")
+		e.Error(500, err, "查询失败")
 		return
 	}
 

app/admin/apis/sys_dict_type.go

@@ -157,6 +157,7 @@ func (e SysDictType) Update(c *gin.Context) {
 // @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/dict/type [delete]
+// @Security Bearer
 func (e SysDictType) Delete(c *gin.Context) {
 	s := service.SysDictType{}
 	req := dto.SysDictTypeById{}

app/admin/apis/sys_login_log.go

@@ -51,7 +51,7 @@ func (e SysLoginLog) GetPage(c *gin.Context) {
 	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 }
 
-// GetSysLoginLog 登录日志通过id获取
+// Get 登录日志通过id获取
 // @Summary 登录日志通过id获取
 // @Description 获取JSON
 // @Tags 登录日志
@@ -81,13 +81,14 @@ func (e SysLoginLog) Get(c *gin.Context) {
 	e.OK(object, "查询成功")
 }
 
-// DeleteSysLoginLog 登录日志删除
+// Delete 登录日志删除
 // @Summary 登录日志删除
 // @Description 登录日志删除
 // @Tags 登录日志
 // @Param data body dto.SysLoginLogById true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys-login-log [delete]
+// @Security Bearer
 func (e SysLoginLog) Delete(c *gin.Context) {
 	s := service.SysLoginLog{}
 	req := dto.SysLoginLogById{}

app/admin/apis/sys_menu.go

@@ -1,13 +1,11 @@
 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"
@@ -153,6 +151,7 @@ func (e SysMenu) Update(c *gin.Context) {
 // @Param data body dto.SysMenuById true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/menu [delete]
+// @Security Bearer
 func (e SysMenu) Delete(c *gin.Context) {
 	control := new(dto.SysMenuById)
 	s := new(service.SysMenu)
@@ -169,7 +168,7 @@ func (e SysMenu) Delete(c *gin.Context) {
 	err = s.Remove(control).Error
 	if err != nil {
 		e.Logger.Errorf("RemoveSysMenu error, %s", err)
-		e.Error(http.StatusInternalServerError, err, "删除失败")
+		e.Error(500, err, "删除失败")
 		return
 	}
 	e.OK(control.GetId(), "删除成功")
@@ -197,7 +196,7 @@ func (e SysMenu) GetMenuRole(c *gin.Context) {
 	result, err := s.SetMenuRole(user.GetRoleName(c))
 
 	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "查询失败")
+		e.Error(500, err, "查询失败")
 		return
 	}
 

app/admin/apis/sys_opera_log.go

@@ -2,12 +2,10 @@ package apis
 
 import (
 	"fmt"
-	"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"
+	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 )
@@ -33,7 +31,7 @@ type SysOperaLog struct {
 // @Security Bearer
 func (e SysOperaLog) GetPage(c *gin.Context) {
 	s := service.SysOperaLog{}
-	req := new(dto.SysOperaLogSearch)
+	req := new(dto.SysOperaLogGetPageReq)
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(req, binding.Form).
@@ -50,7 +48,7 @@ func (e SysOperaLog) GetPage(c *gin.Context) {
 
 	err = s.GetPage(req, &list, &count)
 	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
+		e.Error(500, err, "查询失败")
 		return
 	}
 
@@ -95,6 +93,7 @@ func (e SysOperaLog) Get(c *gin.Context) {
 // @Param data body dto.SysOperaLogById true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys-opera-log [delete]
+// @Security Bearer
 func (e SysOperaLog) Delete(c *gin.Context) {
 	s := new(service.SysOperaLog)
 	req := dto.SysOperaLogById{}

app/admin/apis/sys_post.go

@@ -1,10 +1,9 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
-	"net/http"
-
+	"fmt"
 	"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"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
@@ -31,7 +30,7 @@ type SysPost struct {
 // @Security Bearer
 func (e SysPost) GetPage(c *gin.Context) {
 	s := service.SysPost{}
-	req := dto.SysPostSearch{}
+	req := dto.SysPostPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -46,9 +45,9 @@ func (e SysPost) GetPage(c *gin.Context) {
 	list := make([]models.SysPost, 0)
 	var count int64
 
-	err = s.GetSysPostPage(&req, &list, &count)
+	err = s.GetPage(&req, &list, &count)
 	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
+		e.Error(500, err, "查询失败")
 		return
 	}
 
@@ -59,13 +58,13 @@ func (e SysPost) GetPage(c *gin.Context) {
 // @Summary 获取岗位信息
 // @Description 获取JSON
 // @Tags 岗位
-// @Param postId path int true "postId"
+// @Param id path int true "编码"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/post/{postId} [get]
 // @Security Bearer
 func (e SysPost) Get(c *gin.Context) {
 	s := service.SysPost{}
-	req := dto.SysPostById{}
+	req := dto.SysPostGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -78,9 +77,9 @@ func (e SysPost) Get(c *gin.Context) {
 	}
 	var object models.SysPost
 
-	err = s.GetSysPost(&req, &object)
+	err = s.Get(&req, &object)
 	if err != nil {
-		e.Error(500, err, "查询失败")
+		e.Error(500, err, fmt.Sprintf("岗位信息获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -93,14 +92,14 @@ func (e SysPost) Get(c *gin.Context) {
 // @Tags 岗位
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysPostControl true "data"
+// @Param data body dto.SysPostInsertReq true "data"
 // @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/post [post]
 // @Security Bearer
 func (e SysPost) Insert(c *gin.Context) {
 	s := service.SysPost{}
-	req := dto.SysPostControl{}
+	req := dto.SysPostInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -112,9 +111,9 @@ func (e SysPost) Insert(c *gin.Context) {
 		return
 	}
 	req.SetCreateBy(user.GetUserId(c))
-	err = s.InsertSysPost(&req)
+	err = s.Insert(&req)
 	if err != nil {
-		e.Error(500, err, "创建失败")
+		e.Error(500, err, fmt.Sprintf("新建岗位失败！错误详情：%s", err.Error()))
 		return
 	}
 	e.OK(req.GetId(), "创建成功")
@@ -126,14 +125,14 @@ func (e SysPost) Insert(c *gin.Context) {
 // @Tags 岗位
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysPostControl true "body"
+// @Param data body dto.SysPostUpdateReq true "body"
 // @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/post/ [put]
+// @Router /api/v1/post/{id} [put]
 // @Security Bearer
 func (e SysPost) Update(c *gin.Context) {
 	s := service.SysPost{}
-	req := dto.SysPostControl{}
+	req := dto.SysPostUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -147,9 +146,9 @@ func (e SysPost) Update(c *gin.Context) {
 
 	req.SetUpdateBy(user.GetUserId(c))
 
-	err = s.UpdateSysPost(&req)
+	err = s.Update(&req)
 	if err != nil {
-		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf("岗位更新失败！错误详情：%s", err.Error()))
 		return
 	}
 	e.OK(req.GetId(), "更新成功")
@@ -159,13 +158,14 @@ func (e SysPost) Update(c *gin.Context) {
 // @Summary 删除岗位
 // @Description 删除数据
 // @Tags 岗位
-// @Param id path int true "id"
+// @Param id body dto.SysPostDeleteReq true "请求参数"
 // @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
 // @Success 500 {string} string	"{"code": 500, "message": "删除失败"}"
 // @Router /api/v1/post [delete]
+// @Security Bearer
 func (e SysPost) Delete(c *gin.Context) {
 	s := service.SysPost{}
-	req := dto.SysPostById{}
+	req := dto.SysPostDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -177,10 +177,10 @@ func (e SysPost) Delete(c *gin.Context) {
 		return
 	}
 	req.SetUpdateBy(user.GetUserId(c))
-	err = s.RemoveSysPost(&req)
+	err = s.Remove(&req)
 	if err != nil {
-		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf("岗位删除失败！错误详情：%s", err.Error()))
 		return
 	}
 	e.OK(req.GetId(), "删除成功")
-}
+}

app/admin/apis/sys_role.go

@@ -170,7 +170,7 @@ func (e SysRole) Update(c *gin.Context) {
 	}
 	_, err = global.LoadPolicy(c)
 	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "")
+		e.Error(500, err, "")
 		return
 	}
 	e.OK(req.GetId(), "更新成功")
@@ -227,7 +227,7 @@ func (e SysRole) Update2Status(c *gin.Context) {
 	req := dto.UpdateStatusReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, nil, binding.JSON).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -255,7 +255,7 @@ func (e SysRole) Update2Status(c *gin.Context) {
 // @Router /api/v1/role-status/{id} [put]
 // @Security Bearer
 func (e SysRole) Update2DataScope(c *gin.Context) {
-	s := &service.SysRole{}
+	s := service.SysRole{}
 	req := dto.RoleDataScopeReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -275,7 +275,7 @@ func (e SysRole) Update2DataScope(c *gin.Context) {
 	data.UpdateBy = user.GetUserId(c)
 	err = s.UpdateDataScope(&req).Error
 	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "")
+		e.Error(500, err, fmt.Sprintf("更新角色数据权限失败！错误详情：%s", err.Error()))
 		return
 	}
 	e.OK(nil, "操作成功")

app/admin/apis/sys_user.go

@@ -30,10 +30,10 @@ type SysUser struct {
 // @Security Bearer
 func (e SysUser) GetPage(c *gin.Context) {
 	s := service.SysUser{}
-	req := dto.SysUserSearch{}
+	req := dto.SysUserGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.Form).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -63,7 +63,7 @@ func (e SysUser) GetPage(c *gin.Context) {
 // @Tags 用户
 // @Param userId path int true "用户编码"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sysUser/{userId} [get]
+// @Router /api/v1/sys-user/{userId} [get]
 // @Security Bearer
 func (e SysUser) Get(c *gin.Context) {
 	s := service.SysUser{}
@@ -97,7 +97,8 @@ func (e SysUser) Get(c *gin.Context) {
 // @Product application/json
 // @Param data body dto.SysUserControl true "用户数据"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sysUser [post]
+// @Router /api/v1/sys-user [post]
+// @Security Bearer
 func (e SysUser) Insert(c *gin.Context) {
 	s := service.SysUser{}
 	req := dto.SysUserControl{}
@@ -132,12 +133,13 @@ func (e SysUser) Insert(c *gin.Context) {
 // @Param data body dto.SysUserControl true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys-user/{userId} [put]
+// @Security Bearer
 func (e SysUser) Update(c *gin.Context) {
 	s := service.SysUser{}
 	req := dto.SysUserControl{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.JSON, nil).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -166,6 +168,7 @@ func (e SysUser) Update(c *gin.Context) {
 // @Param userId path int true "userId"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys-user/{userId} [delete]
+// @Security Bearer
 func (e SysUser) Delete(c *gin.Context) {
 	s := service.SysUser{}
 	req := dto.SysUserById{}
@@ -202,9 +205,10 @@ func (e SysUser) Delete(c *gin.Context) {
 // @Param file formData file true "file"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/user/avatar [post]
+// @Security Bearer
 func (e SysUser) InsetAvatar(c *gin.Context) {
 	s := service.SysUser{}
-	req := dto.SysUserControl{}
+	req := dto.UpdateSysUserAvatarReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -233,7 +237,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
 	req.UserId = p.UserId
 	req.Avatar = "/" + filPath
 
-	err = s.Update(&req, p)
+	err = s.UpdateSysUserAvatar(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -250,6 +254,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
 // @Param data body dto.UpdateSysUserStatusReq true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/user/status [put]
+// @Security Bearer
 func (e SysUser) UpdateStatus(c *gin.Context) {
 	s := service.SysUser{}
 	req := dto.UpdateSysUserStatusReq{}
@@ -286,6 +291,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) {
 // @Param data body dto.ResetSysUserPwdReq true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/user/pwd/reset [put]
+// @Security Bearer
 func (e SysUser) ResetPwd(c *gin.Context) {
 	s := service.SysUser{}
 	req := dto.ResetSysUserPwdReq{}
@@ -321,7 +327,7 @@ func (e SysUser) ResetPwd(c *gin.Context) {
 // @Product application/json
 // @Param data body dto.PassWord true "body"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/pwd [post]
+// @Router /api/v1/user/pwd/set [put]
 // @Security Bearer
 func (e SysUser) UpdatePwd(c *gin.Context) {
 	s := service.SysUser{}
@@ -415,8 +421,6 @@ func (e SysUser) GetInfo(c *gin.Context) {
 	permissions[0] = "*:*:*"
 	var buttons = make([]string, 1)
 	buttons[0] = "*:*:*"
-	//RoleMenu := models.RoleMenu{}
-	//RoleMenu.RoleId = user.GetRoleId(c)
 
 	var mp = make(map[string]interface{})
 	mp["roles"] = roles

app/admin/models/sys_opera_log.go

@@ -57,24 +57,28 @@ func SaveOperaLog(message storage.Messager) (err error) {
 	if db == nil {
 		err = errors.New("db not exist")
 		log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
-		return err
+		// Log writing to the database ignores error
+		return nil
 	}
 	var rb []byte
 	rb, err = json.Marshal(message.GetValues())
 	if err != nil {
 		log.Errorf("json Marshal error, %s", err.Error())
-		return err
+		// Log writing to the database ignores error
+		return nil
 	}
 	var l SysOperaLog
 	err = json.Unmarshal(rb, &l)
 	if err != nil {
 		log.Errorf("json Unmarshal error, %s", err.Error())
-		return err
+		// Log writing to the database ignores error
+		return nil
 	}
 	err = db.Create(&l).Error
 	if err != nil {
 		log.Errorf("db create error, %s", err.Error())
-		return err
+		// Log writing to the database ignores error
+		return nil
 	}
 	return nil
 }

app/admin/models/tools/syscolumns.go

@@ -1,92 +0,0 @@
-package tools
-
-import (
-	"go-admin/app/admin/models"
-	"gorm.io/gorm"
-)
-
-type SysColumns struct {
-	ColumnId           int          `gorm:"primaryKey;autoIncrement" json:"columnId"`
-	TableId            int          `gorm:"" json:"tableId"`
-	ColumnName         string       `gorm:"size:128;" json:"columnName"`
-	ColumnComment      string       `gorm:"column:column_comment;size:128;" json:"columnComment"`
-	ColumnType         string       `gorm:"column:column_type;size:128;" json:"columnType"`
-	GoType             string       `gorm:"column:go_type;size:128;" json:"goType"`
-	GoField            string       `gorm:"column:go_field;size:128;" json:"goField"`
-	JsonField          string       `gorm:"column:json_field;size:128;" json:"jsonField"`
-	IsPk               string       `gorm:"column:is_pk;size:4;" json:"isPk"`
-	IsIncrement        string       `gorm:"column:is_increment;size:4;" json:"isIncrement"`
-	IsRequired         string       `gorm:"column:is_required;size:4;" json:"isRequired"`
-	IsInsert           string       `gorm:"column:is_insert;size:4;" json:"isInsert"`
-	IsEdit             string       `gorm:"column:is_edit;size:4;" json:"isEdit"`
-	IsList             string       `gorm:"column:is_list;size:4;" json:"isList"`
-	IsQuery            string       `gorm:"column:is_query;size:4;" json:"isQuery"`
-	QueryType          string       `gorm:"column:query_type;size:128;" json:"queryType"`
-	HtmlType           string       `gorm:"column:html_type;size:128;" json:"htmlType"`
-	DictType           string       `gorm:"column:dict_type;size:128;" json:"dictType"`
-	Sort               int          `gorm:"column:sort;" json:"sort"`
-	List               string       `gorm:"column:list;size:1;" json:"list"`
-	Pk                 bool         `gorm:"column:pk;size:1;" json:"pk"`
-	Required           bool         `gorm:"column:required;size:1;" json:"required"`
-	SuperColumn        bool         `gorm:"column:super_column;size:1;" json:"superColumn"`
-	UsableColumn       bool         `gorm:"column:usable_column;size:1;" json:"usableColumn"`
-	Increment          bool         `gorm:"column:increment;size:1;" json:"increment"`
-	Insert             bool         `gorm:"column:insert;size:1;" json:"insert"`
-	Edit               bool         `gorm:"column:edit;size:1;" json:"edit"`
-	Query              bool         `gorm:"column:query;size:1;" json:"query"`
-	Remark             string       `gorm:"column:remark;size:255;" json:"remark"`
-	FkTableName        string       `gorm:"" json:"fkTableName"`
-	FkTableNameClass   string       `gorm:"" json:"fkTableNameClass"`
-	FkTableNamePackage string       `gorm:"" json:"fkTableNamePackage"`
-	FkCol              []SysColumns `gorm:"-" json:"fkCol"`
-	FkLabelId          string       `gorm:"" json:"fkLabelId"`
-	FkLabelName        string       `gorm:"size:255;" json:"fkLabelName"`
-	CreateBy           int          `gorm:"column:create_by;size:20;" json:"createBy"`
-	UpdateBy           int          `gorm:"column:update_By;size:20;" json:"updateBy"`
-
-	models.BaseModel
-}
-
-func (SysColumns) TableName() string {
-	return "sys_columns"
-}
-
-func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) {
-	var doc []SysColumns
-
-	table := tx.Table("sys_columns")
-
-	table = table.Where("table_id = ?", e.TableId)
-
-	if err := table.Find(&doc).Error; err != nil {
-		return nil, err
-	}
-	return doc, nil
-}
-
-func (e *SysColumns) Create(tx *gorm.DB) (SysColumns, error) {
-	var doc SysColumns
-	e.CreateBy = 0
-	result := tx.Table("sys_columns").Create(&e)
-	if result.Error != nil {
-		err := result.Error
-		return doc, err
-	}
-	doc = *e
-	return doc, nil
-}
-
-func (e *SysColumns) Update(tx *gorm.DB) (update SysColumns, err error) {
-	if err = tx.Table("sys_columns").First(&update, e.ColumnId).Error; err != nil {
-		return
-	}
-
-	//参数1:是要修改的数据
-	//参数2:是修改的数据
-	e.UpdateBy = 0
-	if err = tx.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil {
-		return
-	}
-
-	return
-}

app/admin/router/sys_router.go

@@ -1,6 +1,7 @@
 package router
 
 import (
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"go-admin/app/admin/apis"
 	"mime"
 
@@ -21,7 +22,9 @@ func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Rou
 	// 静态文件
 	sysStaticFileRouter(g)
 	// swagger；注意：生产环境可以注释掉
-	sysSwaggerRouter(g)
+	if config.ApplicationConfig.Mode != "prod" {
+		sysSwaggerRouter(g)
+	}
 	// 需要认证
 	sysCheckRoleRouterInit(g, authMiddleware)
 	return g
@@ -33,7 +36,9 @@ func sysBaseRouter(r *gin.RouterGroup) {
 	go ws.WebsocketManager.SendService()
 	go ws.WebsocketManager.SendAllService()
 
-	r.GET("/", apis.HelloWorld)
+	if config.ApplicationConfig.Mode != "prod" {
+		r.GET("/", apis.GoAdmin)
+	}
 	r.GET("/info", handler.Ping)
 }
 
@@ -43,7 +48,9 @@ func sysStaticFileRouter(r *gin.RouterGroup) {
 		return
 	}
 	r.Static("/static", "./static")
-	r.Static("/form-generator", "./static/form-generator")
+	if config.ApplicationConfig.Mode != "prod" {
+		r.Static("/form-generator", "./static/form-generator")
+	}
 }
 
 func sysSwaggerRouter(r *gin.RouterGroup) {
@@ -51,16 +58,19 @@ func sysSwaggerRouter(r *gin.RouterGroup) {
 }
 
 func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/ws/:id/:channel", ws.WebsocketManager.WsClient)
-	r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient)
-	v1 := r.Group("/api/v1")
+	wss:=r.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		wss.GET("/ws/:id/:channel", ws.WebsocketManager.WsClient)
+		wss.GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient)
+	}
 
-	v1.POST("/login", authMiddleware.LoginHandler)
-	// Refresh time can be longer than token timeout
-	v1.GET("/refresh_token", authMiddleware.RefreshHandler)
-	//registerPageRouter(v1, authMiddleware)
+	v1 := r.Group("/api/v1")
+	{
+		v1.POST("/login", authMiddleware.LoginHandler)
+		// Refresh time can be longer than token timeout
+		v1.GET("/refresh_token", authMiddleware.RefreshHandler)
+	}
 	registerBaseRouter(v1, authMiddleware)
-	//registerDictRouter(v1, authMiddleware)
 }
 
 func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {

app/admin/router/sys_user.go

@@ -28,7 +28,7 @@ func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 	{
 		user.GET("/profile", api.GetProfile)
 		user.POST("/avatar", api.InsetAvatar)
-		user.PUT("/pwd", api.UpdatePwd)
+		user.PUT("/pwd/set", api.UpdatePwd)
 		user.PUT("/pwd/reset", api.ResetPwd)
 		user.PUT("/status", api.UpdateStatus)
 	}

app/admin/service/dto/sys_api.go

@@ -6,7 +6,8 @@ import (
 	common "go-admin/common/models"
 )
 
-type SysApiSearch struct {
+// SysApiGetPageReq 功能列表请求参数
+type SysApiGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Title          string `form:"title"  search:"type:contains;column:title;table:sys_api" comment:"标题"`
 	Path           string `form:"path"  search:"type:contains;column:path;table:sys_api" comment:"地址"`
@@ -21,11 +22,35 @@ type SysApiOrder struct {
 	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"`
 }
 
-func (m *SysApiSearch) GetNeedSearch() interface{} {
+func (m *SysApiGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
-type SysApiControl struct {
+// SysApiInsertReq 功能创建请求参数
+type SysApiInsertReq struct {
+	Id     int    `json:"-" comment:"编码"` // 编码
+	Handle string `json:"handle" comment:"handle"`
+	Title  string `json:"title" comment:"标题"`
+	Path   string `json:"path" comment:"地址"`
+	Type   string `json:"type" comment:""`
+	Action string `json:"action" comment:"类型"`
+	common.ControlBy
+}
+
+func (s *SysApiInsertReq) Generate(model *models.SysApi) {
+	model.Handle = s.Handle
+	model.Title = s.Title
+	model.Path = s.Path
+	model.Type = s.Type
+	model.Action = s.Action
+}
+
+func (s *SysApiInsertReq) GetId() interface{} {
+	return s.Id
+}
+
+// SysApiUpdateReq 功能更新请求参数
+type SysApiUpdateReq struct {
 	Id     int    `uri:"id" comment:"编码"` // 编码
 	Handle string `json:"handle" comment:"handle"`
 	Title  string `json:"title" comment:"标题"`
@@ -35,7 +60,7 @@ type SysApiControl struct {
 	common.ControlBy
 }
 
-func (s *SysApiControl) Generate(model *models.SysApi) {
+func (s *SysApiUpdateReq) Generate(model *models.SysApi) {
 	if s.Id != 0 {
 		model.Id = s.Id
 	}
@@ -46,28 +71,16 @@ func (s *SysApiControl) Generate(model *models.SysApi) {
 	model.Action = s.Action
 }
 
-func (s *SysApiControl) GetId() interface{} {
+func (s *SysApiUpdateReq) GetId() interface{} {
 	return s.Id
 }
 
-type SysApiById struct {
-	dto.ObjectById
-	common.ControlBy
+// SysApiGetReq 功能获取请求参数
+type SysApiGetReq struct {
+	dto.ObjectGetReq
 }
 
-func (s *SysApiById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
-	return s.Id
-}
-
-func (s *SysApiById) Generate() dto.Control {
-	o := *s
-	return &o
-}
-
-func (s *SysApiById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysApi{}, nil
+// SysApiDeleteReq 功能删除请求参数
+type SysApiDeleteReq struct {
+	dto.ObjectDeleteReq
 }

app/admin/service/dto/sys_dept.go

@@ -27,15 +27,15 @@ func (m *SysDeptSearch) GetNeedSearch() interface{} {
 
 // SysDeptControl 增、改使用的结构体
 type SysDeptControl struct {
-	DeptId   int    `uri:"id" comment:"编码"`          // 编码
-	ParentId int    `json:"parentId" comment:"上级部门"` //上级部门
-	DeptPath string `json:"deptPath" comment:""`     //路径
-	DeptName string `json:"deptName" comment:"部门名称"` //部门名称
-	Sort     int    `json:"sort" comment:"排序"`       //排序
-	Leader   string `json:"leader" comment:"负责人"`    //负责人
-	Phone    string `json:"phone" comment:"手机"`      //手机
-	Email    string `json:"email" comment:"邮箱"`      //邮箱
-	Status   int    `json:"status" comment:"状态"`     //状态
+	DeptId   int    `uri:"id" comment:"编码"`                 // 编码
+	ParentId int    `json:"parentId" comment:"上级部门" vd:"?"` //上级部门
+	DeptPath string `json:"deptPath" comment:""`            //路径
+	DeptName string `json:"deptName" comment:"部门名称" vd:"len($)>0"` //部门名称
+	Sort     int    `json:"sort" comment:"排序" vd:"?"`       //排序
+	Leader   string `json:"leader,required" comment:"负责人" vd:"@:len($)>0;msg:validation failed:该字段不能为空"`    //负责人
+	Phone    string `json:"phone" comment:"手机" vd:"?"`      //手机
+	Email    string `json:"email" comment:"邮箱" vd:"?"`      //邮箱
+	Status   int    `json:"status" comment:"状态" vd:"$>0"`     //状态
 	common.ControlBy
 }
 

app/admin/service/dto/sys_opera_log.go

@@ -8,7 +8,7 @@ import (
 	common "go-admin/common/models"
 )
 
-type SysOperaLogSearch struct {
+type SysOperaLogGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Title          string `form:"title" search:"type:contains;column:title;table:sys_opera_log" comment:"操作模块"`
 	Method         string `form:"method" search:"type:contains;column:method;table:sys_opera_log" comment:"函数"`
@@ -25,7 +25,7 @@ type SysOperaLogOrder struct {
 	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_opera_log" form:"createdAtOrder"`
 }
 
-func (m *SysOperaLogSearch) GetNeedSearch() interface{} {
+func (m *SysOperaLogGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 

app/admin/service/dto/sys_post.go

@@ -7,8 +7,8 @@ import (
 	"go-admin/common/dto"
 )
 
-// SysPostSearch 列表或者搜索使用结构体
-type SysPostSearch struct {
+// SysPostPageReq 列表或者搜索使用结构体
+type SysPostPageReq struct {
 	dto.Pagination `search:"-"`
 	PostId         int    `form:"postId" search:"type:exact;column:post_id;table:sys_post" comment:"id"`        // id
 	PostName       string `form:"postName" search:"type:contains;column:post_name;table:sys_post" comment:"名称"` // 名称
@@ -18,12 +18,12 @@ type SysPostSearch struct {
 	Remark         string `form:"remark" search:"type:exact;column:remark;table:sys_post" comment:"备注"`         // 备注
 }
 
-func (m *SysPostSearch) GetNeedSearch() interface{} {
+func (m *SysPostPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
-// SysPostControl 增、改使用的结构体
-type SysPostControl struct {
+// SysPostInsertReq 增使用的结构体
+type SysPostInsertReq struct {
 	PostId   int    `uri:"id"  comment:"id"`
 	PostName string `form:"postName"  comment:"名称"`
 	PostCode string `form:"postCode" comment:"编码"`
@@ -33,11 +33,7 @@ type SysPostControl struct {
 	common.ControlBy
 }
 
-// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysPostControl) Generate(model *models.SysPost) {
-	if s.PostId != 0 {
-		model.PostId = s.PostId
-	}
+func (s *SysPostInsertReq) Generate(model *models.SysPost) {
 	model.PostName = s.PostName
 	model.PostCode = s.PostCode
 	model.Sort = s.Sort
@@ -52,18 +48,28 @@ func (s *SysPostControl) Generate(model *models.SysPost) {
 }
 
 // GetId 获取数据对应的ID
-func (s *SysPostControl) GetId() interface{} {
+func (s *SysPostInsertReq) GetId() interface{} {
 	return s.PostId
 }
 
-// SysPostById 获取单个或者删除的结构体
-type SysPostById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
+// SysPostUpdateReq 改使用的结构体
+type SysPostUpdateReq struct {
+	PostId   int    `uri:"id"  comment:"id"`
+	PostName string `form:"postName"  comment:"名称"`
+	PostCode string `form:"postCode" comment:"编码"`
+	Sort     int    `form:"sort" comment:"排序"`
+	Status   int    `form:"status"   comment:"状态"`
+	Remark   string `form:"remark"   comment:"备注"`
 	common.ControlBy
 }
 
-func (s *SysPostById) Generate(model *models.SysPost) {
+func (s *SysPostUpdateReq) Generate(model *models.SysPost) {
+	model.PostId = s.PostId
+	model.PostName = s.PostName
+	model.PostCode = s.PostCode
+	model.Sort = s.Sort
+	model.Status = s.Status
+	model.Remark = s.Remark
 	if s.ControlBy.UpdateBy != 0 {
 		model.UpdateBy = s.UpdateBy
 	}
@@ -72,14 +78,34 @@ func (s *SysPostById) Generate(model *models.SysPost) {
 	}
 }
 
-func (s *SysPostById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
+func (s *SysPostUpdateReq) GetId() interface{} {
+	return s.PostId
+}
+
+// SysPostGetReq 获取单个的结构体
+type SysPostGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysPostGetReq) GetId() interface{} {
 	return s.Id
 }
 
-func (s *SysPostById) GenerateM() (*models.SysPost, error) {
-	return &models.SysPost{}, nil
+// SysPostDeleteReq 删除的结构体
+type SysPostDeleteReq struct {
+	Ids []int `json:"ids"`
+	common.ControlBy
+}
+
+func (s *SysPostDeleteReq) Generate(model *models.SysPost) {
+	if s.ControlBy.UpdateBy != 0 {
+		model.UpdateBy = s.UpdateBy
+	}
+	if s.ControlBy.CreateBy != 0 {
+		model.CreateBy = s.CreateBy
+	}
+}
+
+func (s *SysPostDeleteReq) GetId() interface{} {
+	return s.Ids
 }

app/admin/service/dto/sys_user.go

@@ -7,7 +7,7 @@ import (
 	common "go-admin/common/models"
 )
 
-type SysUserSearch struct {
+type SysUserGetPageReq struct {
 	dto.Pagination `search:"-"`
 	UserId         int    `form:"userId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"`
 	Username       string `form:"username" search:"type:contains;column:username;table:sys_user" comment:"用户名"`
@@ -33,7 +33,7 @@ type DeptJoin struct {
 	DeptId string `search:"type:contains;column:dept_path;table:sys_dept" form:"deptId"`
 }
 
-func (m *SysUserSearch) GetNeedSearch() interface{} {
+func (m *SysUserGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
@@ -54,6 +54,23 @@ func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) {
 	model.Password = s.Password
 }
 
+type UpdateSysUserAvatarReq struct {
+	UserId int    `json:"userId" comment:"用户ID" vd:"required"` // 用户ID
+	Avatar string `json:"avatar" comment:"头像" vd:"required"`
+	common.ControlBy
+}
+
+func (s *UpdateSysUserAvatarReq) GetId() interface{} {
+	return s.UserId
+}
+
+func (s *UpdateSysUserAvatarReq) Generate(model *models.SysUser) {
+	if s.UserId != 0 {
+		model.UserId = s.UserId
+	}
+	model.Avatar = s.Avatar
+}
+
 type UpdateSysUserStatusReq struct {
 	UserId int    `json:"userId" comment:"用户ID" binding:"required"` // 用户ID
 	Status string `json:"status" comment:"状态" binding:"required"`

app/admin/service/sys_api.go

@@ -19,7 +19,7 @@ type SysApi struct {
 }
 
 // GetPage 获取SysApi列表
-func (e *SysApi) GetPage(c *dto.SysApiSearch, 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 *dto.SysApiSearch, p *actions.DataPermission, list *[
 }
 
 // Get 获取SysApi对象with id
-func (e *SysApi) Get(d *dto.SysApiById, 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 *dto.SysApiById, p *actions.DataPermission, model *models
 }
 
 // Update 修改SysApi对象
-func (e *SysApi) Update(c *dto.SysApiControl, 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 *dto.SysApiControl, p *actions.DataPermission) error {
 }
 
 // Remove 删除SysApi
-func (e *SysApi) Remove(d *dto.SysApiById, 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_opera_log.go

@@ -16,7 +16,7 @@ type SysOperaLog struct {
 }
 
 // GetPage 获取SysOperaLog列表
-func (e *SysOperaLog) GetPage(c *dto.SysOperaLogSearch, 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
 

app/admin/service/sys_post.go

@@ -15,8 +15,8 @@ type SysPost struct {
 	service.Service
 }
 
-// GetSysPostPage 获取SysPost列表
-func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]models.SysPost, count *int64) error {
+// GetPage 获取SysPost列表
+func (e *SysPost) GetPage(c *dto.SysPostPageReq, list *[]models.SysPost, count *int64) error {
 	var err error
 	var data models.SysPost
 
@@ -28,14 +28,14 @@ func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]models.SysPost, c
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {
-		e.Log.Errorf("db error:%s", err)
+		e.Log.Errorf("db error:%s \r", err)
 		return err
 	}
 	return nil
 }
 
-// GetSysPost 获取SysPost对象
-func (e *SysPost) GetSysPost(d *dto.SysPostById, model *models.SysPost) error {
+// Get 获取SysPost对象
+func (e *SysPost) Get(d *dto.SysPostGetReq, model *models.SysPost) error {
 	var err error
 	var data models.SysPost
 
@@ -54,8 +54,8 @@ func (e *SysPost) GetSysPost(d *dto.SysPostById, model *models.SysPost) error {
 	return nil
 }
 
-// InsertSysPost 创建SysPost对象
-func (e *SysPost) InsertSysPost(c *dto.SysPostControl) error {
+// Insert 创建SysPost对象
+func (e *SysPost) Insert(c *dto.SysPostInsertReq) error {
 	var err error
 	var data models.SysPost
 	c.Generate(&data)
@@ -67,8 +67,8 @@ func (e *SysPost) InsertSysPost(c *dto.SysPostControl) error {
 	return nil
 }
 
-// UpdateSysPost 修改SysPost对象
-func (e *SysPost) UpdateSysPost(c *dto.SysPostControl) error {
+// Update 修改SysPost对象
+func (e *SysPost) Update(c *dto.SysPostUpdateReq) error {
 	var err error
 	var model = models.SysPost{}
 	e.Orm.First(&model, c.GetId())
@@ -86,8 +86,8 @@ func (e *SysPost) UpdateSysPost(c *dto.SysPostControl) error {
 	return nil
 }
 
-// RemoveSysPost 删除SysPost
-func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error {
+// Remove 删除SysPost
+func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
 	var err error
 	var data models.SysPost
 
@@ -102,4 +102,4 @@ func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error {
 		return err
 	}
 	return nil
-}
+}

app/admin/service/sys_user.go

@@ -19,7 +19,7 @@ type SysUser struct {
 }
 
 // GetPage 获取SysUser列表
-func (e *SysUser) GetPage(c *dto.SysUserSearch, 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
 
@@ -107,6 +107,30 @@ func (e *SysUser) Update(c *dto.SysUserControl, p *actions.DataPermission) error
 	return nil
 }
 
+// UpdateSysUserAvatar 更新用户头像
+func (e *SysUser) UpdateSysUserAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPermission) error {
+	var err error
+	var model models.SysUser
+	db := e.Orm.Scopes(
+		actions.Permission(model.TableName(), p),
+	).First(&model, c.GetId())
+	if err = db.Error; err != nil {
+		e.Log.Errorf("Service UpdateSysUser error: %s", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+
+	}
+	c.Generate(&model)
+	err = e.Orm.Save(&model).Error
+	if err != nil {
+		e.Log.Errorf("Service UpdateSysUser error: %s", err)
+		return err
+	}
+	return nil
+}
+
 // UpdateSysUserStatus 更新用户状态
 func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
 	var err error

app/jobs/apis/sys_job.go

@@ -33,7 +33,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) {
 	err = s.RemoveJob(&v)
 	if err != nil {
 		e.Logger.Errorf("RemoveJob error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "")
+		e.Error(500, err, "")
 		return
 	}
 	e.OK(nil, s.Msg)
@@ -62,7 +62,7 @@ func (e SysJob) StartJobForService(c *gin.Context) {
 	err = s.StartJob(&v)
 	if err != nil {
 		log.Errorf("GetCrontabKey error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "")
+		e.Error(500, err, "")
 		return
 	}
 	e.OK(nil, s.Msg)

app/other/apis/file.go

@@ -40,6 +40,7 @@ type File struct {
 // @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/public/uploadFile [post]
+// @Security Bearer
 func (e File) UploadFile(c *gin.Context) {
 	e.MakeContext(c)
 	tag, _ := c.GetPostForm("type")

app/other/apis/sys_server_monitor.go

@@ -29,6 +29,7 @@ type ServerMonitor struct {
 // @Tags 系统信息
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/server-monitor [get]
+// @Security Bearer
 func (e ServerMonitor) ServerInfo(c *gin.Context) {
 	e.Context = c
 

app/other/apis/tools/db_columns.go

@@ -1,19 +1,17 @@
 package tools
 
 import (
-	"net/http"
-
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/tools"
+	"go-admin/app/other/models/tools"
 )
 
 // GetDBColumnList 分页列表数据
 // @Summary 分页列表数据 / page list data
 // @Description 数据库表列分页列表 / database table column page list
-// @Tags 工具 / Tools
+// @Tags 工具 / 生成工具
 // @Param tableName query string false "tableName / 数据表名称"
 // @Param pageSize query int false "pageSize / 页条数"
 // @Param pageIndex query int false "pageIndex / 页码"
@@ -38,7 +36,7 @@ func (e *Gen) GetDBColumnList(c *gin.Context) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 

app/other/apis/tools/db_tables.go

@@ -2,20 +2,18 @@ package tools
 
 import (
 	"errors"
-	"net/http"
-
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/tools"
+	"go-admin/app/other/models/tools"
 )
 
 // GetDBTableList 分页列表数据
 // @Summary 分页列表数据 / page list data
 // @Description 数据库表分页列表 / database table page list
-// @Tags 工具 / Tools
+// @Tags 工具 / 生成工具
 // @Param tableName query string false "tableName / 数据表名称"
 // @Param pageSize query int false "pageSize / 页条数"
 // @Param pageIndex query int false "pageIndex / 页码"
@@ -47,7 +45,7 @@ func (e *Gen) GetDBTableList(c *gin.Context) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 

app/other/apis/tools/gen.go

@@ -2,9 +2,9 @@ package tools
 
 import (
 	"bytes"
+	"fmt"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"net/http"
 	"strconv"
 	"strings"
 	"text/template"
@@ -15,7 +15,7 @@ import (
 	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 
-	"go-admin/app/admin/models/tools"
+	"go-admin/app/other/models/tools"
 )
 
 type Gen struct {
@@ -29,57 +29,57 @@ func (e Gen) Preview(c *gin.Context) {
 	id, err := pkg.StringToInt(c.Param("tableId"))
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("tableId接收失败！错误详情：%s", err.Error()))
 		return
 	}
 	table.TableId = id
 	t1, err := template.ParseFiles("template/v4/model.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("model模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("api模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t3, err := template.ParseFiles("template/v4/js.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("js模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t4, err := template.ParseFiles("template/v4/vue.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("vue模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("路由模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t6, err := template.ParseFiles("template/v4/dto.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("dto模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t7, err := template.ParseFiles("template/v4/no_actions/service.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("service模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, fmt.Sprintf("数据库链接获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -117,14 +117,14 @@ func (e Gen) GenCode(c *gin.Context) {
 	id, err := pkg.StringToInt(c.Param("tableId"))
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("tableId参数接收失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, fmt.Sprintf("数据库链接获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -147,14 +147,14 @@ func (e Gen) GenApiToFile(c *gin.Context) {
 	id, err := pkg.StringToInt(c.Param("tableId"))
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("tableId参数获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, fmt.Sprintf("数据库链接获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -168,6 +168,7 @@ func (e Gen) GenApiToFile(c *gin.Context) {
 func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	e.Context = c
 	log := e.GetLogger()
+	tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1)
 
 	basePath := "template/v4/"
 	routerFile := basePath + "no_actions/router_check_role.go.template"
@@ -179,43 +180,43 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	t1, err := template.ParseFiles(basePath + "model.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("model模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t2, err := template.ParseFiles(basePath + "no_actions/apis.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("api模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t3, err := template.ParseFiles(routerFile)
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("路由模版失败！错误详情：%s", err.Error()))
 		return
 	}
 	t4, err := template.ParseFiles(basePath + "js.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("js模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t5, err := template.ParseFiles(basePath + "vue.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("vue模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t6, err := template.ParseFiles(basePath + "dto.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("dto模版解析失败失败！错误详情：%s", err.Error()))
 		return
 	}
 	t7, err := template.ParseFiles(basePath + "no_actions/service.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("service模版失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -223,8 +224,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
 	_ = pkg.PathCreate("./app/" + tab.PackageName + "/router/")
 	_ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/")
-	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/")
-	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName)
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/" + tab.PackageName+ "/")
+	err = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.PackageName + "/" + tab.MLTBName+ "/")
+	if err != nil {
+		log.Error(err)
+		e.Error(500, err, fmt.Sprintf("views目录创建失败！错误详情：%s", err.Error()))
+		return
+	}
 
 	var b1 bytes.Buffer
 	err = t1.Execute(&b1, tab)
@@ -240,13 +246,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	err = t6.Execute(&b6, tab)
 	var b7 bytes.Buffer
 	err = t7.Execute(&b7, tab)
-	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go")
-	pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+".go")
-	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go")
-	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js")
-	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue")
-	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go")
-	pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.ModuleName+".go")
+	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.TBName+".go")
+	pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.TBName+".go")
+	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.TBName+".go")
+	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.PackageName+"/"+tab.MLTBName+".js")
+	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.PackageName+"/"+tab.MLTBName+"/index.vue")
+	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.TBName+".go")
+	pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.TBName+".go")
 
 }
 
@@ -265,7 +271,7 @@ func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
 	t1, err := template.ParseFiles(basePath + "api_migrate.template")
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("数据迁移模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	i := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
@@ -299,31 +305,31 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
 	t1, err := template.ParseFiles(basePath + "model.go.template")
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("model模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t3, err := template.ParseFiles(routerFile)
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("路由模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t4, err := template.ParseFiles(basePath + "js.go.template")
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("js模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t5, err := template.ParseFiles(basePath + "vue.go.template")
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("vue模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t6, err := template.ParseFiles(basePath + "dto.go.template")
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("dto模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -352,7 +358,7 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
 }
 
 func (e Gen) GenMenuAndApi(c *gin.Context) {
-	s:=service.SysMenu{}
+	s := service.SysMenu{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -365,16 +371,20 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 
 	table := tools.SysTables{}
 	id, err := pkg.StringToInt(c.Param("tableId"))
-	pkg.HasError(err, "", -1)
-
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf("tableId参数解析失败！错误详情：%s", err.Error()))
+		return
+	}
 
 	table.TableId = id
 	tab, _ := table.Get(e.Orm)
+	tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1)
 
 	Mmenu := dto.SysMenuControl{}
 	Mmenu.Title = tab.TableComment
 	Mmenu.Icon = "pass"
-	Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1)
+	Mmenu.Path = "/" +tab.MLTBName
 	Mmenu.MenuType = "M"
 	Mmenu.Action = "无"
 	Mmenu.ParentId = 0
@@ -390,13 +400,13 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	Cmenu.MenuName = tab.ClassName + "Manage"
 	Cmenu.Title = tab.TableComment
 	Cmenu.Icon = "pass"
-	Cmenu.Path = tab.TBName
+	Cmenu.Path = "/" + tab.PackageName + "/" + tab.MLTBName
 	Cmenu.MenuType = "C"
 	Cmenu.Action = "无"
 	Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list"
 	Cmenu.ParentId = Mmenu.MenuId
 	Cmenu.NoCache = false
-	Cmenu.Component = "/" + tab.ModuleFrontName + "/index"
+	Cmenu.Component = "/" + tab.PackageName + "/" + tab.MLTBName + "/index"
 	Cmenu.Sort = 0
 	Cmenu.Visible = "0"
 	Cmenu.IsFrame = "0"
@@ -472,6 +482,5 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MDelete.UpdateBy = 1
 	s.Insert(&MDelete)
 
-
 	e.OK("", "数据生成成功！")
 }

app/other/apis/tools/sys_tables.go

@@ -1,7 +1,6 @@
 package tools
 
 import (
-	"net/http"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -10,23 +9,23 @@ import (
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"gorm.io/gorm"
 
-	"go-admin/app/admin/models/tools"
+	"go-admin/app/other/models/tools"
 )
 
 type SysTable struct {
 	api.Api
 }
 
-// GetSysTableList 分页列表数据
+// GetPage 分页列表数据
 // @Summary 分页列表数据
 // @Description 生成表分页列表
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Param tableName query string false "tableName / 数据表名称"
 // @Param pageSize query int false "pageSize / 页条数"
 // @Param pageIndex query int false "pageIndex / 页码"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/page [get]
-func (e SysTable) GetSysTableList(c *gin.Context) {
+func (e SysTable) GetPage(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	var data tools.SysTables
@@ -45,7 +44,7 @@ func (e SysTable) GetSysTableList(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -60,20 +59,21 @@ func (e SysTable) GetSysTableList(c *gin.Context) {
 	e.PageOK(result, count, pageIndex, pageSize, "查询成功")
 }
 
+// Get
 // @Summary 获取配置
 // @Description 获取JSON
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Param configKey path int true "configKey"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/info/{tableId} [get]
 // @Security Bearer
-func (e SysTable) GetSysTables(c *gin.Context) {
+func (e SysTable) Get(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -98,7 +98,7 @@ func (e SysTable) GetSysTablesInfo(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -127,7 +127,7 @@ func (e SysTable) GetSysTablesTree(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -142,9 +142,10 @@ func (e SysTable) GetSysTablesTree(c *gin.Context) {
 	e.OK(result, "")
 }
 
+// Insert
 // @Summary 添加表结构
 // @Description 添加表结构
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Accept  application/json
 // @Product application/json
 // @Param tables query string false "tableName / 数据表名称"
@@ -152,13 +153,13 @@ func (e SysTable) GetSysTablesTree(c *gin.Context) {
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/sys/tables/info [post]
 // @Security Bearer
-func (e SysTable) InsertSysTable(c *gin.Context) {
+func (e SysTable) Insert(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -222,7 +223,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	data.IsLogicalDelete = "1"
 	data.LogicalDelete = true
 	data.LogicalDeleteColumn = "is_del"
-	data.IsActions = 1
+	data.IsActions = 2
 	data.IsDataScope = 1
 	data.IsAuth = 1
 
@@ -287,9 +288,10 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	return data, err
 }
 
+// Update
 // @Summary 修改表结构
 // @Description 修改表结构
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Accept  application/json
 // @Product application/json
 // @Param data body tools.SysTables true "body"
@@ -297,7 +299,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/sys/tables/info [put]
 // @Security Bearer
-func (e SysTable) UpdateSysTable(c *gin.Context) {
+func (e SysTable) Update(c *gin.Context) {
 	var data tools.SysTables
 	err := c.Bind(&data)
 	pkg.HasError(err, "数据解析失败", 500)
@@ -307,7 +309,7 @@ func (e SysTable) UpdateSysTable(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -321,20 +323,21 @@ func (e SysTable) UpdateSysTable(c *gin.Context) {
 	e.OK(result, "修改成功")
 }
 
+// Delete
 // @Summary 删除表结构
 // @Description 删除表结构
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Param tableId path int true "tableId"
 // @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/sys/tables/info/{tableId} [delete]
-func (e SysTable) DeleteSysTables(c *gin.Context) {
+func (e SysTable) Delete(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -347,4 +350,4 @@ func (e SysTable) DeleteSysTables(c *gin.Context) {
 		return
 	}
 	e.OK(nil, "删除成功")
-}
+}

app/other/models/tools/sys_columns.go

@@ -0,0 +1,92 @@
+package tools
+
+import (
+	"go-admin/app/admin/models"
+	"gorm.io/gorm"
+)
+
+type SysColumns struct {
+	ColumnId             int          `gorm:"primaryKey;autoIncrement" json:"columnId"`
+	TableId              int          `gorm:"" json:"tableId"`
+	ColumnName           string       `gorm:"size:128;" json:"columnName"`
+	ColumnComment        string       `gorm:"column:column_comment;size:128;" json:"columnComment"`
+	ColumnType           string       `gorm:"column:column_type;size:128;" json:"columnType"`
+	GoType               string       `gorm:"column:go_type;size:128;" json:"goType"`
+	GoField              string       `gorm:"column:go_field;size:128;" json:"goField"`
+	JsonField            string       `gorm:"column:json_field;size:128;" json:"jsonField"`
+	IsPk                 string       `gorm:"column:is_pk;size:4;" json:"isPk"`
+	IsIncrement          string       `gorm:"column:is_increment;size:4;" json:"isIncrement"`
+	IsRequired           string       `gorm:"column:is_required;size:4;" json:"isRequired"`
+	IsInsert             string       `gorm:"column:is_insert;size:4;" json:"isInsert"`
+	IsEdit               string       `gorm:"column:is_edit;size:4;" json:"isEdit"`
+	IsList               string       `gorm:"column:is_list;size:4;" json:"isList"`
+	IsQuery              string       `gorm:"column:is_query;size:4;" json:"isQuery"`
+	QueryType            string       `gorm:"column:query_type;size:128;" json:"queryType"`
+	HtmlType             string       `gorm:"column:html_type;size:128;" json:"htmlType"`
+	DictType             string       `gorm:"column:dict_type;size:128;" json:"dictType"`
+	Sort                 int          `gorm:"column:sort;" json:"sort"`
+	List                 string       `gorm:"column:list;size:1;" json:"list"`
+	Pk                   bool         `gorm:"column:pk;size:1;" json:"pk"`
+	Required             bool         `gorm:"column:required;size:1;" json:"required"`
+	SuperColumn          bool         `gorm:"column:super_column;size:1;" json:"superColumn"`
+	UsableColumn         bool         `gorm:"column:usable_column;size:1;" json:"usableColumn"`
+	Increment            bool         `gorm:"column:increment;size:1;" json:"increment"`
+	Insert               bool         `gorm:"column:insert;size:1;" json:"insert"`
+	Edit                 bool         `gorm:"column:edit;size:1;" json:"edit"`
+	Query                bool         `gorm:"column:query;size:1;" json:"query"`
+	Remark               string       `gorm:"column:remark;size:255;" json:"remark"`
+	FkTableName          string       `gorm:"" json:"fkTableName"`
+	FkTableNameClass     string       `gorm:"" json:"fkTableNameClass"`
+	FkTableNamePackage   string       `gorm:"" json:"fkTableNamePackage"`
+	FkCol                []SysColumns `gorm:"-" json:"fkCol"`
+	FkLabelId            string       `gorm:"" json:"fkLabelId"`
+	FkLabelName          string       `gorm:"size:255;" json:"fkLabelName"`
+	CreateBy             int          `gorm:"column:create_by;size:20;" json:"createBy"`
+	UpdateBy             int          `gorm:"column:update_By;size:20;" json:"updateBy"`
+
+	models.BaseModel
+}
+
+func (SysColumns) TableName() string {
+	return "sys_columns"
+}
+
+func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) {
+	var doc []SysColumns
+
+	table := tx.Table("sys_columns")
+
+	table = table.Where("table_id = ?", e.TableId)
+
+	if err := table.Find(&doc).Error; err != nil {
+		return nil, err
+	}
+	return doc, nil
+}
+
+func (e *SysColumns) Create(tx *gorm.DB) (SysColumns, error) {
+	var doc SysColumns
+	e.CreateBy = 0
+	result := tx.Table("sys_columns").Create(&e)
+	if result.Error != nil {
+		err := result.Error
+		return doc, err
+	}
+	doc = *e
+	return doc, nil
+}
+
+func (e *SysColumns) Update(tx *gorm.DB) (update SysColumns, err error) {
+	if err = tx.Table("sys_columns").First(&update, e.ColumnId).Error; err != nil {
+		return
+	}
+
+	//参数1:是要修改的数据
+	//参数2:是修改的数据
+	e.UpdateBy = 0
+	if err = tx.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil {
+		return
+	}
+
+	return
+}

app/other/models/tools/sys_tables.go

@@ -12,6 +12,7 @@ import (
 type SysTables struct {
 	TableId             int    `gorm:"primaryKey;autoIncrement" json:"tableId"`        //表编码
 	TBName              string `gorm:"column:table_name;size:255;" json:"tableName"`   //表名称
+	MLTBName            string `gorm:"-" json:"-"`                                     //表名称
 	TableComment        string `gorm:"size:255;" json:"tableComment"`                  //表备注
 	ClassName           string `gorm:"size:255;" json:"className"`                     //类名
 	TplCategory         string `gorm:"size:255;" json:"tplCategory"`                   //
@@ -188,16 +189,17 @@ func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) {
 			t, ok := tableMap[e.Columns[i].FkTableName]
 			if ok {
 				e.Columns[i].FkTableNameClass = t.ClassName
-				e.Columns[i].FkTableNamePackage = t.ModuleName
+				t.MLTBName = strings.Replace(t.TBName, "_", "-", -1)
+				e.Columns[i].FkTableNamePackage = t.MLTBName
 			} else {
 				tableNameList := strings.Split(e.Columns[i].FkTableName, "_")
 				e.Columns[i].FkTableNameClass = ""
-				e.Columns[i].FkTableNamePackage = ""
+				//e.Columns[i].FkTableNamePackage = ""
 				for a := 0; a < len(tableNameList); a++ {
 					strStart := string([]byte(tableNameList[a])[:1])
 					strEnd := string([]byte(tableNameList[a])[1:])
 					e.Columns[i].FkTableNameClass += strings.ToUpper(strStart) + strEnd
-					e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd)
+					//e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd)
 				}
 			}
 		}

app/other/router/file.go

@@ -2,15 +2,19 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/other/apis"
 )
 
 func init() {
-	routerNoCheckRole = append(routerNoCheckRole, registerFileRouter)
+	routerCheckRole = append(routerCheckRole, registerFileRouter)
 }
 
 // 需认证的路由代码
-func registerFileRouter(v1 *gin.RouterGroup) {
+func registerFileRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	var api = apis.File{}
-	v1.POST("/public/uploadFile", api.UploadFile)
+	r := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		r.POST("/public/uploadFile", api.UploadFile)
+	}
 }

app/other/router/gen_router.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis"
-	"go-admin/app/admin/apis/tools"
+	"go-admin/app/other/apis/tools"
 )
 
 func init() {
@@ -15,7 +15,7 @@ func sysNoCheckRoleRouter(v1 *gin.RouterGroup ,authMiddleware *jwt.GinJWTMiddlew
 	r1 := v1.Group("")
 	{
 		sys := apis.System{}
-		r1.GET("/getCaptcha", sys.GenerateCaptchaHandler)
+		r1.GET("/captcha", sys.GenerateCaptchaHandler)
 	}
 
 	r := v1.Group("").Use(authMiddleware.MiddlewareFunc())
@@ -43,13 +43,13 @@ func registerSysTableRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddl
 	tables := v1.Group("/sys/tables")
 	{
 		sysTable := tools.SysTable{}
-		tables.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/page", sysTable.GetSysTableList)
+		tables.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/page", sysTable.GetPage)
 		tablesInfo := tables.Group("/info").Use(authMiddleware.MiddlewareFunc())
 		{
-			tablesInfo.POST("", sysTable.InsertSysTable)
-			tablesInfo.PUT("", sysTable.UpdateSysTable)
-			tablesInfo.DELETE("/:tableId", sysTable.DeleteSysTables)
-			tablesInfo.GET("/:tableId", sysTable.GetSysTables)
+			tablesInfo.POST("", sysTable.Insert)
+			tablesInfo.PUT("", sysTable.Update)
+			tablesInfo.DELETE("/:tableId", sysTable.Delete)
+			tablesInfo.GET("/:tableId", sysTable.Get)
 			tablesInfo.GET("", sysTable.GetSysTablesInfo)
 		}
 	}

common/actions/create.go

@@ -33,14 +33,14 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, 500, err, "模型生成失败")
 			return
 		}
 		object.SetCreateBy(user.GetUserId(c))
 		err = db.WithContext(c).Create(object).Error
 		if err != nil {
 			log.Errorf("Create error: %s", err)
-			response.Error(c, http.StatusInternalServerError, err, "创建失败")
+			response.Error(c, 500, err, "创建失败")
 			return
 		}
 		response.OK(c, object.GetId(), "创建成功")

common/actions/delete.go

@@ -34,7 +34,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, 500, err, "模型生成失败")
 			return
 		}
 
@@ -48,7 +48,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
 		).Where(req.GetId()).Delete(object)
 		if db.Error != nil {
 			log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
-			response.Error(c, http.StatusInternalServerError, err, "删除失败")
+			response.Error(c, 500, err, "删除失败")
 			return
 		}
 		if db.RowsAffected == 0 {

common/actions/index.go

@@ -49,7 +49,7 @@ func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.H
 			Count(&count).Error
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			log.Errorf("MsgID[%s] Index error: %s", msgID, err)
-			response.Error(c, http.StatusInternalServerError, err, "查询失败")
+			response.Error(c, 500, err, "查询失败")
 			return
 		}
 		response.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")

common/actions/permission.go

@@ -2,7 +2,6 @@ package actions
 
 import (
 	"errors"
-	"net/http"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/go-admin-team/go-admin-core/logger"
@@ -34,7 +33,7 @@ func PermissionAction() gin.HandlerFunc {
 			p, err = newDataPermission(db, userId)
 			if err != nil {
 				log.Errorf("MsgID[%s] PermissionAction error: %s", msgID, err)
-				response.Error(c, http.StatusInternalServerError, err, "权限范围鉴定错误")
+				response.Error(c, 500, err, "权限范围鉴定错误")
 				c.Abort()
 				return
 			}

common/actions/update.go

@@ -33,7 +33,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, 500, err, "模型生成失败")
 			return
 		}
 		object.SetUpdateBy(user.GetUserId(c))
@@ -46,7 +46,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
 		).Where(req.GetId()).Updates(object)
 		if db.Error != nil {
 			log.Errorf("MsgID[%s] Update error: %s", msgID, err)
-			response.Error(c, http.StatusInternalServerError, err, "更新失败")
+			response.Error(c, 500, err, "更新失败")
 			return
 		}
 		if db.RowsAffected == 0 {

common/actions/view.go

@@ -34,7 +34,7 @@ func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc {
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, 500, err, "模型生成失败")
 			return
 		}
 
@@ -58,7 +58,7 @@ func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc {
 		}
 		if err != nil {
 			log.Errorf("MsgID[%s] View error: %s", msgID, err)
-			response.Error(c, http.StatusInternalServerError, err, "查看失败")
+			response.Error(c, 500, err, "查看失败")
 			return
 		}
 		response.OK(c, rsp, "查询成功")

common/apis/api.go

@@ -3,7 +3,6 @@ package apis
 import (
 	"errors"
 	"fmt"
-	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
@@ -85,7 +84,7 @@ func (e *Api) Bind(d interface{}, bindings ...binding.Binding) *Api {
 func (e Api) GetOrm() (*gorm.DB, error) {
 	db, err := pkg.GetOrm(e.Context)
 	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return nil, err
 	}
 	return db, nil
@@ -96,13 +95,13 @@ func (e *Api) MakeOrm() *Api {
 	var err error
 	if e.Logger == nil {
 		err = errors.New("at MakeOrm logger is nil")
-		//e.Logger.Error(http.StatusInternalServerError, err, "at MakeOrm logger is nil")
+		//e.Logger.Error(500, err, "at MakeOrm logger is nil")
 		e.AddError(err)
 		return e
 	}
 	db, err := pkg.GetOrm(e.Context)
 	if err != nil {
-		e.Logger.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Logger.Error(500, err, "数据库连接获取失败")
 		e.AddError(err)
 	}
 	e.Orm = db

common/dto/generate.go

@@ -51,3 +51,56 @@ func (s *ObjectById) GetId() interface{} {
 	}
 	return s.Id
 }
+
+type ObjectGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *ObjectGetReq) Bind(ctx *gin.Context) error {
+	var err error
+	log := api.GetRequestLogger(ctx)
+	err = ctx.ShouldBindUri(s)
+	if err != nil {
+		log.Warnf("ShouldBindUri error: %s", err.Error())
+		return err
+	}
+	if err = vd.Validate(s); err != nil {
+		log.Errorf("Validate error: %s", err.Error())
+		return err
+	}
+	return err
+}
+
+func (s *ObjectGetReq) GetId() interface{} {
+	return s.Id
+}
+
+type ObjectDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *ObjectDeleteReq) Bind(ctx *gin.Context) error {
+	var err error
+	log := api.GetRequestLogger(ctx)
+	err = ctx.ShouldBind(&s)
+	if err != nil {
+		log.Warnf("ShouldBind error: %s", err.Error())
+		return err
+	}
+	if len(s.Ids) > 0 {
+		return nil
+	}
+	if s.Ids == nil {
+		s.Ids = make([]int, 0)
+	}
+
+	if err = vd.Validate(s); err != nil {
+		log.Errorf("Validate error: %s", err.Error())
+		return err
+	}
+	return err
+}
+
+func (s *ObjectDeleteReq) GetId() interface{} {
+	return s.Ids
+}

common/global/adm.go

@@ -2,7 +2,7 @@ package global
 
 const (
 	// Version go-admin version info
-	Version = "2.0.0-beta.6"
+	Version = "2.0.0-beta.8"
 )
 
 var (

common/ip.go

@@ -1,16 +1,15 @@
 package common
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"strings"
 )
 
 func GetClientIP(c *gin.Context) string {
 	ClientIP := c.ClientIP()
-	fmt.Println("ClientIP:", ClientIP)
+	//fmt.Println("ClientIP:", ClientIP)
 	RemoteIP, _ := c.RemoteIP()
-	fmt.Println("RemoteIP:", RemoteIP)
+	//fmt.Println("RemoteIP:", RemoteIP)
 	ip := c.Request.Header.Get("X-Forwarded-For")
 	if strings.Contains(ip, "127.0.0.1") || ip == "" {
 		ip = c.Request.Header.Get("X-real-ip")
@@ -24,6 +23,6 @@ func GetClientIP(c *gin.Context) string {
 	if ClientIP != "127.0.0.1" {
 		ip = ClientIP
 	}
-	fmt.Println("ip:", ip)
+	//fmt.Println("ip:", ip)
 	return ip
 }

common/middleware/handler/auth.go

@@ -57,6 +57,7 @@ func IdentityHandler(c *gin.Context) interface{} {
 // @Description Reply will be of the form {"token": "TOKEN"}.
 // @Description dev mode：It should be noted that all fields cannot be empty, and a value of 0 can be passed in addition to the account password
 // @Description 注意：开发模式：需要注意全部字段不能为空，账号密码外可以传入0值
+// @Tags 登陆
 // @Accept  application/json
 // @Product application/json
 // @Param account body Login  true "account"
@@ -67,7 +68,7 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db error, %s", err.Error())
-		response.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		response.Error(c, 500, err, "数据库连接获取失败")
 		return nil, jwt.ErrFailedAuthentication
 	}
 

common/response/binding.go

@@ -0,0 +1,105 @@
+package response
+
+import (
+	"fmt"
+	"github.com/gin-gonic/gin/binding"
+	"reflect"
+	"strings"
+	"sync"
+)
+
+const (
+	_ uint8 = iota
+	json
+	xml
+	yaml
+	form
+	query
+)
+
+var constructor = &bindConstructor{}
+
+type bindConstructor struct {
+	cache map[string][]uint8
+	mux   sync.Mutex
+}
+
+func (e *bindConstructor) GetBindingForGin(d interface{}) []binding.Binding {
+	bs := e.getBinding(reflect.TypeOf(d).String())
+	if bs == nil {
+		//重新构建
+		bs = e.resolve(d)
+	}
+	gbs := make([]binding.Binding, len(bs))
+	for i, b := range bs {
+		switch b {
+		case json:
+			gbs[i] = binding.JSON
+		case xml:
+			gbs[i] = binding.XML
+		case yaml:
+			gbs[i] = binding.YAML
+		case form:
+			gbs[i] = binding.Form
+		case query:
+			gbs[i] = binding.Query
+		default:
+			gbs[i] = nil
+		}
+	}
+	return gbs
+}
+
+func (e *bindConstructor) resolve(d interface{}) []uint8 {
+	bs := make([]uint8, 0)
+	qType := reflect.TypeOf(d).Elem()
+	var tag reflect.StructTag
+	var ok bool
+	fmt.Println(qType.Kind())
+	for i := 0; i < qType.NumField(); i++ {
+		tag = qType.Field(i).Tag
+		if _, ok = tag.Lookup("json"); ok {
+			bs = append(bs, json)
+		}
+		if _, ok = tag.Lookup("xml"); ok {
+			bs = append(bs, xml)
+		}
+		if _, ok = tag.Lookup("yaml"); ok {
+			bs = append(bs, yaml)
+		}
+		if _, ok = tag.Lookup("form"); ok {
+			bs = append(bs, form)
+		}
+		if _, ok = tag.Lookup("query"); ok {
+			bs = append(bs, query)
+		}
+		if _, ok = tag.Lookup("uri"); ok {
+			bs = append(bs, 0)
+		}
+		if t, ok := tag.Lookup("binding"); ok && strings.Index(t, "dive") > -1 {
+			qValue := reflect.ValueOf(d)
+			bs = append(bs, e.resolve(qValue.Field(i))...)
+			continue
+		}
+		if t, ok := tag.Lookup("validate"); ok && strings.Index(t, "dive") > -1 {
+			qValue := reflect.ValueOf(d)
+			bs = append(bs, e.resolve(qValue.Field(i))...)
+		}
+	}
+	return bs
+}
+
+func (e *bindConstructor) getBinding(name string) []uint8 {
+	e.mux.Lock()
+	defer e.mux.Unlock()
+	return e.cache[name]
+}
+
+func (e *bindConstructor) setBinding(name string, bs []uint8) {
+	e.mux.Lock()
+	defer e.mux.Unlock()
+	if e.cache == nil {
+		e.cache = make(map[string][]uint8)
+	}
+	e.cache[name] = bs
+}

config/db.sql

@@ -192,10 +192,6 @@ INSERT INTO `sys_dict_type` VALUES (10, '通知状态', 'sys_notice_status', '2'
 INSERT INTO `sys_dict_type` VALUES (11, '内容状态', 'sys_content_status', '2', '', 1, 1, '2021-05-13 19:56:40.813', '2021-05-13 19:56:40.813', NULL);
 COMMIT;
 
-BEGIN;
-INSERT INTO `sys_file_dir` VALUES (1, '根目录', 0, 0, '', 1, 1, '2021-05-13 19:56:39.773', '2021-05-13 19:56:39.773', NULL);
-COMMIT;
-
 BEGIN;
 INSERT INTO `sys_job` VALUES (1, '接口测试', 'DEFAULT', 1, '0/5 * * * * ', 'http://localhost:8000', '', 1, 1, 1, 0, '2021-05-13 19:56:37.914', '2021-06-14 20:59:55.417', NULL, 1, 1);
 INSERT INTO `sys_job` VALUES (2, '函数测试', 'DEFAULT', 2, '0/5 * * * * ', 'ExamplesOne', '参数', 1, 1, 1, 0, '2021-05-13 19:56:37.914', '2021-05-31 23:55:37.221', NULL, 1, 1);
@@ -358,11 +354,11 @@ INSERT INTO `sys_menu_api_rule` VALUES (45, 142);
 INSERT INTO `sys_menu_api_rule` VALUES (43, 150);
 INSERT INTO `sys_menu_api_rule` VALUES (45, 151);
 INSERT INTO `sys_menu_api_rule` VALUES (46, 156);
-INSERT INTO `sys_post` VALUES (1, '首席执行官', 'CEO', 0, '2', '首席执行官', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL, 1, 1);
-INSERT INTO `sys_post` VALUES (2, '首席技术执行官', 'CTO', 2, '2', '首席技术执行官', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL, 1, 1);
-INSERT INTO `sys_post` VALUES (3, '首席运营官', 'COO', 3, '2', '测试工程师', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL, 1, 1);
-INSERT INTO `sys_role` VALUES (1, '系统管理员', '2', 'admin', 1, '', '', 1, '', '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL, 1, 1);
-INSERT INTO `sys_user` VALUES (1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:40.205', NULL, 1, 'admin', '$2a$10$/Glr4g9Svr6O0kvjsRJCXu3f0W8/dsP3XZyVNi1019ratWpSPMyw.', 'zhangwj', '13818888888', 1, '', '', '1', '1@qq.com', 1, 1, '', '2');
+INSERT INTO `sys_post` VALUES (1, '首席执行官', 'CEO', 0, '2','首席执行官', 1, 1, '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL);
+INSERT INTO `sys_post` VALUES (2, '首席技术执行官', 'CTO', 2, '2','首席技术执行官', 1, 1,'2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL);
+INSERT INTO `sys_post` VALUES (3, '首席运营官', 'COO', 3, '2','测试工程师', 1, 1,'2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL);
+INSERT INTO `sys_role` VALUES (1, '系统管理员', '2', 'admin', 1, '', '', 1, '', 1, 1, '2021-05-13 19:56:37.913', '2021-05-13 19:56:37.913', NULL);
+INSERT INTO `sys_user` VALUES (1, 'admin', '$2a$10$/Glr4g9Svr6O0kvjsRJCXu3f0W8/dsP3XZyVNi1019ratWpSPMyw.', 'zhangwj', '13818888888', 1, '', '', '1', '1@qq.com', 1, 1, '', '2', 1, 1, '2021-05-13 19:56:37.914', '2021-05-13 19:56:40.205', NULL);
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;

config/settings.yml

@@ -48,10 +48,11 @@ settings:
     demo:
       name: data
   cache:
-    redis:
-      addr: 127.0.0.1:6379
-      password: xxxxxx
-      db: 2
+#    redis:
+#      addr: 127.0.0.1:6379
+#      password: xxxxxx
+#      db: 2
+    memory: '' key存在即可
   queue:
     memory:
       poolSize: 100

docs/docs.go

@@ -30,16 +30,11 @@ var doc = `{
     "paths": {
         "/api/v1/app-config": {
             "get": {
-                "security": [
-                    {
-                        "Bearer": []
-                    }
-                ],
-                "description": "获取系统配置信息，主要注意这里不在验证数据权限",
+                "description": "获取系统配置信息，主要注意这里不在验证权限",
                 "tags": [
                     "配置管理"
                 ],
-                "summary": "获取系统前台配置信息，主要注意这里不在验证数据权限",
+                "summary": "获取系统前台配置信息，主要注意这里不在验证权限",
                 "responses": {
                     "200": {
                         "description": "{\"code\": 200, \"data\": [...]}",
@@ -65,11 +60,46 @@ var doc = `{
                 }
             }
         },
+        "/api/v1/captcha": {
+            "get": {
+                "description": "获取验证码",
+                "tags": [
+                    "登陆"
+                ],
+                "summary": "获取验证码",
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "string"
+                                        },
+                                        "id": {
+                                            "type": "string"
+                                        },
+                                        "msg": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/api/v1/db/columns/page": {
             "get": {
                 "description": "数据库表列分页列表 / database table column page list",
                 "tags": [
-                    "工具 / Tools"
+                    "工具 / 生成工具"
                 ],
                 "summary": "分页列表数据 / page list data",
                 "parameters": [
@@ -106,7 +136,7 @@ var doc = `{
             "get": {
                 "description": "数据库表分页列表 / database table page list",
                 "tags": [
-                    "工具 / Tools"
+                    "工具 / 生成工具"
                 ],
                 "summary": "分页列表数据 / page list data",
                 "parameters": [
@@ -215,6 +245,11 @@ var doc = `{
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "部门"
@@ -621,6 +656,11 @@ var doc = `{
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "字典类型"
@@ -780,6 +820,9 @@ var doc = `{
                 "consumes": [
                     "application/json"
                 ],
+                "tags": [
+                    "登陆"
+                ],
                 "summary": "登陆",
                 "parameters": [
                     {
@@ -872,6 +915,11 @@ var doc = `{
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "菜单"
@@ -1093,7 +1141,7 @@ var doc = `{
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SysPostControl"
+                            "$ref": "#/definitions/dto.SysPostInsertReq"
                         }
                     }
                 ],
@@ -1107,6 +1155,11 @@ var doc = `{
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "岗位"
@@ -1114,11 +1167,13 @@ var doc = `{
                 "summary": "删除岗位",
                 "parameters": [
                     {
-                        "type": "integer",
-                        "description": "id",
+                        "description": "请求参数",
                         "name": "id",
-                        "in": "path",
-                        "required": true
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/dto.SysPostDeleteReq"
+                        }
                     }
                 ],
                 "responses": {
@@ -1137,7 +1192,7 @@ var doc = `{
                 }
             }
         },
-        "/api/v1/post/": {
+        "/api/v1/post/{id}": {
             "put": {
                 "security": [
                     {
@@ -1159,7 +1214,7 @@ var doc = `{
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SysPostControl"
+                            "$ref": "#/definitions/dto.SysPostUpdateReq"
                         }
                     }
                 ],
@@ -1188,8 +1243,8 @@ var doc = `{
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "postId",
-                        "name": "postId",
+                        "description": "编码",
+                        "name": "id",
                         "in": "path",
                         "required": true
                     }
@@ -1206,6 +1261,11 @@ var doc = `{
         },
         "/api/v1/public/uploadFile": {
             "post": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "consumes": [
                     "multipart/form-data"
@@ -1461,6 +1521,11 @@ var doc = `{
         },
         "/api/v1/server-monitor": {
             "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "tags": [
                     "系统信息"
@@ -2037,6 +2102,11 @@ var doc = `{
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "登录日志删除",
                 "tags": [
                     "登录日志"
@@ -2165,6 +2235,11 @@ var doc = `{
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "操作日志"
@@ -2249,10 +2324,78 @@ var doc = `{
                         }
                     }
                 }
+            },
+            "post": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "获取JSON",
+                "consumes": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户"
+                ],
+                "summary": "创建用户",
+                "parameters": [
+                    {
+                        "description": "用户数据",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/dto.SysUserControl"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
             }
         },
         "/api/v1/sys-user/{userId}": {
+            "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "获取JSON",
+                "tags": [
+                    "用户"
+                ],
+                "summary": "获取用户",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户编码",
+                        "name": "userId",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            },
             "put": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "consumes": [
                     "application/json"
@@ -2282,6 +2425,11 @@ var doc = `{
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "用户"
@@ -2318,7 +2466,7 @@ var doc = `{
                     "application/json"
                 ],
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "修改表结构",
                 "parameters": [
@@ -2352,7 +2500,7 @@ var doc = `{
                     "application/json"
                 ],
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "添加表结构",
                 "parameters": [
@@ -2382,7 +2530,7 @@ var doc = `{
                 ],
                 "description": "获取JSON",
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "获取配置",
                 "parameters": [
@@ -2406,7 +2554,7 @@ var doc = `{
             "delete": {
                 "description": "删除表结构",
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "删除表结构",
                 "parameters": [
@@ -2432,7 +2580,7 @@ var doc = `{
             "get": {
                 "description": "生成表分页列表",
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "分页列表数据",
                 "parameters": [
@@ -2465,70 +2613,13 @@ var doc = `{
                 }
             }
         },
-        "/api/v1/sysUser": {
+        "/api/v1/user/avatar": {
             "post": {
-                "description": "获取JSON",
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "用户"
-                ],
-                "summary": "创建用户",
-                "parameters": [
-                    {
-                        "description": "用户数据",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/dto.SysUserControl"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{\"code\": 200, \"data\": [...]}",
-                        "schema": {
-                            "$ref": "#/definitions/response.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/v1/sysUser/{userId}": {
-            "get": {
                 "security": [
                     {
                         "Bearer": []
                     }
                 ],
-                "description": "获取JSON",
-                "tags": [
-                    "用户"
-                ],
-                "summary": "获取用户",
-                "parameters": [
-                    {
-                        "type": "integer",
-                        "description": "用户编码",
-                        "name": "userId",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{\"code\": 200, \"data\": [...]}",
-                        "schema": {
-                            "$ref": "#/definitions/response.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/v1/user/avatar": {
-            "post": {
                 "description": "获取JSON",
                 "consumes": [
                     "multipart/form-data"
@@ -2578,8 +2669,44 @@ var doc = `{
                 }
             }
         },
-        "/api/v1/user/pwd": {
-            "post": {
+        "/api/v1/user/pwd/reset": {
+            "put": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "获取JSON",
+                "consumes": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户"
+                ],
+                "summary": "重置用户密码",
+                "parameters": [
+                    {
+                        "description": "body",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/dto.ResetSysUserPwdReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/v1/user/pwd/set": {
+            "put": {
                 "security": [
                     {
                         "Bearer": []
@@ -2614,39 +2741,13 @@ var doc = `{
                 }
             }
         },
-        "/api/v1/user/pwd/reset": {
-            "put": {
-                "description": "获取JSON",
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "用户"
-                ],
-                "summary": "重置用户密码",
-                "parameters": [
-                    {
-                        "description": "body",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/dto.ResetSysUserPwdReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{\"code\": 200, \"data\": [...]}",
-                        "schema": {
-                            "$ref": "#/definitions/response.Response"
-                        }
-                    }
-                }
-            }
-        },
         "/api/v1/user/status": {
             "put": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "consumes": [
                     "application/json"
@@ -3132,7 +3233,53 @@ var doc = `{
                 }
             }
         },
-        "dto.SysPostControl": {
+        "dto.SysPostDeleteReq": {
+            "type": "object",
+            "properties": {
+                "createBy": {
+                    "type": "integer"
+                },
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "updateBy": {
+                    "type": "integer"
+                }
+            }
+        },
+        "dto.SysPostInsertReq": {
+            "type": "object",
+            "properties": {
+                "createBy": {
+                    "type": "integer"
+                },
+                "postCode": {
+                    "type": "string"
+                },
+                "postId": {
+                    "type": "integer"
+                },
+                "postName": {
+                    "type": "string"
+                },
+                "remark": {
+                    "type": "string"
+                },
+                "sort": {
+                    "type": "integer"
+                },
+                "status": {
+                    "type": "integer"
+                },
+                "updateBy": {
+                    "type": "integer"
+                }
+            }
+        },
+        "dto.SysPostUpdateReq": {
             "type": "object",
             "properties": {
                 "createBy": {

docs/swagger.json

@@ -13,16 +13,11 @@
     "paths": {
         "/api/v1/app-config": {
             "get": {
-                "security": [
-                    {
-                        "Bearer": []
-                    }
-                ],
-                "description": "获取系统配置信息，主要注意这里不在验证数据权限",
+                "description": "获取系统配置信息，主要注意这里不在验证权限",
                 "tags": [
                     "配置管理"
                 ],
-                "summary": "获取系统前台配置信息，主要注意这里不在验证数据权限",
+                "summary": "获取系统前台配置信息，主要注意这里不在验证权限",
                 "responses": {
                     "200": {
                         "description": "{\"code\": 200, \"data\": [...]}",
@@ -48,11 +43,46 @@
                 }
             }
         },
+        "/api/v1/captcha": {
+            "get": {
+                "description": "获取验证码",
+                "tags": [
+                    "登陆"
+                ],
+                "summary": "获取验证码",
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/response.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "string"
+                                        },
+                                        "id": {
+                                            "type": "string"
+                                        },
+                                        "msg": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
         "/api/v1/db/columns/page": {
             "get": {
                 "description": "数据库表列分页列表 / database table column page list",
                 "tags": [
-                    "工具 / Tools"
+                    "工具 / 生成工具"
                 ],
                 "summary": "分页列表数据 / page list data",
                 "parameters": [
@@ -89,7 +119,7 @@
             "get": {
                 "description": "数据库表分页列表 / database table page list",
                 "tags": [
-                    "工具 / Tools"
+                    "工具 / 生成工具"
                 ],
                 "summary": "分页列表数据 / page list data",
                 "parameters": [
@@ -198,6 +228,11 @@
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "部门"
@@ -604,6 +639,11 @@
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "字典类型"
@@ -763,6 +803,9 @@
                 "consumes": [
                     "application/json"
                 ],
+                "tags": [
+                    "登陆"
+                ],
                 "summary": "登陆",
                 "parameters": [
                     {
@@ -855,6 +898,11 @@
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "菜单"
@@ -1076,7 +1124,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SysPostControl"
+                            "$ref": "#/definitions/dto.SysPostInsertReq"
                         }
                     }
                 ],
@@ -1090,6 +1138,11 @@
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "岗位"
@@ -1097,11 +1150,13 @@
                 "summary": "删除岗位",
                 "parameters": [
                     {
-                        "type": "integer",
-                        "description": "id",
+                        "description": "请求参数",
                         "name": "id",
-                        "in": "path",
-                        "required": true
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/dto.SysPostDeleteReq"
+                        }
                     }
                 ],
                 "responses": {
@@ -1120,7 +1175,7 @@
                 }
             }
         },
-        "/api/v1/post/": {
+        "/api/v1/post/{id}": {
             "put": {
                 "security": [
                     {
@@ -1142,7 +1197,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SysPostControl"
+                            "$ref": "#/definitions/dto.SysPostUpdateReq"
                         }
                     }
                 ],
@@ -1171,8 +1226,8 @@
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "postId",
-                        "name": "postId",
+                        "description": "编码",
+                        "name": "id",
                         "in": "path",
                         "required": true
                     }
@@ -1189,6 +1244,11 @@
         },
         "/api/v1/public/uploadFile": {
             "post": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "consumes": [
                     "multipart/form-data"
@@ -1444,6 +1504,11 @@
         },
         "/api/v1/server-monitor": {
             "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "tags": [
                     "系统信息"
@@ -2020,6 +2085,11 @@
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "登录日志删除",
                 "tags": [
                     "登录日志"
@@ -2148,6 +2218,11 @@
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "操作日志"
@@ -2232,10 +2307,78 @@
                         }
                     }
                 }
+            },
+            "post": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "获取JSON",
+                "consumes": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户"
+                ],
+                "summary": "创建用户",
+                "parameters": [
+                    {
+                        "description": "用户数据",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/dto.SysUserControl"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
             }
         },
         "/api/v1/sys-user/{userId}": {
+            "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "获取JSON",
+                "tags": [
+                    "用户"
+                ],
+                "summary": "获取用户",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户编码",
+                        "name": "userId",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            },
             "put": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "consumes": [
                     "application/json"
@@ -2265,6 +2408,11 @@
                 }
             },
             "delete": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "删除数据",
                 "tags": [
                     "用户"
@@ -2301,7 +2449,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "修改表结构",
                 "parameters": [
@@ -2335,7 +2483,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "添加表结构",
                 "parameters": [
@@ -2365,7 +2513,7 @@
                 ],
                 "description": "获取JSON",
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "获取配置",
                 "parameters": [
@@ -2389,7 +2537,7 @@
             "delete": {
                 "description": "删除表结构",
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "删除表结构",
                 "parameters": [
@@ -2415,7 +2563,7 @@
             "get": {
                 "description": "生成表分页列表",
                 "tags": [
-                    "工具 - 生成表"
+                    "工具 / 生成工具"
                 ],
                 "summary": "分页列表数据",
                 "parameters": [
@@ -2448,70 +2596,13 @@
                 }
             }
         },
-        "/api/v1/sysUser": {
+        "/api/v1/user/avatar": {
             "post": {
-                "description": "获取JSON",
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "用户"
-                ],
-                "summary": "创建用户",
-                "parameters": [
-                    {
-                        "description": "用户数据",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/dto.SysUserControl"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{\"code\": 200, \"data\": [...]}",
-                        "schema": {
-                            "$ref": "#/definitions/response.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/v1/sysUser/{userId}": {
-            "get": {
                 "security": [
                     {
                         "Bearer": []
                     }
                 ],
-                "description": "获取JSON",
-                "tags": [
-                    "用户"
-                ],
-                "summary": "获取用户",
-                "parameters": [
-                    {
-                        "type": "integer",
-                        "description": "用户编码",
-                        "name": "userId",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{\"code\": 200, \"data\": [...]}",
-                        "schema": {
-                            "$ref": "#/definitions/response.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/v1/user/avatar": {
-            "post": {
                 "description": "获取JSON",
                 "consumes": [
                     "multipart/form-data"
@@ -2561,8 +2652,44 @@
                 }
             }
         },
-        "/api/v1/user/pwd": {
-            "post": {
+        "/api/v1/user/pwd/reset": {
+            "put": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "description": "获取JSON",
+                "consumes": [
+                    "application/json"
+                ],
+                "tags": [
+                    "用户"
+                ],
+                "summary": "重置用户密码",
+                "parameters": [
+                    {
+                        "description": "body",
+                        "name": "data",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/dto.ResetSysUserPwdReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"code\": 200, \"data\": [...]}",
+                        "schema": {
+                            "$ref": "#/definitions/response.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/v1/user/pwd/set": {
+            "put": {
                 "security": [
                     {
                         "Bearer": []
@@ -2597,39 +2724,13 @@
                 }
             }
         },
-        "/api/v1/user/pwd/reset": {
-            "put": {
-                "description": "获取JSON",
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "用户"
-                ],
-                "summary": "重置用户密码",
-                "parameters": [
-                    {
-                        "description": "body",
-                        "name": "data",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/dto.ResetSysUserPwdReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "{\"code\": 200, \"data\": [...]}",
-                        "schema": {
-                            "$ref": "#/definitions/response.Response"
-                        }
-                    }
-                }
-            }
-        },
         "/api/v1/user/status": {
             "put": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
                 "description": "获取JSON",
                 "consumes": [
                     "application/json"
@@ -3115,7 +3216,53 @@
                 }
             }
         },
-        "dto.SysPostControl": {
+        "dto.SysPostDeleteReq": {
+            "type": "object",
+            "properties": {
+                "createBy": {
+                    "type": "integer"
+                },
+                "ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "updateBy": {
+                    "type": "integer"
+                }
+            }
+        },
+        "dto.SysPostInsertReq": {
+            "type": "object",
+            "properties": {
+                "createBy": {
+                    "type": "integer"
+                },
+                "postCode": {
+                    "type": "string"
+                },
+                "postId": {
+                    "type": "integer"
+                },
+                "postName": {
+                    "type": "string"
+                },
+                "remark": {
+                    "type": "string"
+                },
+                "sort": {
+                    "type": "integer"
+                },
+                "status": {
+                    "type": "integer"
+                },
+                "updateBy": {
+                    "type": "integer"
+                }
+            }
+        },
+        "dto.SysPostUpdateReq": {
             "type": "object",
             "properties": {
                 "createBy": {

docs/swagger.yaml

@@ -292,7 +292,37 @@ definitions:
           type: integer
         type: array
     type: object
-  dto.SysPostControl:
+  dto.SysPostDeleteReq:
+    properties:
+      createBy:
+        type: integer
+      ids:
+        items:
+          type: integer
+        type: array
+      updateBy:
+        type: integer
+    type: object
+  dto.SysPostInsertReq:
+    properties:
+      createBy:
+        type: integer
+      postCode:
+        type: string
+      postId:
+        type: integer
+      postName:
+        type: string
+      remark:
+        type: string
+      sort:
+        type: integer
+      status:
+        type: integer
+      updateBy:
+        type: integer
+    type: object
+  dto.SysPostUpdateReq:
     properties:
       createBy:
         type: integer
@@ -822,7 +852,7 @@ info:
 paths:
   /api/v1/app-config:
     get:
-      description: 获取系统配置信息，主要注意这里不在验证数据权限
+      description: 获取系统配置信息，主要注意这里不在验证权限
       responses:
         "200":
           description: '{"code": 200, "data": [...]}'
@@ -835,11 +865,29 @@ paths:
                     type: string
                   type: object
               type: object
-      security:
-      - Bearer: []
-      summary: 获取系统前台配置信息，主要注意这里不在验证数据权限
+      summary: 获取系统前台配置信息，主要注意这里不在验证权限
       tags:
       - 配置管理
+  /api/v1/captcha:
+    get:
+      description: 获取验证码
+      responses:
+        "200":
+          description: '{"code": 200, "data": [...]}'
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  type: string
+                id:
+                  type: string
+                msg:
+                  type: string
+              type: object
+      summary: 获取验证码
+      tags:
+      - 登陆
   /api/v1/db/columns/page:
     get:
       description: 数据库表列分页列表 / database table column page list
@@ -863,7 +911,7 @@ paths:
             $ref: '#/definitions/response.Response'
       summary: 分页列表数据 / page list data
       tags:
-      - 工具 / Tools
+      - 工具 / 生成工具
   /api/v1/db/tables/page:
     get:
       description: 数据库表分页列表 / database table page list
@@ -887,7 +935,7 @@ paths:
             $ref: '#/definitions/response.Response'
       summary: 分页列表数据 / page list data
       tags:
-      - 工具 / Tools
+      - 工具 / 生成工具
   /api/v1/dept:
     delete:
       description: 删除数据
@@ -903,6 +951,8 @@ paths:
           description: '{"code": -1, "message": "删除失败"}'
           schema:
             type: string
+      security:
+      - Bearer: []
       summary: 删除部门
       tags:
       - 部门
@@ -1147,6 +1197,8 @@ paths:
           description: '{"code": -1, "message": "删除失败"}'
           schema:
             type: string
+      security:
+      - Bearer: []
       summary: 删除字典类型
       tags:
       - 字典类型
@@ -1309,6 +1361,8 @@ paths:
           schema:
             type: string
       summary: 登陆
+      tags:
+      - 登陆
   /api/v1/menu:
     delete:
       description: 删除数据
@@ -1324,6 +1378,8 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 删除菜单
       tags:
       - 菜单
@@ -1451,11 +1507,12 @@ paths:
     delete:
       description: 删除数据
       parameters:
-      - description: id
-        in: path
+      - description: 请求参数
+        in: body
         name: id
         required: true
-        type: integer
+        schema:
+          $ref: '#/definitions/dto.SysPostDeleteReq'
       responses:
         "200":
           description: '{"code": 200, "message": "删除成功"}'
@@ -1465,6 +1522,8 @@ paths:
           description: '{"code": 500, "message": "删除失败"}'
           schema:
             type: string
+      security:
+      - Bearer: []
       summary: 删除岗位
       tags:
       - 岗位
@@ -1507,7 +1566,7 @@ paths:
         name: data
         required: true
         schema:
-          $ref: '#/definitions/dto.SysPostControl'
+          $ref: '#/definitions/dto.SysPostInsertReq'
       responses:
         "200":
           description: '{"code": -1, "message": "添加失败"}'
@@ -1518,7 +1577,7 @@ paths:
       summary: 添加岗位
       tags:
       - 岗位
-  /api/v1/post/:
+  /api/v1/post/{id}:
     put:
       consumes:
       - application/json
@@ -1529,7 +1588,7 @@ paths:
         name: data
         required: true
         schema:
-          $ref: '#/definitions/dto.SysPostControl'
+          $ref: '#/definitions/dto.SysPostUpdateReq'
       responses:
         "200":
           description: '{"code": -1, "message": "添加失败"}'
@@ -1544,9 +1603,9 @@ paths:
     get:
       description: 获取JSON
       parameters:
-      - description: postId
+      - description: 编码
         in: path
-        name: postId
+        name: id
         required: true
         type: integer
       responses:
@@ -1580,6 +1639,8 @@ paths:
           description: '{"code": -1, "message": "添加失败"}'
           schema:
             type: string
+      security:
+      - Bearer: []
       summary: 上传图片
       tags:
       - 公共接口
@@ -1726,6 +1787,8 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 系统信息
       tags:
       - 系统信息
@@ -2037,6 +2100,8 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 登录日志删除
       tags:
       - 登录日志
@@ -2110,6 +2175,8 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 删除操作日志
       tags:
       - 操作日志
@@ -2194,6 +2261,27 @@ paths:
       summary: 列表用户信息数据
       tags:
       - 用户
+    post:
+      consumes:
+      - application/json
+      description: 获取JSON
+      parameters:
+      - description: 用户数据
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/dto.SysUserControl'
+      responses:
+        "200":
+          description: '{"code": 200, "data": [...]}'
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
+      summary: 创建用户
+      tags:
+      - 用户
   /api/v1/sys-user/{userId}:
     delete:
       description: 删除数据
@@ -2208,9 +2296,29 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 删除用户数据
       tags:
       - 用户
+    get:
+      description: 获取JSON
+      parameters:
+      - description: 用户编码
+        in: path
+        name: userId
+        required: true
+        type: integer
+      responses:
+        "200":
+          description: '{"code": 200, "data": [...]}'
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
+      summary: 获取用户
+      tags:
+      - 用户
     put:
       consumes:
       - application/json
@@ -2227,6 +2335,8 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 修改用户数据
       tags:
       - 用户
@@ -2249,7 +2359,7 @@ paths:
       - Bearer: []
       summary: 添加表结构
       tags:
-      - 工具 - 生成表
+      - 工具 / 生成工具
     put:
       consumes:
       - application/json
@@ -2270,7 +2380,7 @@ paths:
       - Bearer: []
       summary: 修改表结构
       tags:
-      - 工具 - 生成表
+      - 工具 / 生成工具
   /api/v1/sys/tables/info/{tableId}:
     delete:
       description: 删除表结构
@@ -2287,7 +2397,7 @@ paths:
             type: string
       summary: 删除表结构
       tags:
-      - 工具 - 生成表
+      - 工具 / 生成工具
     get:
       description: 获取JSON
       parameters:
@@ -2305,7 +2415,7 @@ paths:
       - Bearer: []
       summary: 获取配置
       tags:
-      - 工具 - 生成表
+      - 工具 / 生成工具
   /api/v1/sys/tables/page:
     get:
       description: 生成表分页列表
@@ -2329,46 +2439,7 @@ paths:
             $ref: '#/definitions/response.Response'
       summary: 分页列表数据
       tags:
-      - 工具 - 生成表
-  /api/v1/sysUser:
-    post:
-      consumes:
-      - application/json
-      description: 获取JSON
-      parameters:
-      - description: 用户数据
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/dto.SysUserControl'
-      responses:
-        "200":
-          description: '{"code": 200, "data": [...]}'
-          schema:
-            $ref: '#/definitions/response.Response'
-      summary: 创建用户
-      tags:
-      - 用户
-  /api/v1/sysUser/{userId}:
-    get:
-      description: 获取JSON
-      parameters:
-      - description: 用户编码
-        in: path
-        name: userId
-        required: true
-        type: integer
-      responses:
-        "200":
-          description: '{"code": 200, "data": [...]}'
-          schema:
-            $ref: '#/definitions/response.Response'
-      security:
-      - Bearer: []
-      summary: 获取用户
-      tags:
-      - 用户
+      - 工具 / 生成工具
   /api/v1/user/avatar:
     post:
       consumes:
@@ -2385,6 +2456,8 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 修改头像
       tags:
       - 个人中心
@@ -2401,8 +2474,30 @@ paths:
       summary: 获取个人中心用户
       tags:
       - 个人中心
-  /api/v1/user/pwd:
-    post:
+  /api/v1/user/pwd/reset:
+    put:
+      consumes:
+      - application/json
+      description: 获取JSON
+      parameters:
+      - description: body
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/dto.ResetSysUserPwdReq'
+      responses:
+        "200":
+          description: '{"code": 200, "data": [...]}'
+          schema:
+            $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
+      summary: 重置用户密码
+      tags:
+      - 用户
+  /api/v1/user/pwd/set:
+    put:
       consumes:
       - application/json
       description: 获取JSON
@@ -2423,26 +2518,6 @@ paths:
       summary: 重置密码
       tags:
       - 用户
-  /api/v1/user/pwd/reset:
-    put:
-      consumes:
-      - application/json
-      description: 获取JSON
-      parameters:
-      - description: body
-        in: body
-        name: data
-        required: true
-        schema:
-          $ref: '#/definitions/dto.ResetSysUserPwdReq'
-      responses:
-        "200":
-          description: '{"code": 200, "data": [...]}'
-          schema:
-            $ref: '#/definitions/response.Response'
-      summary: 重置用户密码
-      tags:
-      - 用户
   /api/v1/user/status:
     put:
       consumes:
@@ -2460,6 +2535,8 @@ paths:
           description: '{"code": 200, "data": [...]}'
           schema:
             $ref: '#/definitions/response.Response'
+      security:
+      - Bearer: []
       summary: 修改用户状态
       tags:
       - 用户

go.mod

@@ -9,8 +9,8 @@ require (
 	github.com/bytedance/go-tagexpr/v2 v2.7.10
 	github.com/casbin/casbin/v2 v2.25.1
 	github.com/gin-gonic/gin v1.7.1
-	github.com/go-admin-team/go-admin-core v1.3.5-rc.6.0.20210619151458-e7f05c83652b
-	github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.6.0.20210619151458-e7f05c83652b
+	github.com/go-admin-team/go-admin-core v1.3.5-rc.6.0.20210629084023-dc3d0627688c
+	github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.6.0.20210629084023-dc3d0627688c
 	github.com/google/uuid v1.2.0
 	github.com/mssola/user_agent v0.5.2
 	github.com/opentracing/opentracing-go v1.1.0

template/v4/dto.go.template

@@ -1,13 +1,23 @@
 package dto
 
 import (
-    "errors"
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
 	"go-admin/app/{{.PackageName}}/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
+
+	 {{- $bb := false -}}
+	  {{- range .Columns -}}
+     {{$z := .IsQuery}}
+     {{- if ($z) }}
+     {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}}
+     {{- end -}}
+     {{- end -}}
+     {{- range .Columns -}}
+     {{if eq .GoType "time.Time"}}{{- $bb = true -}}{{- end -}}
+     {{- end -}}
+     {{- if eq $bb true -}}
+     "time"
+     {{- end }}
 )
 
 type {{.ClassName}}Search struct {
@@ -19,26 +29,20 @@ type {{.ClassName}}Search struct {
     {{.GoField}} {{.GoType}} `form:"{{.JsonField}}"  search:"type:{{if eq .QueryType "EQ"}}exact{{ else if eq .QueryType "NE"}}iexact{{ else if eq .QueryType "LIKE"}}contains{{ else if eq .QueryType "GT"}}gt{{ else if eq .QueryType "GTE"}}gte{{ else if eq .QueryType "LT"}}lt{{ else if eq .QueryType "LTE"}}lte{{- end }};column:{{.ColumnName}};table:{{$tablename}}" comment:"{{.ColumnComment}}"`
     {{- end }}
     {{- end }}
+    {{.ClassName}}Order
+}
+
+type {{.ClassName}}Order struct {
+    {{- $tablename := .TBName -}}
+    {{- range .Columns -}}
+    {{.GoField}} {{.GoType}} `form:"{{.JsonField}}Order"  search:"type:order;column:{{.ColumnName}};table:{{$tablename}}"`
+    {{ end }}
 }
 
 func (m *{{.ClassName}}Search) GetNeedSearch() interface{} {
 	return *m
 }
 
-func (m *{{.ClassName}}Search) Generate() dto.Index {
-	o := *m
-	return &o
-}
-
-func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-    err := ctx.ShouldBind(m)
-    if err != nil {
-    	log.Errorf("ShouldBind error: %s", err.Error())
-    }
-    return err
-}
-
 type {{.ClassName}}Control struct {
     {{- range .Columns -}}
     {{$x := .Pk}}
@@ -53,44 +57,25 @@ type {{.ClassName}}Control struct {
     {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"`
     {{- end -}}
     {{- end }}
+    common.ControlBy
 }
 
-func (s *{{.ClassName}}Control) Generate() dto.Control {
-	o := *s
-	return &o
-}
-
-func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-    err := ctx.ShouldBindUri(s)
-    if err != nil {
-        log.Errorf("ShouldBindUri error: %s", err.Error())
-        return errors.New("数据绑定出错")
+func (s *{{.ClassName}}Control) Generate(model *models.{{.ClassName}})  {
+	 {{- range .Columns -}}
+    {{$x := .Pk}}
+    {{- if ($x) }}
+    if s.{{.GoField}} == 0 {
+        model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} }
     }
-    err = ctx.ShouldBind(s)
-    if err != nil {
-        log.Errorf("ShouldBind error: %s", err.Error())
-        err = errors.New("数据绑定出错")
-    }
-    return err
-}
-
-func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) {
-	return &models.{{.ClassName}}{
-	{{- range .Columns -}}
-        {{$x := .Pk}}
-        {{- if ($x) }}
-        Model:     common.Model{ {{.GoField}}: s.{{.GoField}} },
-        {{- else if eq .GoField "CreatedAt" -}}
-        {{- else if eq .GoField "UpdatedAt" -}}
-        {{- else if eq .GoField "DeletedAt" -}}
-        {{- else if eq .GoField "CreateBy" -}}
-        {{- else if eq .GoField "UpdateBy" -}}
-        {{- else }}
-        {{.GoField}}:  s.{{.GoField}},
-        {{- end -}}
-        {{- end }}
-	}, nil
+    {{- else if eq .GoField "CreatedAt" -}}
+    {{- else if eq .GoField "UpdatedAt" -}}
+    {{- else if eq .GoField "DeletedAt" -}}
+    {{- else if eq .GoField "CreateBy" -}}
+    {{- else if eq .GoField "UpdateBy" -}}
+    {{- else }}
+    model.{{.GoField}} = s.{{.GoField}}
+    {{- end -}}
+    {{- end }}
 }
 
 func (s *{{.ClassName}}Control) GetId() interface{} {
@@ -98,7 +83,9 @@ func (s *{{.ClassName}}Control) GetId() interface{} {
 }
 
 type {{.ClassName}}ById struct {
-	dto.ObjectById
+	Id  int   `uri:"id"`
+    Ids []int `json:"ids"`
+    common.ControlBy
 }
 
 func (s *{{.ClassName}}ById) GetId() interface{} {
@@ -109,30 +96,7 @@ func (s *{{.ClassName}}ById) GetId() interface{} {
 	return s.Id
 }
 
-func (s *{{.ClassName}}ById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Errorf("ShouldBindUri error: %s", err.Error())
-		return errors.New("数据绑定出错")
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Errorf("ShouldBind error: %s", err.Error())
-		err = errors.New("数据绑定出错")
-	}
-	return err
-}
-
-func (s *{{.ClassName}}ById) SetUpdateBy(id int) {
-
-}
-
-func (s *{{.ClassName}}ById) Generate() dto.Control {
+func (s *{{.ClassName}}ById) Generate() *{{.ClassName}}ById {
 	o := *s
 	return &o
-}
-
-func (s *{{.ClassName}}ById) GenerateM() (common.ActiveRecord, error) {
-	return &models.{{.ClassName}}{}, nil
 }

template/v4/js.go.template

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询{{.ClassName}}列表
 export function list{{.ClassName}}(query) {
     return request({
-        url: '/api/v1/{{.ModuleName}}',
+        url: '/api/v1/{{.MLTBName}}',
         method: 'get',
         params: query
     })
@@ -12,7 +12,7 @@ export function list{{.ClassName}}(query) {
 // 查询{{.ClassName}}详细
 export function get{{.ClassName}} ({{.PkJsonField}}) {
     return request({
-        url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}},
+        url: '/api/v1/{{.MLTBName}}/' + {{.PkJsonField}},
         method: 'get'
     })
 }
@@ -21,7 +21,7 @@ export function get{{.ClassName}} ({{.PkJsonField}}) {
 // 新增{{.ClassName}}
 export function add{{.ClassName}}(data) {
     return request({
-        url: '/api/v1/{{.ModuleName}}',
+        url: '/api/v1/{{.MLTBName}}',
         method: 'post',
         data: data
     })
@@ -30,7 +30,7 @@ export function add{{.ClassName}}(data) {
 // 修改{{.ClassName}}
 export function update{{.ClassName}}(data) {
     return request({
-        url: '/api/v1/{{.ModuleName}}/'+data.{{.PkJsonField}},
+        url: '/api/v1/{{.MLTBName}}/'+data.{{.PkJsonField}},
         method: 'put',
         data: data
     })
@@ -39,7 +39,7 @@ export function update{{.ClassName}}(data) {
 // 删除{{.ClassName}}
 export function del{{.ClassName}}(data) {
     return request({
-        url: '/api/v1/{{.ModuleName}}',
+        url: '/api/v1/{{.MLTBName}}',
         method: 'delete',
         data: data
     })

template/v4/no_actions/apis.go.template

@@ -1,8 +1,9 @@
 package apis
 
 import (
-	"net/http"
+    "fmt"
 
+	"github.com/gin-gonic/gin/binding"
 	"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"
@@ -18,7 +19,7 @@ type {{.ClassName}} struct {
 	api.Api
 }
 
-// Get{{.ClassName}}List 获取{{.TableComment}}列表
+// GetPage 获取{{.TableComment}}列表
 // @Summary 获取{{.TableComment}}列表
 // @Description 获取{{.TableComment}}列表
 // @Tags {{.TableComment}}
@@ -34,43 +35,34 @@ type {{.ClassName}} struct {
 // @Success 200 {object} response.Response{data=response.Page{list=[]models.{{.ClassName}}}} "{"code": 200, "data": [...]}"
 // @Router /api/v1/{{.ModuleName}} [get]
 // @Security Bearer
-func (e {{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
-    e.SetContext(c)
-    log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
+func (e {{.ClassName}}) GetPage(c *gin.Context) {
+    req := dto.{{.ClassName}}Search{}
+    s := service.{{.ClassName}}{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req, binding.Form).
+        MakeService(&s.Service).
+        Errors
+   	if err != nil {
+   		e.Logger.Error(err)
+   		e.Error(500, err, err.Error())
+   		return
+   	}
 
-	d := new(dto.{{.ClassName}}Search)
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-	    log.Warnf("request body bind error, %s", err.Error())
-		e.Error( http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-
-	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
-
 	list := make([]models.{{.ClassName}}, 0)
 	var count int64
-	service{{.ClassName}} := service.{{.ClassName}}{}
-	service{{.ClassName}}.Log = log
-	service{{.ClassName}}.Orm = db
-	err = service{{.ClassName}}.Get{{.ClassName}}Page(d, p, &list, &count)
+
+	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
-		log.Errorf("Get {{.ClassName}} Page error, %s", err.Error())
-		e.Error( http.StatusInternalServerError, err, "查询失败")
-		return
+		e.Error(500, err, fmt.Sprintf("获取{{.TableComment}} 失败，\r\n失败信息 %s", err.Error()))
+        return
 	}
 
-	e.PageOK( list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 }
 
-// Get{{.ClassName}} 获取{{.TableComment}}
+// Get 获取{{.TableComment}}
 // @Summary 获取{{.TableComment}}
 // @Description 获取{{.TableComment}}
 // @Tags {{.TableComment}}
@@ -78,43 +70,32 @@ func (e {{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) {
 // @Success 200 {object} response.Response{data=models.{{.ClassName}}} "{"code": 200, "data": [...]}"
 // @Router /api/v1/{{.ModuleName}}/{id} [get]
 // @Security Bearer
-func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
-    e.SetContext(c)
-    log := e.GetLogger()
-    db, err := e.GetOrm()
+func (e {{.ClassName}}) Get(c *gin.Context) {
+	req := dto.{{.ClassName}}ById{}
+	s := service.{{.ClassName}}{}
+    err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	control := new(dto.{{.ClassName}}ById)
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-	    log.Warnf("request body bind error, %s", err.Error())
-		e.Error( http.StatusUnprocessableEntity, err, "参数验证失败")
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
 		return
 	}
 	var object models.{{.ClassName}}
 
-	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
-
-	service{{.ClassName}} := service.{{.ClassName}}{}
-	service{{.ClassName}}.Log = log
-	service{{.ClassName}}.Orm = db
-	err = service{{.ClassName}}.Get{{.ClassName}}(control, p, &object)
+	err = s.Get(&req, p, &object)
 	if err != nil {
-		log.Errorf("Get {{.ClassName}} error, %s", err.Error())
-		e.Error( http.StatusInternalServerError, err, "查询失败")
-		return
+		e.Error(500, err, fmt.Sprintf("获取{{.TableComment}}失败，\r\n失败信息 %s", err.Error()))
+        return
 	}
 
 	e.OK( object, "查询成功")
 }
 
-// Insert{{.ClassName}} 创建{{.TableComment}}
+// Insert 创建{{.TableComment}}
 // @Summary 创建{{.TableComment}}
 // @Description 创建{{.TableComment}}
 // @Tags {{.TableComment}}
@@ -124,47 +105,32 @@ func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
 // @Success 200 {object} response.Response	"{"code": 200, "message": "添加成功"}"
 // @Router /api/v1/{{.ModuleName}} [post]
 // @Security Bearer
-func (e {{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
-    e.SetContext(c)
-    log := e.GetLogger()
-    db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	control := new(dto.{{.ClassName}}Control)
-
-	//新增操作
-	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 {{.ClassName}} model error, %s", err.Error())
-		e.Error( http.StatusInternalServerError, err, "模型生成失败")
-		return
-	}
+func (e {{.ClassName}}) Insert(c *gin.Context) {
+    req := dto.{{.ClassName}}Control{}
+    s := service.{{.ClassName}}{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req, binding.JSON).
+        MakeService(&s.Service).
+        Errors
+    if err != nil {
+        e.Logger.Error(err)
+        e.Error(500, err, err.Error())
+        return
+    }
 	// 设置创建人
-	object.SetCreateBy(user.GetUserId(c))
+	req.SetCreateBy(user.GetUserId(c))
 
-	service{{.ClassName}} := service.{{.ClassName}}{}
-	service{{.ClassName}}.Orm = db
-	service{{.ClassName}}.Log = log
-	err = service{{.ClassName}}.Insert{{.ClassName}}(object.(*models.{{.ClassName}}))
+	err = s.Insert(&req)
 	if err != nil {
-		log.Errorf("Insert {{.ClassName}} error, %s", err.Error())
-		e.Error( http.StatusInternalServerError, err, "创建失败")
-		return
+		e.Error(500, err, fmt.Sprintf("创建{{.TableComment}}  失败，\r\n失败信息 %s", err.Error()))
+        return
 	}
 
-	e.OK( object.GetId(), "创建成功")
+	e.OK(req.GetId(), "创建成功")
 }
 
-// Update{{.ClassName}} 修改{{.TableComment}}
+// Update 修改{{.TableComment}}
 // @Summary 修改{{.TableComment}}
 // @Description 修改{{.TableComment}}
 // @Tags {{.TableComment}}
@@ -174,48 +140,31 @@ func (e {{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
 // @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
 // @Router /api/v1/{{.ModuleName}}/{id} [put]
 // @Security Bearer
-func (e {{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
-    e.SetContext(c)
-    log := e.GetLogger()
-    db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	control := new(dto.{{.ClassName}}Control)
-
-	//更新操作
-	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 {{.ClassName}} model error, %s", err.Error())
-		e.Error( http.StatusInternalServerError, err, "模型生成失败")
-		return
-	}
-	object.SetUpdateBy(user.GetUserId(c))
-
-	//数据权限检查
+func (e {{.ClassName}}) Update(c *gin.Context) {
+    req := dto.{{.ClassName}}Control{}
+    s := service.{{.ClassName}}{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req, binding.JSON, nil).
+        MakeService(&s.Service).
+        Errors
+    if err != nil {
+        e.Logger.Error(err)
+        e.Error(500, err, err.Error())
+        return
+    }
+	req.SetUpdateBy(user.GetUserId(c))
 	p := actions.GetPermissionFromContext(c)
 
-	service{{.ClassName}} := service.{{.ClassName}}{}
-	service{{.ClassName}}.Orm = db
-	service{{.ClassName}}.Log = log
-	err = service{{.ClassName}}.Update{{.ClassName}}(object.(*models.{{.ClassName}}), p)
+	err = s.Update(&req, p)
 	if err != nil {
-		log.Errorf("Update {{.ClassName}} error, %s", err.Error())
-		e.Error( http.StatusInternalServerError, err, "更新失败")
-		return
+		e.Error(500, err, fmt.Sprintf("修改{{.TableComment}} 失败，\r\n失败信息 %s", err.Error()))
+        return
 	}
-	e.OK( object.GetId(), "更新成功")
+	e.OK( req.GetId(), "修改成功")
 }
 
-// Delete{{.ClassName}} 删除{{.TableComment}}
+// Delete 删除{{.TableComment}}
 // @Summary 删除{{.TableComment}}
 // @Description 删除{{.TableComment}}
 // @Tags {{.TableComment}}
@@ -223,39 +172,27 @@ func (e {{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
 // @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
 // @Router /api/v1/{{.ModuleName}} [delete]
 // @Security Bearer
-func (e {{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) {
-    e.SetContext(c)
-    log := e.GetLogger()
-    db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
+func (e {{.ClassName}}) Delete(c *gin.Context) {
+    s := service.{{.ClassName}}{}
+    req := dto.{{.ClassName}}ById{}
+    err := e.MakeContext(c).
+        MakeOrm().
+        Bind(&req, binding.JSON).
+        MakeService(&s.Service).
+        Errors
+    if err != nil {
+        e.Logger.Error(err)
+        e.Error(500, err, err.Error())
+        return
+    }
 
-	control := new(dto.{{.ClassName}}ById)
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-	    log.Warnf("request body bind error, %s", err.Error())
-		e.Error( http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-
-	// 设置编辑人
-	control.SetUpdateBy(user.GetUserId(c))
-
-	// 数据权限检查
+	req.SetUpdateBy(user.GetUserId(c))
 	p := actions.GetPermissionFromContext(c)
 
-	service{{.ClassName}} := service.{{.ClassName}}{}
-	service{{.ClassName}}.Orm = db
-	service{{.ClassName}}.Log = log
-	err = service{{.ClassName}}.Remove{{.ClassName}}(control, p)
+	err = s.Remove(&req, p)
 	if err != nil {
-		log.Errorf("Remove {{.ClassName}} error, %s", err.Error())
-		e.Error( http.StatusInternalServerError, err, "删除失败")
-		return
+		e.Error(500, err, fmt.Sprintf("删除{{.TableComment}}失败，\r\n失败信息 %s", err.Error()))
+        return
 	}
-	e.OK( control.GetId(), "删除成功")
+	e.OK( req.GetId(), "删除成功")
 }

template/v4/no_actions/router_check_role.go.template

@@ -15,12 +15,12 @@ func init() {
 // register{{.ClassName}}Router
 func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := apis.{{.ClassName}}{}
-	r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/{{.MLTBName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.Get{{.ClassName}}List)
-		r.GET("/:id", api.Get{{.ClassName}})
-		r.POST("", api.Insert{{.ClassName}})
-		r.PUT("/:id", api.Update{{.ClassName}})
-		r.DELETE("", api.Delete{{.ClassName}})
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", api.Update)
+		r.DELETE("", api.Delete)
 	}
 }

template/v4/no_actions/router_no_check_role.go.template

@@ -14,12 +14,12 @@ func init() {
 // register{{.ClassName}}Router
 func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := apis.{{.ClassName}}{}
-	r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc())
+	r := v1.Group("/{{.MLTBName}}").Use(authMiddleware.MiddlewareFunc())
 	{
-		r.GET("", api.Get{{.ClassName}})
-		r.GET("/:id", api.Get{{.ClassName}})
-		r.POST("", api.Insert{{.ClassName}})
-		r.PUT("/:id", api.Update{{.ClassName}})
-		r.DELETE("", api.Delete{{.ClassName}})
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", api.Update)
+		r.DELETE("", api.Delete)
 	}
 }

template/v4/no_actions/service.go.template

@@ -7,17 +7,17 @@ import (
 	"gorm.io/gorm"
 
 	"go-admin/app/{{.PackageName}}/models"
+	"go-admin/app/{{.PackageName}}/service/dto"
 	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
-	"go-admin/app/{{.PackageName}}/service/dto"
 )
 
 type {{.ClassName}} struct {
 	service.Service
 }
 
-// Get{{.ClassName}}Page 获取{{.ClassName}}列表
-func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *actions.DataPermission, list *[]models.{{.ClassName}}, count *int64) error {
+// GetPage 获取{{.ClassName}}列表
+func (e *{{.ClassName}}) GetPage(c *dto.{{.ClassName}}Search, p *actions.DataPermission, list *[]models.{{.ClassName}}, count *int64) error {
 	var err error
 	var data models.{{.ClassName}}
 
@@ -30,14 +30,14 @@ func (e *{{.ClassName}}) Get{{.ClassName}}Page(c *dto.{{.ClassName}}Search, p *a
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {
-		e.Log.Errorf("Service Get{{.ClassName}}Page error:%s", err)
+		e.Log.Errorf("{{.ClassName}}Service GetPage error:%s \r\n", err)
 		return err
 	}
 	return nil
 }
 
-// Get{{.ClassName}} 获取{{.ClassName}}对象
-func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission, model *models.{{.ClassName}}) error {
+// Get 获取{{.ClassName}}对象
+func (e *{{.ClassName}}) Get(d *dto.{{.ClassName}}ById, p *actions.DataPermission, model *models.{{.ClassName}}) error {
 	var data models.{{.ClassName}}
 
 	err := e.Orm.Model(&data).
@@ -47,7 +47,7 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions
 		First(model, d.GetId()).Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		err = errors.New("查看对象不存在或无权查看")
-		e.Log.Errorf("Service Get{{.ClassName}} error:%s", err)
+		e.Log.Errorf("Service Get{{.ClassName}} error:%s \r\n", err)
 		return err
 	}
 	if err != nil {
@@ -57,34 +57,42 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions
 	return nil
 }
 
-// Insert{{.ClassName}} 创建{{.ClassName}}对象
-func (e *{{.ClassName}}) Insert{{.ClassName}}(c *models.{{.ClassName}}) error {
-	err := e.Orm.Create(c).Error
+// Insert 创建{{.ClassName}}对象
+func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}Control) error {
+    var err error
+    var data models.{{.ClassName}}
+    c.Generate(&data)
+	err = e.Orm.Create(&data).Error
 	if err != nil {
-		e.Log.Errorf("Service Insert{{.ClassName}} error:%s", err)
+		e.Log.Errorf("{{.ClassName}}Service Insert error:%s \r\n", err)
 		return err
 	}
 	return nil
 }
 
-// Update{{.ClassName}} 修改{{.ClassName}}对象
-func (e *{{.ClassName}}) Update{{.ClassName}}(c *models.{{.ClassName}}, p *actions.DataPermission) error {
-	db := e.Orm.Model(c).
-		Scopes(
-			actions.Permission(c.TableName(), p),
-		).Where(c.GetId()).Updates(c)
-	if err := db.Error; err != nil {
-        e.Log.Errorf("Service Update{{.ClassName}} error:%s", err)
+// Update 修改{{.ClassName}}对象
+func (e *{{.ClassName}}) Update(c *dto.{{.ClassName}}Control, p *actions.DataPermission) error {
+    var err error
+    var data = models.{{.ClassName}}{}
+    e.Orm.Scopes(
+            actions.Permission(data.TableName(), p),
+        ).First(&data, c.GetId())
+    c.Generate(&data)
+
+    db := e.Orm.Save(&data)
+    if db.Error != nil {
+        e.Log.Errorf("{{.ClassName}}Service Save error:%s \r\n", err)
         return err
     }
-	if db.RowsAffected == 0 {
-		return errors.New("无权更新该数据")
-	}
-	return nil
+    if db.RowsAffected == 0 {
+        return errors.New("无权更新该数据")
+
+    }
+    return nil
 }
 
-// Remove{{.ClassName}} 删除{{.ClassName}}
-func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error {
+// Remove 删除{{.ClassName}}
+func (e *{{.ClassName}}) Remove(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error {
 	var data models.{{.ClassName}}
 
 	db := e.Orm.Model(&data).
@@ -92,7 +100,7 @@ func (e *{{.ClassName}}) Remove{{.ClassName}}(d *dto.{{.ClassName}}ById, p *acti
 			actions.Permission(data.TableName(), p),
 		).Delete(&data, d.GetId())
 	if err := db.Error; err != nil {
-        e.Log.Errorf("Service Remove{{.ClassName}} error:%s", err)
+        e.Log.Errorf("Service Remove{{.ClassName}} error:%s \r\n", err)
         return err
     }
     if db.RowsAffected == 0 {

template/v4/vue.go.template

@@ -153,11 +153,11 @@
                             {{- $x := .IsInsert -}}
                             {{- if (eq $x "1") -}}
                                 {{- if (.Pk) }}
-                                {{- else if eq .GoField "createdAt" -}}
-                                {{- else if eq .GoField "updatedAt" -}}
-                                {{- else if eq .GoField "deletedAt" -}}
-                                {{- else if eq .GoField "updateBy" -}}
-                                {{- else if eq .GoField "createBy" -}}
+                                {{- else if eq .GoField "CreatedAt" -}}
+                                {{- else if eq .GoField "UpdatedAt" -}}
+                                {{- else if eq .GoField "DeletedAt" -}}
+                                {{- else if eq .GoField "UpdateBy" -}}
+                                {{- else if eq .GoField "CreateBy" -}}
                                 {{- else }}
                                     <el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
                                         {{ if eq "input" .HtmlType -}}
@@ -223,27 +223,23 @@
                         <el-button @click="cancel">取 消</el-button>
                     </div>
                 </el-dialog>
-                <FileChoose ref="fileChoose" :dialog-form-visible="fileOpen" @confirm="getImgList" @close="fileClose" />
             </el-card>
         </template>
     </BasicLayout>
 </template>
 
 <script>
-    import {add{{.ClassName}}, del{{.ClassName}}, get{{.ClassName}}, list{{.ClassName}}, update{{.ClassName}}} from '@/api/{{ .BusinessName}}'
+    import {add{{.ClassName}}, del{{.ClassName}}, get{{.ClassName}}, list{{.ClassName}}, update{{.ClassName}}} from '@/api/{{ .PackageName}}/{{ .MLTBName}}'
+    {{ $package:=.PackageName }}
     {{range .Columns}}
     {{- if ne .FkTableName "" -}}
-     import {list{{.FkTableNameClass}} } from '@/api/{{ .FkTableNamePackage}}'
-
+    import {list{{.FkTableNameClass}} } from '@/api/{{ $package }}/{{ .FkTableNamePackage}}'
     {{ end -}}
     {{- end -}}
 
-    import FileChoose from '@/components/FileChoose'
-
     export default {
         name: '{{.ClassName}}',
         components: {
-            FileChoose
         },
         data() {
             return {
@@ -262,8 +258,6 @@
                 // 是否显示弹出层
                 open: false,
                 isEdit: false,
-                fileOpen: false,
-                fileIndex: undefined,
                 // 类型数据字典
                 typeOptions: [],
                 {{.ModuleName}}List: [],
@@ -296,10 +290,7 @@
                 {{- range .Columns -}}
                 {{- $x := .IsQuery -}}
                 {{- if (eq $x "1") -}}
-                {{.JsonField}}:
-                [
-                    {required: true, message: '{{.ColumnComment}}不能为空', trigger: 'blur'}
-                ],
+                {{.JsonField}}:  [ {required: true, message: '{{.ColumnComment}}不能为空', trigger: 'blur'} ],
                 {{ end }}
                 {{- end -}}
             }
@@ -309,15 +300,12 @@
             this.getList()
             {{range .Columns}}
             {{- if ne .DictType "" -}}
-
             this.getDicts('{{.DictType}}').then(response => {
                 this.{{.JsonField}}Options = response.data
             })
-
             {{ end -}}
             {{- if ne .FkTableName "" -}}
             this.get{{.FkTableNameClass}}Items()
-
             {{ end -}}
             {{- end -}}
         },
@@ -436,7 +424,7 @@
                         if (this.form.{{.PkJsonField}} !== undefined) {
                             update{{.ClassName}}(this.form).then(response => {
                                 if (response.code === 200) {
-                                    this.msgSuccess('修改成功')
+                                    this.msgSuccess(response.msg)
                                     this.open = false
                                     this.getList()
                                 } else {
@@ -446,7 +434,7 @@
                         } else {
                             add{{.ClassName}}(this.form).then(response => {
                                 if (response.code === 200) {
-                                    this.msgSuccess('新增成功')
+                                    this.msgSuccess(response.msg)
                                     this.open = false
                                     this.getList()
                                 } else {
@@ -467,9 +455,14 @@
                     type: 'warning'
                 }).then(function () {
                       return del{{.ClassName}}( { 'ids': Ids })
-                }).then(() => {
-                    this.getList()
-                    this.msgSuccess('删除成功')
+                }).then((response) => {
+                   if (response.code === 200) {
+                     this.msgSuccess(response.msg)
+                     this.open = false
+                     this.getList()
+                   } else {
+                     this.msgError(response.msg)
+                   }
                 }).catch(function () {
                 })
             }