diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java index 98ddd06b5..8edc1b063 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java @@ -1,5 +1,6 @@ package org.dromara.common.web.core; +import org.dromara.common.core.utils.StringUtils; import org.springframework.web.servlet.LocaleResolver; import jakarta.servlet.http.HttpServletRequest; @@ -17,9 +18,12 @@ public class I18nLocaleResolver implements LocaleResolver { public Locale resolveLocale(HttpServletRequest httpServletRequest) { String language = httpServletRequest.getHeader("content-language"); Locale locale = Locale.getDefault(); - if (language != null && language.length() > 0) { + if (StringUtils.isNotBlank(language)) { String[] split = language.split("_"); - locale = new Locale(split[0], split[1]); + locale = new Locale.Builder() + .setLanguage(split[0]) + .setRegion(split[1]) + .build(); } return locale; }