From d4b72e06cd2090163d250d00ee18dc3528cd8d98 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 7 Dec 2022 09:23:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/convert/cloudbrain.go | 1 + modules/structs/tagger.go | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/convert/cloudbrain.go b/modules/convert/cloudbrain.go index 1487f468e..599da4800 100644 --- a/modules/convert/cloudbrain.go +++ b/modules/convert/cloudbrain.go @@ -104,6 +104,7 @@ func ToSpecification(s *models.Specification) *api.SpecificationShow { func ToTagger(user *models.User) *api.Tagger { return &api.Tagger{ + ID: user.ID, Name: user.Name, RelAvatarURL: user.RelAvatarLink(), Email: user.Email, diff --git a/modules/structs/tagger.go b/modules/structs/tagger.go index 8933c8c5c..c32ad8040 100644 --- a/modules/structs/tagger.go +++ b/modules/structs/tagger.go @@ -1,6 +1,7 @@ package structs type Tagger struct { + ID int64 `json:"id"` Name string `json:"name"` Email string `json:"email"` RelAvatarURL string `json:"relAvatarURL"` From bd77ae4573cf0834f274bfa8e40b413e2137c59a Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Wed, 7 Dec 2022 16:18:21 +0800 Subject: [PATCH 2/3] fix-3315 --- routers/api/v1/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 8958c55a4..c18a290a6 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -738,7 +738,7 @@ func RegisterRoutes(m *macaron.Macaron) { }, reqToken(), repoAssignment()) m.Group("/file_notebook", func() { - m.Get("", reqToken(), repo.GetFileNoteBookInfo) + m.Get("", repo.GetFileNoteBookInfo) m.Post("/create", reqToken(), reqWeChat(), bind(api.CreateFileNotebookJobOption{}), repo.CreateFileNoteBook) }) From 7b70f61bf7a5559aad45212187fd3cae22d0fa77 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 8 Dec 2022 15:51:51 +0800 Subject: [PATCH 3/3] fix issue --- web_src/vuepages/pages/notebook/debug/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web_src/vuepages/pages/notebook/debug/index.vue b/web_src/vuepages/pages/notebook/debug/index.vue index 77b2a7603..cac76a883 100644 --- a/web_src/vuepages/pages/notebook/debug/index.vue +++ b/web_src/vuepages/pages/notebook/debug/index.vue @@ -342,6 +342,9 @@ export default { }).catch((err)=>{ if(err.response.status===403 && err.response.data.code===1 ){ location.href=`${AppSubUrl}/authentication/wechat/bind` + } + if(err.response.status===401){ + location.href=`${AppSubUrl}/user/login` } this.btnStatus[index]=0 this.alertCb = false