From 42468e971101cab8ba6c00f8129b879663d00eaa Mon Sep 17 00:00:00 2001 From: lishuang Date: Sat, 22 Jul 2023 15:35:45 +0800 Subject: [PATCH] feat: add root dir support. --- code/rest/matter_controller.go | 2 +- code/rest/matter_dao.go | 2 +- code/rest/matter_model.go | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/rest/matter_controller.go b/code/rest/matter_controller.go index a76a03f..b1bdb2f 100644 --- a/code/rest/matter_controller.go +++ b/code/rest/matter_controller.go @@ -232,7 +232,7 @@ func (this *MatterController) Crawl(writer http.ResponseWriter, request *http.Re var dirMatter *Matter if puuid == "" { - dirMatter = this.matterDao.CheckByUuid(puuid) + dirMatter = this.matterDao.CheckWithRootByUuid(puuid, space) if dirMatter.SpaceUuid != space.Uuid { panic(result.UNAUTHORIZED) } diff --git a/code/rest/matter_dao.go b/code/rest/matter_dao.go index 90ce61d..b1cc724 100644 --- a/code/rest/matter_dao.go +++ b/code/rest/matter_dao.go @@ -65,7 +65,7 @@ func (this *MatterDao) CheckWithRootByUuid(uuid string, space *Space) *Matter { var matter *Matter if uuid == MATTER_ROOT { if space == nil { - panic(result.BadRequest("user cannot be null.")) + panic(result.BadRequest("space cannot be null.")) } matter = NewRootMatter(space) } else { diff --git a/code/rest/matter_model.go b/code/rest/matter_model.go index 8af3f90..edcf88e 100644 --- a/code/rest/matter_model.go +++ b/code/rest/matter_model.go @@ -151,11 +151,12 @@ func (this *Matter) FetchPropMap() map[string]string { func (this *Matter) SetPropMap(propMap map[string]string) { //恢复panic - //defer func() { - // if err := recover(); err != nil { - // fmt.Printf("occur error while set prop map %s\r\n", err) - // } - //}() + defer func() { + fmt.Printf("panic recover check") + if err := recover(); err != nil { + fmt.Printf("occur error while set prop map %s\r\n", err) + } + }() b, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(propMap) if err != nil {