From b90f5469b98bda881cab2b6280be40ccf432bd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?= Date: Fri, 21 Feb 2025 10:23:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9token=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BC=98=E5=85=88=E7=BA=A7=EF=BC=8C=E4=BC=98=E5=85=88?= =?UTF-8?q?=E4=BB=8Eheader=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/utils/claims.go | 4 ++-- web/src/view/systemTools/autoCode/index.vue | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/utils/claims.go b/server/utils/claims.go index 8c3fd4b462..2a6308e8a1 100644 --- a/server/utils/claims.go +++ b/server/utils/claims.go @@ -40,10 +40,10 @@ func SetToken(c *gin.Context, token string, maxAge int) { } func GetToken(c *gin.Context) string { - token, _ := c.Cookie("x-token") + token := c.Request.Header.Get("x-token") if token == "" { j := NewJWT() - token = c.Request.Header.Get("x-token") + token, _ = c.Cookie("x-token") claims, err := j.ParseToken(token) if err != nil { global.GVA_LOG.Error("重新写入cookie token失败,未能成功解析token,请检查请求头是否存在x-token且claims是否为规定结构") diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue index b265c0adc1..10379b0180 100644 --- a/web/src/view/systemTools/autoCode/index.vue +++ b/web/src/view/systemTools/autoCode/index.vue @@ -657,7 +657,7 @@ diff --git a/web/src/components/exportExcel/exportTemplate.vue b/web/src/components/exportExcel/exportTemplate.vue index 0a69fddad0..dd77f95eff 100644 --- a/web/src/components/exportExcel/exportTemplate.vue +++ b/web/src/components/exportExcel/exportTemplate.vue @@ -1,10 +1,13 @@ diff --git a/web/src/components/exportExcel/importExcel.vue b/web/src/components/exportExcel/importExcel.vue index ebf886efd1..cd3a7d9469 100644 --- a/web/src/components/exportExcel/importExcel.vue +++ b/web/src/components/exportExcel/importExcel.vue @@ -4,6 +4,7 @@ :show-file-list="false" :on-success="handleSuccess" :multiple="false" + :headers="{'x-token': token}" > 导入 @@ -11,6 +12,7 @@