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")
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);