test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复session超时时间配置单位错误的问题

This commit is contained in:
CaptainB 2023-01-04 15:10:09 +08:00 committed by 刘瑞斌
parent b9dc780292
commit 17bd707efa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/gateway/src/main/java/io/metersphere/gateway/service/SSOService.java
View File

@ -43,6 +43,7 @@ import java.nio.charset.StandardCharsets;
import java.security.KeyManagementException; import java.security.KeyManagementException;
import java.security.KeyStoreException; import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.time.Duration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -200,8 +201,8 @@ public class SSOService {
session.getAttributes().put("authId", authSource.getId()); session.getAttributes().put("authId", authSource.getId());
session.getAttributes().put("casTicket", ticket); session.getAttributes().put("casTicket", ticket);
// 记录cas对应关系 // 记录cas对应关系
Long timeout = env.getProperty("spring.session.timeout", Long.class); Duration timeout = env.getProperty("spring.session.timeout", Duration.class, Duration.ofHours(12));
stringRedisTemplate.opsForValue().set(ticket, name, timeout, TimeUnit.SECONDS); stringRedisTemplate.opsForValue().set(ticket, name, timeout);
return userOptional; return userOptional;
} }

3
framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/SystemParameterController.java
View File

@ -17,6 +17,7 @@ import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.Duration;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -54,7 +55,7 @@ public class SystemParameterController {
@GetMapping("timeout") @GetMapping("timeout")
public long getTimeout() { 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") @GetMapping("/mail/info")