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

chore: 默认国际化语言调整 

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2024-08-12 09:58:13 +08:00
parent 7cbe5f5f30
commit 7718bee0e7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/LoginController.java
View File

@ -17,19 +17,17 @@ import io.metersphere.request.LoginRequest;
import io.metersphere.service.BaseDisplayService;
import io.metersphere.service.BaseUserService;
import io.metersphere.service.SSOLogoutService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.reflect.MethodUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.http.ResponseEntity;
import org.springframework.session.data.redis.RedisIndexedSessionRepository;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import java.io.IOException;
import java.util.List;
@ -49,6 +47,8 @@ public class LoginController {
private Integer port;
@Resource
private RedisIndexedSessionRepository redisIndexedSessionRepository;
@Value("${spring.messages.default-locale}")
private String defaultLocale;
@GetMapping(value = "/is-login")
@ -58,7 +58,7 @@ public class LoginController {
if (user != null) {
UserDTO userDTO = baseUserService.getUserDTO((String) MethodUtils.invokeMethod(user, "getId"));
if (StringUtils.isBlank(userDTO.getLanguage())) {
userDTO.setLanguage(LocaleContextHolder.getLocale().toString());
userDTO.setLanguage(defaultLocale);
}
baseUserService.autoSwitch(userDTO);
SessionUser sessionUser = SessionUser.fromUser(userDTO, SessionUtils.getSessionId());
@ -104,6 +104,9 @@ public class LoginController {
/*Get default language*/
@GetMapping(value = "/language")
public String getDefaultLanguage() {
if (StringUtils.isNotBlank(defaultLocale)) {
return defaultLocale;
}
return baseUserService.getDefaultLanguage();
}