Skip to content

N
nbya
Commit aa7cab2b authored by haoyanbin's avatar haoyanbin
Browse files
Options

1

parent 07ce8897
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 299 deletions
app/admin/models/sys_user.go
View file @ aa7cab2b
......@@ -22,6 +22,7 @@ type SysUser struct {
PostId int `json:"postId" gorm:"size:20;comment:岗位"`
Remark string `json:"remark" gorm:"size:255;comment:备注"`
Status string `json:"status" gorm:"size:4;comment:状态"`
UserType string `json:"user_type" gorm:"size:4;comment:用户类型"`
DeptIds []int `json:"deptIds" gorm:"-"`
PostIds []int `json:"postIds" gorm:"-"`
RoleIds []int `json:"roleIds" gorm:"-"`
......
app/mobile/apis/org_news.go
View file @ aa7cab2b
......@@ -27,14 +27,15 @@ type OrgNews struct {
// @Param pageIndex query int false "页码"
// @Param data body dto.OrgNewsGetPageReq true "data"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /mobile/v1/org-news [get]
// @Router /mobile/v1/org-news [post]
// @Security Bearer
func (e OrgNews) GetPage(c *gin.Context) {
req := dto.OrgNewsGetPageReq{}
s := service.OrgNews{}
err := e.MakeContext(c).
err := c.Bind(&req)
err = e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
......
app/mobile/models/org_league.go deleted 100755 → 0
View file @ 07ce8897
package models
import (
// "gorm.io/gorm"
"go-admin/common/models"
)
type OrgLeague struct {
models.Model
LeagueName string `json:"leagueName" gorm:"type:varchar(255);comment:联赛级别"`
Status string `json:"status" gorm:"type:int(11);comment:联赛开启状态 1 是 0 否"`
models.ModelTime
models.ControlBy
}
func (OrgLeague) TableName() string {
return "org_league"
}
func (e *OrgLeague) Generate() models.ActiveRecord {
o := *e
return &o
}
func (e *OrgLeague) GetId() interface{} {
return e.Id
}
\ No newline at end of file
app/operate/apis/org_user.go
View file @ aa7cab2b
......@@ -2,17 +2,15 @@ package apis
import (
"github.com/gin-gonic/gin/binding"
"go-admin/app/admin/models"
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"github.com/google/uuid"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
)
......@@ -29,8 +27,8 @@ type OrgUser struct {
// @Router /api/v1/org-user [get]
// @Security Bearer
func (e OrgUser) GetPage(c *gin.Context) {
s := service.SysUser{}
req :=dto.SysUserGetPageReq{}
s := service.OrgUser{}
req := dto.OrgUserGetPageReq{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -45,7 +43,7 @@ func (e OrgUser) GetPage(c *gin.Context) {
//数据权限检查
p := actions.GetPermissionFromContext(c)
list := make([]models.SysUser, 0)
list := make([]dto.OrgUserGetPageReply, 0)
var count int64
err = s.GetPage(&req, p, &list, &count)
......@@ -66,8 +64,8 @@ func (e OrgUser) GetPage(c *gin.Context) {
// @Router /api/v1/org-user/{userId} [get]
// @Security Bearer
func (e OrgUser) Get(c *gin.Context) {
s := service.SysUser{}
req :=dto.SysUserById{}
s := service.OrgUser{}
req := dto.OrgUserGetReq{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, nil).
......@@ -78,7 +76,7 @@ func (e OrgUser) Get(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
var object models.SysUser
var object dto.OrgUserGetReply
//数据权限检查
p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object)
......@@ -100,8 +98,8 @@ func (e OrgUser) Get(c *gin.Context) {
// @Router /api/v1/org-user [post]
// @Security Bearer
func (e OrgUser) Insert(c *gin.Context) {
s := service.SysUser{}
req :=dto.SysUserInsertReq{}
s := service.OrgUser{}
req := dto.OrgUserInsertReq{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, binding.JSON).
......@@ -135,8 +133,8 @@ func (e OrgUser) Insert(c *gin.Context) {
// @Router /api/v1/org-user/{userId} [put]
// @Security Bearer
func (e OrgUser) Update(c *gin.Context) {
s := service.SysUser{}
req :=dto.SysUserUpdateReq{}
s := service.OrgUser{}
req := dto.OrgUserUpdateReq{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
......@@ -170,8 +168,8 @@ func (e OrgUser) Update(c *gin.Context) {
// @Router /api/v1/org-user/{userId} [delete]
// @Security Bearer
func (e OrgUser) Delete(c *gin.Context) {
s := service.SysUser{}
req :=dto.SysUserById{}
s := service.OrgUser{}
req := dto.OrgUserDeleteReq{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req, binding.JSON).
......@@ -184,7 +182,7 @@ func (e OrgUser) Delete(c *gin.Context) {
}
// 设置编辑人
req.SetUpdateBy(user.GetUserId(c))
//req.SetUpdateBy(user.GetUserId(c))
// 数据权限检查
p := actions.GetPermissionFromContext(c)
......@@ -197,54 +195,6 @@ func (e OrgUser) Delete(c *gin.Context) {
e.OK(req.GetId(), "删除成功")
}
// InsetAvatar
// @Summary 修改头像
// @Description 获取JSON
// @Tags 个人中心
// @Accept multipart/form-data
// @Param file formData file true "file"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-user/avatar [post]
// @Security Bearer
func (e OrgUser) InsetAvatar(c *gin.Context) {
s := service.SysUser{}
req :=dto.UpdateSysUserAvatarReq{}
err := e.MakeContext(c).
MakeOrm().
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
// 数据权限检查
p := actions.GetPermissionFromContext(c)
form, _ := c.MultipartForm()
files := form.File["upload[]"]
guid := uuid.New().String()
filPath := "static/uploadfile/" + guid + ".jpg"
for _, file := range files {
e.Logger.Debugf("upload avatar file: %s", file.Filename)
// 上传文件至指定目录
err = c.SaveUploadedFile(file, filPath)
if err != nil {
e.Logger.Errorf("save file error, %s", err.Error())
e.Error(500, err, "")
return
}
}
req.UserId = p.UserId
req.Avatar = "/" + filPath
err = s.UpdateAvatar(&req, p)
if err != nil {
e.Logger.Error(err)
return
}
e.OK(filPath, "修改成功")
}
// UpdateStatus 修改用户状态
// @Summary 修改用户状态
// @Description 获取JSON
......@@ -256,30 +206,30 @@ func (e OrgUser) InsetAvatar(c *gin.Context) {
// @Router /api/v1/org-user/status [put]
// @Security Bearer
func (e OrgUser) UpdateStatus(c *gin.Context) {
s := service.SysUser{}
req :=dto.UpdateSysUserStatusReq{}
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)
err = s.UpdateStatus(&req, p)
if err != nil {
e.Logger.Error(err)
return
}
e.OK(req.GetId(), "更新成功")
// s := service.OrgUser{}
// req := dto.OrgUserUpdateStatusReq{}
// 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)
//
// err = s.Update(&req, p)
// if err != nil {
// e.Logger.Error(err)
// return
// }
// e.OK(req.GetId(), "更新成功")
}
// ResetPwd 重置用户密码
......@@ -293,161 +243,28 @@ func (e OrgUser) UpdateStatus(c *gin.Context) {
// @Router /api/v1/org-user/pwd/reset [put]
// @Security Bearer
func (e OrgUser) ResetPwd(c *gin.Context) {
s := service.SysUser{}
req :=dto.ResetSysUserPwdReq{}
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
}
req.SetUpdateBy(user.GetUserId(c))
//数据权限检查
p := actions.GetPermissionFromContext(c)
err = s.ResetPwd(&req, p)
if err != nil {
e.Logger.Error(err)
return
}
e.OK(req.GetId(), "更新成功")
// s := service.OrgUser{}
// req := dto.ResetUserPwdReq{}
// 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
// }
//
// req.SetUpdateBy(user.GetUserId(c))
//
// //数据权限检查
// p := actions.GetPermissionFromContext(c)
//
// err = s.ResetPwd(&req, p)
// if err != nil {
// e.Logger.Error(err)
// return
// }
// e.OK(req.GetId(), "更新成功")
}
// UpdatePwd
// @Summary 重置密码
// @Description 获取JSON
// @Tags 用户
// @Accept application/json
// @Product application/json
// @Param data body dto.PassWord true "body"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-user/pwd/set [put]
// @Security Bearer
func (e OrgUser) UpdatePwd(c *gin.Context) {
s := service.SysUser{}
req :=dto.PassWord{}
err := e.MakeContext(c).
MakeOrm().
Bind(&req).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
// 数据权限检查
p := actions.GetPermissionFromContext(c)
err = s.UpdatePwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p)
if err != nil {
e.Logger.Error(err)
e.Error(http.StatusForbidden, err, "密码修改失败")
return
}
e.OK(nil, "密码修改成功")
}
// GetProfile
// @Summary 获取个人中心用户
// @Description 获取JSON
// @Tags 个人中心
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-user/profile [get]
// @Security Bearer
func (e OrgUser) GetProfile(c *gin.Context) {
s := service.SysUser{}
req :=dto.SysUserById{}
err := e.MakeContext(c).
MakeOrm().
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
req.Id = user.GetUserId(c)
sysUser := models.SysUser{}
roles := make([]models.SysRole, 0)
posts := make([]models.SysPost, 0)
err = s.GetProfile(&req, &sysUser, &roles, &posts)
if err != nil {
e.Logger.Errorf("get user profile error, %s", err.Error())
e.Error(500, err, "获取用户信息失败")
return
}
e.OK(gin.H{
"user": sysUser,
"roles": roles,
"posts": posts,
}, "查询成功")
}
// GetInfo
// @Summary 获取个人信息
// @Description 获取JSON
// @Tags 个人中心
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-user/getinfo [get]
// @Security Bearer
func (e OrgUser) GetInfo(c *gin.Context) {
req :=dto.SysUserById{}
s := service.SysUser{}
r := service.SysRole{}
err := e.MakeContext(c).
MakeOrm().
MakeService(&r.Service).
MakeService(&s.Service).
Errors
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
return
}
p := actions.GetPermissionFromContext(c)
var roles = make([]string, 1)
roles[0] = user.GetRoleName(c)
var permissions = make([]string, 1)
permissions[0] = "*:*:*"
var buttons = make([]string, 1)
buttons[0] = "*:*:*"
var mp = make(map[string]interface{})
mp["roles"] = roles
if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" {
mp["permissions"] = permissions
mp["buttons"] = buttons
} else {
list, _ := r.GetById(user.GetRoleId(c))
mp["permissions"] = list
mp["buttons"] = list
}
sysUser := models.SysUser{}
req.Id = user.GetUserId(c)
err = s.Get(&req, p, &sysUser)
if err != nil {
e.Error(http.StatusUnauthorized, err, "登录失败")
return
}
mp["introduction"] = " am a super administrator"
mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"
if sysUser.Avatar != "" {
mp["avatar"] = sysUser.Avatar
}
mp["userName"] = sysUser.NickName
mp["userId"] = sysUser.UserId
mp["deptId"] = sysUser.DeptId
mp["name"] = sysUser.NickName
mp["code"] = 200
e.OK(mp, "")
}
\ No newline at end of file
app/operate/router/org_user.go
View file @ aa7cab2b
......@@ -26,14 +26,7 @@ func registerOrgUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
user := v1.Group("/org-user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction())
{
user.GET("/profile", api.GetProfile)
user.POST("/avatar", api.InsetAvatar)
user.PUT("/pwd/set", api.UpdatePwd)
user.PUT("/pwd/reset", api.ResetPwd)
user.PUT("/status", api.UpdateStatus)
}
v1auth := v1.Group("/org-user").Use(authMiddleware.MiddlewareFunc())
{
v1auth.GET("/getinfo", api.GetInfo)
}
}
\ No newline at end of file
}
app/operate/service/dto/org_user.go
View file @ aa7cab2b
......@@ -34,6 +34,8 @@ type OrgUserInsertReq struct {
NickName string `json:"nickName" comment:"姓名"`
NickNameEn string `json:"nickNameEn" comment:"姓名"`
Username string `json:"username" comment:"账号"`
Status string `json:"status" comment:"状态" default:"2"`
UserType string `json:"userType" comment:"类型" default:"2"`
common.ControlBy
}
......@@ -45,6 +47,7 @@ func (s *OrgUserInsertReq) Generate(model *models.SysUser) {
model.RoleId, _ = strconv.Atoi(s.RoleId)
model.Status = "2"
model.Password = Pwd("123456")
model.UserType = "2"
}
func (s *OrgUserInsertReq) GetId() interface{} {
......
app/operate/service/org_user.go
View file @ aa7cab2b
......@@ -5,7 +5,7 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/admin/models"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
cDto "go-admin/common/dto"
......@@ -16,9 +16,9 @@ type OrgUser struct {
}
// GetPage 获取OrgTeamUser列表
func (e *OrgUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamUserGetPageReply, count *int64) error {
func (e *OrgUser) GetPage(c *dto.OrgUserGetPageReq, p *actions.DataPermission, list *[]dto.OrgUserGetPageReply, count *int64) error {
var err error
var data models.OrgTeamUser
var data models.SysUser
field := "otu.id, oc.club_name, ot.team_name, otu.name, otu.sex, sr.role_name, su.status"
err = e.Orm.Table("org_team_user as otu").
......@@ -43,7 +43,7 @@ func (e *OrgUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermissio
}
// Get 获取OrgTeamUser对象
func (e *OrgUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model *dto.OrgTeamUserGetReply) error {
func (e *OrgUser) Get(d *dto.OrgUserGetReq, p *actions.DataPermission, model *dto.OrgUserGetReply) error {
field := "otu.id,oc.club_name, otu.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status"
err := e.Orm.Table("org_team_user as otu").
......@@ -66,9 +66,9 @@ func (e *OrgUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model
}
// Insert 创建OrgTeamUser对象
func (e *OrgUser) Insert(c *dto.OrgTeamUserInsertReq) error {
func (e *OrgUser) Insert(c *dto.OrgUserInsertReq) error {
var err error
var data models.OrgTeamUser
var data models.SysUser
c.Generate(&data)
err = e.Orm.Create(&data).Error
if err != nil {
......@@ -76,14 +76,14 @@ func (e *OrgUser) Insert(c *dto.OrgTeamUserInsertReq) error {
return err
}
c.Id = data.Id
c.UserId = data.UserId
return nil
}
// Update 修改OrgTeamUser对象
func (e *OrgUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermission) error {
func (e *OrgUser) Update(c *dto.OrgUserUpdateReq, p *actions.DataPermission) error {
var err error
var data = models.OrgTeamUser{}
var data = models.SysUser{}
e.Orm.Scopes(
actions.Permission(data.TableName(), p),
).First(&data, c.GetId())
......@@ -103,8 +103,8 @@ func (e *OrgUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermission)
}
// Remove 删除OrgTeamUser
func (e *OrgUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermission) error {
var data models.OrgTeamUser
func (e *OrgUser) Remove(d *dto.OrgUserDeleteReq, p *actions.DataPermission) error {
var data models.SysUser
db := e.Orm.Model(&data).
Scopes(
......
common/dto/pagination.go
View file @ aa7cab2b
package dto
type Pagination struct {
PageIndex int `form:"pageIndex"`
PageSize int `form:"pageSize"`
PageIndex int `form:"pageIndex" json:"pageIndex"`
PageSize int `form:"pageSize" json:"pageSize"`
}
func (m *Pagination) GetPageIndex() int {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment