From b4f3973e38a386b9a3865b6a4ecdbeb870d4e53c Mon Sep 17 00:00:00 2001 From: cxh Date: Tue, 28 May 2024 13:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B9=E6=B3=95=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E6=9B=BF=E6=8D=A2=E5=9C=A8jdk21=E4=B8=AD=E5=B0=86?= =?UTF-8?q?=E8=A6=81=E5=BA=9F=E5=BC=83=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit new Locale(split[0], split[1])构造器在jdk17是没有被废弃的,在从jdk19开始被废弃。 @Deprecated(since="19") public Locale(String language, String country),优化写法一样生效,jdk兼容性更佳 --- .../org/dromara/common/web/core/I18nLocaleResolver.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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; }