From 32f21d85554f70101b3a00b7774bc26493c983c0 Mon Sep 17 00:00:00 2001 From: feitianbubu Date: Tue, 30 Sep 2025 12:44:22 +0800 Subject: [PATCH 1/3] feat: add check for existing file key before upload --- server/service/example/exa_file_upload_download.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/service/example/exa_file_upload_download.go b/server/service/example/exa_file_upload_download.go index c5519fc08..536734eee 100644 --- a/server/service/example/exa_file_upload_download.go +++ b/server/service/example/exa_file_upload_download.go @@ -9,6 +9,7 @@ import ( "github.com/flipped-aurora/gin-vue-admin/server/model/example" "github.com/flipped-aurora/gin-vue-admin/server/model/example/request" "github.com/flipped-aurora/gin-vue-admin/server/utils/upload" + "gorm.io/gorm" ) //@author: [piexlmax](https://github.com/piexlmax) @@ -107,7 +108,13 @@ func (e *FileUploadAndDownloadService) UploadFile(header *multipart.FileHeader, Key: key, } if noSave == "0" { - return f, e.Upload(f) + // 检查是否已存在相同key的记录 + var existingFile example.ExaFileUploadAndDownload + err = global.GVA_DB.Where("`key` = ?", key).First(&existingFile).Error + if errors.Is(err, gorm.ErrRecordNotFound) { + return f, e.Upload(f) + } + return f, err } return f, nil } From b9009bbd482ef7e594e05fe382d6127cc89f076f Mon Sep 17 00:00:00 2001 From: wangyazhou <564631192@qq.com> Date: Tue, 28 Oct 2025 15:14:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(jwt):=E4=BF=AE=E6=AD=A3=E4=BB=A4?= =?UTF-8?q?=E7=89=8C=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整了SetToken函数中的过期时间单位，从秒转换为分钟 - 确保新令牌的过期时间与配置保持一致- 修复了因时间单位不匹配导致的令牌提前失效问题 --- server/middleware/jwt.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/middleware/jwt.go b/server/middleware/jwt.go index 7715ed9c7..f4c029625 100644 --- a/server/middleware/jwt.go +++ b/server/middleware/jwt.go @@ -2,11 +2,12 @@ package middleware import ( "errors" + "strconv" + "time" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/golang-jwt/jwt/v5" - "strconv" - "time" "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "github.com/gin-gonic/gin" @@ -59,7 +60,7 @@ func JWTAuth() gin.HandlerFunc { newClaims, _ := j.ParseToken(newToken) c.Header("new-token", newToken) c.Header("new-expires-at", strconv.FormatInt(newClaims.ExpiresAt.Unix(), 10)) - utils.SetToken(c, newToken, int(dr.Seconds())) + utils.SetToken(c, newToken, int(dr.Seconds()/60)) if global.GVA_CONFIG.System.UseMultipoint { // 记录新的活跃jwt _ = utils.SetRedisJWT(newToken, newClaims.Username) From d5befa19003c9076610a12fe5b479ce57b0cc7d7 Mon Sep 17 00:00:00 2001 From: Azir-11 <2075125282@qq.com> Date: Mon, 3 Nov 2025 02:13:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?style(=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86)?= =?UTF-8?q?:=20=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E5=92=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=89=88=E6=9C=AC=E6=8A=BD=E5=B1=89=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=94=AF=E6=8C=81=E6=9A=97=E8=89=B2=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/view/systemTools/version/version.vue | 175 ++++++++++--------- 1 file changed, 91 insertions(+), 84 deletions(-) diff --git a/web/src/view/systemTools/version/version.vue b/web/src/view/systemTools/version/version.vue index 6f4838265..f61d1d29e 100644 --- a/web/src/view/systemTools/version/version.vue +++ b/web/src/view/systemTools/version/version.vue @@ -96,7 +96,8 @@ - +