diff --git a/app/admin/apis/sys_dict_type.go b/app/admin/apis/sys_dict_type.go index b611a779..4dedc9de 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -31,7 +31,7 @@ type SysDictType struct { // @Security Bearer func (e SysDictType) GetPage(c *gin.Context) { s := service.SysDictType{} - req := dto.SysDictTypeSearch{} + req :=dto.SysDictTypeSearch{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.Form). @@ -62,7 +62,7 @@ func (e SysDictType) GetPage(c *gin.Context) { // @Security Bearer func (e SysDictType) Get(c *gin.Context) { s := service.SysDictType{} - req := dto.SysDictTypeById{} + req :=dto.SysDictTypeById{} err := e.MakeContext(c). MakeOrm(). Bind(&req, nil). @@ -95,7 +95,7 @@ func (e SysDictType) Get(c *gin.Context) { // @Security Bearer func (e SysDictType) Insert(c *gin.Context) { s := service.SysDictType{} - req := dto.SysDictTypeControl{} + req :=dto.SysDictTypeControl{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON). @@ -129,7 +129,7 @@ func (e SysDictType) Insert(c *gin.Context) { // @Security Bearer func (e SysDictType) Update(c *gin.Context) { s := service.SysDictType{} - req := dto.SysDictTypeControl{} + req :=dto.SysDictTypeControl{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON, nil). @@ -160,7 +160,7 @@ func (e SysDictType) Update(c *gin.Context) { // @Security Bearer func (e SysDictType) Delete(c *gin.Context) { s := service.SysDictType{} - req := dto.SysDictTypeById{} + req :=dto.SysDictTypeById{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON, nil). @@ -192,7 +192,7 @@ func (e SysDictType) Delete(c *gin.Context) { // @Security Bearer func (e SysDictType) GetAll(c *gin.Context) { s := service.SysDictType{} - req := dto.SysDictTypeSearch{} + req :=dto.SysDictTypeSearch{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.Form). diff --git a/app/admin/apis/sys_login_log.go b/app/admin/apis/sys_login_log.go index 7477e2f6..15508220 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -29,7 +29,7 @@ type SysLoginLog struct { // @Security Bearer func (e SysLoginLog) GetPage(c *gin.Context) { s := service.SysLoginLog{} - req := dto.SysLoginLogSearch {} + req :=dto.SysLoginLogSearch {} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.Form). @@ -60,7 +60,7 @@ func (e SysLoginLog) GetPage(c *gin.Context) { // @Security Bearer func (e SysLoginLog) Get(c *gin.Context) { s := service.SysLoginLog{} - req := dto.SysLoginLogGetReq{} + req :=dto.SysLoginLogGetReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req). @@ -90,7 +90,7 @@ func (e SysLoginLog) Get(c *gin.Context) { // @Security Bearer func (e SysLoginLog) Delete(c *gin.Context) { s := service.SysLoginLog{} - req := dto.SysLoginLogDeleteReq{} + req :=dto.SysLoginLogDeleteReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON, nil). diff --git a/app/admin/apis/sys_menu.go b/app/admin/apis/sys_menu.go index 5e744894..1ff50b42 100644 --- a/app/admin/apis/sys_menu.go +++ b/app/admin/apis/sys_menu.go @@ -254,7 +254,7 @@ func (e SysMenu) GetMenuRole(c *gin.Context) { func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { m := service.SysMenu{} r := service.SysRole{} - req := dto.SelectRole{} + req :=dto.SelectRole{} err := e.MakeContext(c). MakeOrm(). MakeService(&m.Service). diff --git a/app/admin/apis/sys_opera_log.go b/app/admin/apis/sys_opera_log.go index 44c60f89..4d8285b6 100644 --- a/app/admin/apis/sys_opera_log.go +++ b/app/admin/apis/sys_opera_log.go @@ -65,7 +65,7 @@ func (e SysOperaLog) GetPage(c *gin.Context) { // @Security Bearer func (e SysOperaLog) Get(c *gin.Context) { s := new(service.SysOperaLog) - req := dto.SysOperaLogGetReq{} + req :=dto.SysOperaLogGetReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, nil). @@ -96,7 +96,7 @@ func (e SysOperaLog) Get(c *gin.Context) { // @Security Bearer func (e SysOperaLog) Delete(c *gin.Context) { s := new(service.SysOperaLog) - req := dto.SysOperaLogDeleteReq{} + req :=dto.SysOperaLogDeleteReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON). diff --git a/app/admin/apis/sys_post.go b/app/admin/apis/sys_post.go index e6c5492a..33911fb8 100644 --- a/app/admin/apis/sys_post.go +++ b/app/admin/apis/sys_post.go @@ -30,7 +30,7 @@ type SysPost struct { // @Security Bearer func (e SysPost) GetPage(c *gin.Context) { s := service.SysPost{} - req := dto.SysPostPageReq{} + req :=dto.SysPostPageReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.Form). @@ -64,7 +64,7 @@ func (e SysPost) GetPage(c *gin.Context) { // @Security Bearer func (e SysPost) Get(c *gin.Context) { s := service.SysPost{} - req := dto.SysPostGetReq{} + req :=dto.SysPostGetReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, nil). @@ -99,7 +99,7 @@ func (e SysPost) Get(c *gin.Context) { // @Security Bearer func (e SysPost) Insert(c *gin.Context) { s := service.SysPost{} - req := dto.SysPostInsertReq{} + req :=dto.SysPostInsertReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON). @@ -132,7 +132,7 @@ func (e SysPost) Insert(c *gin.Context) { // @Security Bearer func (e SysPost) Update(c *gin.Context) { s := service.SysPost{} - req := dto.SysPostUpdateReq{} + req :=dto.SysPostUpdateReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON, nil). @@ -165,7 +165,7 @@ func (e SysPost) Update(c *gin.Context) { // @Security Bearer func (e SysPost) Delete(c *gin.Context) { s := service.SysPost{} - req := dto.SysPostDeleteReq{} + req :=dto.SysPostDeleteReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON). diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go index 4bd6fb14..9c45271b 100644 --- a/app/admin/apis/sys_user.go +++ b/app/admin/apis/sys_user.go @@ -30,7 +30,7 @@ type SysUser struct { // @Security Bearer func (e SysUser) GetPage(c *gin.Context) { s := service.SysUser{} - req := dto.SysUserGetPageReq{} + req :=dto.SysUserGetPageReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req). @@ -67,7 +67,7 @@ func (e SysUser) GetPage(c *gin.Context) { // @Security Bearer func (e SysUser) Get(c *gin.Context) { s := service.SysUser{} - req := dto.SysUserById{} + req :=dto.SysUserById{} err := e.MakeContext(c). MakeOrm(). Bind(&req, nil). @@ -101,7 +101,7 @@ func (e SysUser) Get(c *gin.Context) { // @Security Bearer func (e SysUser) Insert(c *gin.Context) { s := service.SysUser{} - req := dto.SysUserControl{} + req :=dto.SysUserInsertReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON). @@ -136,7 +136,7 @@ func (e SysUser) Insert(c *gin.Context) { // @Security Bearer func (e SysUser) Update(c *gin.Context) { s := service.SysUser{} - req := dto.SysUserControl{} + req :=dto.SysUserUpdateReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req). @@ -171,7 +171,7 @@ func (e SysUser) Update(c *gin.Context) { // @Security Bearer func (e SysUser) Delete(c *gin.Context) { s := service.SysUser{} - req := dto.SysUserById{} + req :=dto.SysUserById{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON). @@ -208,7 +208,7 @@ func (e SysUser) Delete(c *gin.Context) { // @Security Bearer func (e SysUser) InsetAvatar(c *gin.Context) { s := service.SysUser{} - req := dto.UpdateSysUserAvatarReq{} + req :=dto.UpdateSysUserAvatarReq{} err := e.MakeContext(c). MakeOrm(). MakeService(&s.Service). @@ -257,7 +257,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) { // @Security Bearer func (e SysUser) UpdateStatus(c *gin.Context) { s := service.SysUser{} - req := dto.UpdateSysUserStatusReq{} + req :=dto.UpdateSysUserStatusReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON, nil). @@ -294,7 +294,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) { // @Security Bearer func (e SysUser) ResetPwd(c *gin.Context) { s := service.SysUser{} - req := dto.ResetSysUserPwdReq{} + req :=dto.ResetSysUserPwdReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON). @@ -331,7 +331,7 @@ func (e SysUser) ResetPwd(c *gin.Context) { // @Security Bearer func (e SysUser) UpdatePwd(c *gin.Context) { s := service.SysUser{} - req := dto.PassWord{} + req :=dto.PassWord{} err := e.MakeContext(c). MakeOrm(). Bind(&req). @@ -364,7 +364,7 @@ func (e SysUser) UpdatePwd(c *gin.Context) { // @Security Bearer func (e SysUser) GetProfile(c *gin.Context) { s := service.SysUser{} - req := dto.SysUserById{} + req :=dto.SysUserById{} err := e.MakeContext(c). MakeOrm(). MakeService(&s.Service). @@ -401,7 +401,7 @@ func (e SysUser) GetProfile(c *gin.Context) { // @Router /api/v1/getinfo [get] // @Security Bearer func (e SysUser) GetInfo(c *gin.Context) { - req := dto.SysUserById{} + req :=dto.SysUserById{} s := service.SysUser{} r := service.SysRole{} err := e.MakeContext(c). diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 003d8be8..6d6a206e 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -72,8 +72,8 @@ func (s *UpdateSysUserAvatarReq) Generate(model *models.SysUser) { } type UpdateSysUserStatusReq struct { - UserId int `json:"userId" comment:"用户ID" binding:"required"` // 用户ID - Status string `json:"status" comment:"状态" binding:"required"` + UserId int `json:"userId" comment:"用户ID" vd:"required"` // 用户ID + Status string `json:"status" comment:"状态" vd:"required"` common.ControlBy } @@ -88,24 +88,24 @@ func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) { model.Status = s.Status } -type SysUserControl struct { +type SysUserInsertReq struct { UserId int `json:"userId" comment:"用户ID"` // 用户ID - Username string `json:"username" comment:"用户名" binding:"required"` + Username string `json:"username" comment:"用户名" vd:"required"` Password string `json:"password" comment:"密码"` - NickName string `json:"nickName" comment:"昵称" binding:"required"` - Phone string `json:"phone" comment:"手机号" binding:"required"` + NickName string `json:"nickName" comment:"昵称" vd:"required"` + Phone string `json:"phone" comment:"手机号" vd:"required"` RoleId int `json:"roleId" comment:"角色ID"` Avatar string `json:"avatar" comment:"头像"` Sex string `json:"sex" comment:"性别"` - Email string `json:"email" comment:"邮箱" binding:"required,email"` - DeptId int `json:"deptId" comment:"部门" binding:"required"` + Email string `json:"email" comment:"邮箱" vd:"required,email"` + DeptId int `json:"deptId" comment:"部门" vd:"required"` PostId int `json:"postId" comment:"岗位"` Remark string `json:"remark" comment:"备注"` - Status string `json:"status" comment:"状态" binding:"required" default:"1"` + Status string `json:"status" comment:"状态" vd:"required" default:"1"` common.ControlBy } -func (s *SysUserControl) Generate(model *models.SysUser) { +func (s *SysUserInsertReq) Generate(model *models.SysUser) { if s.UserId != 0 { model.UserId = s.UserId } @@ -123,7 +123,44 @@ func (s *SysUserControl) Generate(model *models.SysUser) { model.Status = s.Status } -func (s *SysUserControl) GetId() interface{} { +func (s *SysUserInsertReq) GetId() interface{} { + return s.UserId +} + +type SysUserUpdateReq struct { + UserId int `json:"userId" comment:"用户ID"` // 用户ID + Username string `json:"username" comment:"用户名" vd:"required"` + NickName string `json:"nickName" comment:"昵称" vd:"required"` + Phone string `json:"phone" comment:"手机号" vd:"required"` + RoleId int `json:"roleId" comment:"角色ID"` + Avatar string `json:"avatar" comment:"头像"` + Sex string `json:"sex" comment:"性别"` + Email string `json:"email" comment:"邮箱" vd:"required,email"` + DeptId int `json:"deptId" comment:"部门" vd:"required"` + PostId int `json:"postId" comment:"岗位"` + Remark string `json:"remark" comment:"备注"` + Status string `json:"status" comment:"状态" vd:"required" default:"1"` + common.ControlBy +} + +func (s *SysUserUpdateReq) Generate(model *models.SysUser) { + if s.UserId != 0 { + model.UserId = s.UserId + } + model.Username = s.Username + model.NickName = s.NickName + model.Phone = s.Phone + model.RoleId = s.RoleId + model.Avatar = s.Avatar + model.Sex = s.Sex + model.Email = s.Email + model.DeptId = s.DeptId + model.PostId = s.PostId + model.Remark = s.Remark + model.Status = s.Status +} + +func (s *SysUserUpdateReq) GetId() interface{} { return s.UserId } @@ -146,6 +183,6 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { // PassWord 密码 type PassWord struct { - NewPassword string `json:"newPassword" binding:"required"` - OldPassword string `json:"oldPassword" binding:"required"` + NewPassword string `json:"newPassword" vd:"required"` + OldPassword string `json:"oldPassword" vd:"required"` } diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index e7a69dd0..2392c237 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -60,7 +60,7 @@ func (e *SysUser) Get(d *dto.SysUserById, p *actions.DataPermission, model *mode } // Insert 创建SysUser对象 -func (e *SysUser) Insert(c *dto.SysUserControl) error { +func (e *SysUser) Insert(c *dto.SysUserInsertReq) error { var err error var data models.SysUser var i int64 @@ -84,7 +84,7 @@ func (e *SysUser) Insert(c *dto.SysUserControl) error { } // Update 修改SysUser对象 -func (e *SysUser) Update(c *dto.SysUserControl, p *actions.DataPermission) error { +func (e *SysUser) Update(c *dto.SysUserUpdateReq, p *actions.DataPermission) error { var err error var model models.SysUser db := e.Orm.Scopes( diff --git a/common/global/adm.go b/common/global/adm.go index de8ad4c1..b1ffae93 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -2,7 +2,7 @@ package global const ( // Version go-admin version info - Version = "2.0.0-beta.9" + Version = "2.0.0-beta.11" ) var ( diff --git a/go.mod b/go.mod index fafe8ce3..c99a16fe 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 github.com/bytedance/go-tagexpr/v2 v2.7.12 github.com/casbin/casbin/v2 v2.25.1 - github.com/gin-gonic/gin v1.7.1 + github.com/gin-gonic/gin v1.7.2 github.com/go-admin-team/go-admin-core v1.3.6 github.com/go-admin-team/go-admin-core/sdk v1.3.6 github.com/google/uuid v1.2.0 @@ -28,7 +28,7 @@ require ( gorm.io/driver/mysql v1.0.4-0.20201206014609-ae5fd10184f6 gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53 gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba - gorm.io/gorm v1.21.10 + gorm.io/gorm v1.21.11 ) //replace (