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

chore: 用户设置默认语言

This commit is contained in:
fit2-zhao 2024-08-12 13:30:58 +08:00 committed by Craftsman
parent 177e1fb868
commit 5034363060
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/services/system-setting/src/main/java/io/metersphere/system/controller/LoginController.java
View File

@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -38,6 +38,8 @@ public class LoginController {
private UserLoginService userLoginService; private UserLoginService userLoginService;
@Resource @Resource
private ProjectMapper projectMapper; private ProjectMapper projectMapper;
@Value("${spring.messages.default-locale}")
private String defaultLocale;
@GetMapping(value = "/is-login") @GetMapping(value = "/is-login")
@ -47,7 +49,7 @@ public class LoginController {
if (user != null) { if (user != null) {
UserDTO userDTO = userLoginService.getUserDTO(user.getId()); UserDTO userDTO = userLoginService.getUserDTO(user.getId());
if (StringUtils.isBlank(userDTO.getLanguage())) { if (StringUtils.isBlank(userDTO.getLanguage())) {
userDTO.setLanguage(LocaleContextHolder.getLocale().toString()); userDTO.setLanguage(defaultLocale);
} }
userLoginService.autoSwitch(userDTO); userLoginService.autoSwitch(userDTO);