TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 00:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 问题修复

Browse Source
This commit is contained in:
meilin.huang
2023-01-19 19:45:12 +08:00
parent 594ca43505
commit 9f43f731b5
9 changed files with 213 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/internal/sys/application/syslog_app.go
View File

@@ -9,7 +9,6 @@ import (
"mayfly-go/pkg/model"
"mayfly-go/pkg/req"
"mayfly-go/pkg/utils"
"reflect"
"time"
)
@@ -51,7 +50,7 @@ func (m *syslogAppImpl) SaveFromReq(req *req.Ctx) {
}
reqParam := req.ReqParam
if !utils.IsBlank(reflect.ValueOf(reqParam)) {
if !utils.IsBlank(reqParam) {
// 如果是字符串类型，则不使用json序列化
if reqStr, ok := reqParam.(string); ok {
syslog.ReqParam = reqStr

2
server/internal/tag/api/team.go
View File

@@ -28,7 +28,7 @@ func (p *Team) GetTeams(rc *req.Ctx) {
func (p *Team) SaveTeam(rc *req.Ctx) {
team := &entity.Team{}
ginx.BindJsonAndValid(rc.GinCtx, team)
rc.ReqParam = team
isAdd := team.Id == 0
loginAccount := rc.LoginAccount

34
server/internal/tag/router/team.go
View File

@@ -16,62 +16,62 @@ func InitTeamRouter(router *gin.RouterGroup) {
AccountApp: sysapp.GetAccountApp(),
}
project := router.Group("/teams")
team := router.Group("/teams")
{
// 获取团队列表
project.GET("", func(c *gin.Context) {
team.GET("", func(c *gin.Context) {
req.NewCtxWithGin(c).Handle(m.GetTeams)
})
saveProjectTeamLog := req.NewLogInfo("团队-保存信息").WithSave(true)
saveTeamLog := req.NewLogInfo("团队-保存信息").WithSave(true)
savePP := req.NewPermission("team:save")
// 保存项目团队信息
project.POST("", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(saveProjectTeamLog).
team.POST("", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(saveTeamLog).
WithRequiredPermission(savePP).
Handle(m.SaveTeam)
})
delProjectTeamLog := req.NewLogInfo("团队-删除信息").WithSave(true)
delTeamLog := req.NewLogInfo("团队-删除信息").WithSave(true)
delPP := req.NewPermission("team:del")
project.DELETE(":id", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(delProjectTeamLog).
team.DELETE(":id", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(delTeamLog).
WithRequiredPermission(delPP).
Handle(m.DelTeam)
})
// 获取团队的成员信息列表
project.GET("/:id/members", func(c *gin.Context) {
team.GET("/:id/members", func(c *gin.Context) {
req.NewCtxWithGin(c).Handle(m.GetTeamMembers)
})
// 保存团队成员
saveProjectTeamMemLog := req.NewLogInfo("团队-新增成员").WithSave(true)
saveTeamMemLog := req.NewLogInfo("团队-新增成员").WithSave(true)
savePmP := req.NewPermission("team:member:save")
project.POST("/:id/members", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(saveProjectTeamMemLog).
team.POST("/:id/members", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(saveTeamMemLog).
WithRequiredPermission(savePmP).
Handle(m.SaveTeamMember)
})
// 删除团队成员
delProjectTeamMemLog := req.NewLogInfo("团队-删除成员").WithSave(true)
delTeamMemLog := req.NewLogInfo("团队-删除成员").WithSave(true)
savePmdP := req.NewPermission("team:member:del")
project.DELETE("/:id/members/:accountId", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(delProjectTeamMemLog).
team.DELETE("/:id/members/:accountId", func(c *gin.Context) {
req.NewCtxWithGin(c).WithLog(delTeamMemLog).
WithRequiredPermission(savePmdP).
Handle(m.DelTeamMember)
})
// 获取团队关联的标签id列表
project.GET("/:id/tags", func(c *gin.Context) {
team.GET("/:id/tags", func(c *gin.Context) {
req.NewCtxWithGin(c).Handle(m.GetTagIds)
})
// 保存团队标签关联信息
saveTeamTagLog := req.NewLogInfo("团队-保存标签关联信息").WithSave(true)
saveTeamTagP := req.NewPermission("team:tag:save")
project.POST("/:id/tags", func(c *gin.Context) {
team.POST("/:id/tags", func(c *gin.Context) {
req.NewCtxWithGin(c).
WithLog(saveTeamTagLog).
WithRequiredPermission(saveTeamTagP).