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

refactor: 默认语言优先级选择优化

This commit is contained in:
fit2-zhao 2024-08-16 10:52:47 +08:00 committed by Craftsman
parent de0a17d331
commit bc34fe73f7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserLocalConfigController.java
View File

@ -4,6 +4,7 @@ package io.metersphere.system.controller;
import io.metersphere.system.domain.UserLocalConfig; import io.metersphere.system.domain.UserLocalConfig;
import io.metersphere.system.dto.UserLocalConfigAddRequest; import io.metersphere.system.dto.UserLocalConfigAddRequest;
import io.metersphere.system.dto.UserLocalConfigUpdateRequest; import io.metersphere.system.dto.UserLocalConfigUpdateRequest;
import io.metersphere.system.dto.sdk.SessionUser;
import io.metersphere.system.log.annotation.Log; import io.metersphere.system.log.annotation.Log;
import io.metersphere.system.log.constants.OperationLogType; import io.metersphere.system.log.constants.OperationLogType;
import io.metersphere.system.service.UserLocalConfigLogService; import io.metersphere.system.service.UserLocalConfigLogService;
@ -12,11 +13,13 @@ import io.metersphere.system.utils.SessionUtils;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Optional;
@RestController @RestController
@RequestMapping("/user/local/config") @RequestMapping("/user/local/config")
@ -63,7 +66,12 @@ public class UserLocalConfigController {
@GetMapping(value = "/default-locale") @GetMapping(value = "/default-locale")
public String defaultLocale() { public String defaultLocale() {
return defaultLocale.replace("_", "-"); SessionUser user = SessionUtils.getUser();
} String language = Optional.ofNullable(user)
.map(SessionUser::getLanguage)
.filter(StringUtils::isNotBlank)
.orElse(defaultLocale);
return language.replace("_", "-");
}
} }