From b9dc780292211d2cbeea0c5288f2d4c731067361 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Wed, 4 Jan 2023 11:10:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E5=8F=96=E6=B6=88=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8E=E5=86=8D=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=9C=AA?= =?UTF-8?q?=E7=BD=AE=E7=A9=BA=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #21081 --- .../frontend/src/business/workspace/project/EditProject.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/system-setting/frontend/src/business/workspace/project/EditProject.vue b/system-setting/frontend/src/business/workspace/project/EditProject.vue index 4c4562053a..d300063373 100644 --- a/system-setting/frontend/src/business/workspace/project/EditProject.vue +++ b/system-setting/frontend/src/business/workspace/project/EditProject.vue @@ -228,6 +228,7 @@ export default { this.form.issueTemplateId = ''; }, edit(row) { + this.form = {}; this.getOptions(); this.createVisible = true; listenGoBack(this.handleClose); From 17bd707efabef616e2ef40dcd5962c5ce642e7d0 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 4 Jan 2023 15:10:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsession=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/metersphere/gateway/service/SSOService.java | 5 +++-- .../io/metersphere/controller/SystemParameterController.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/gateway/src/main/java/io/metersphere/gateway/service/SSOService.java b/framework/gateway/src/main/java/io/metersphere/gateway/service/SSOService.java index 5b49332602..cf7204f679 100644 --- a/framework/gateway/src/main/java/io/metersphere/gateway/service/SSOService.java +++ b/framework/gateway/src/main/java/io/metersphere/gateway/service/SSOService.java @@ -43,6 +43,7 @@ import java.nio.charset.StandardCharsets; import java.security.KeyManagementException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; +import java.time.Duration; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -200,8 +201,8 @@ public class SSOService { session.getAttributes().put("authId", authSource.getId()); session.getAttributes().put("casTicket", ticket); // 记录cas对应关系 - Long timeout = env.getProperty("spring.session.timeout", Long.class); - stringRedisTemplate.opsForValue().set(ticket, name, timeout, TimeUnit.SECONDS); + Duration timeout = env.getProperty("spring.session.timeout", Duration.class, Duration.ofHours(12)); + stringRedisTemplate.opsForValue().set(ticket, name, timeout); return userOptional; } diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/SystemParameterController.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/SystemParameterController.java index 3d03243ffe..2fa57963a2 100644 --- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/SystemParameterController.java +++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/SystemParameterController.java @@ -17,6 +17,7 @@ import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.time.Duration; import java.util.HashMap; import java.util.List; @@ -54,7 +55,7 @@ public class SystemParameterController { @GetMapping("timeout") public long getTimeout() { - return env.getProperty("spring.session.timeout", Long.class, 43200L); // 默认43200s, 12个小时 + return env.getProperty("spring.session.timeout", Duration.class, Duration.ofHours(12)).getSeconds(); // 默认43200s, 12个小时 } @GetMapping("/mail/info")