Skip to content

Commit ecb2134

Browse files
committed
修复错误
1 parent f530625 commit ecb2134

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/util/i18n/DefualtLocaleResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ public class DefualtLocaleResolver implements LocaleResolver {
3131
public Locale resolveLocale(HttpClassicServerRequest request) {
3232
// 先解析 Cookie,如果没有则解析 Accept-Language 头。
3333
String newLocale = request.cookies().get(this.cookieName).map(Cookie::value).orElse(null);
34-
if (newLocale != null && StringUtils.isNotBlank(newLocale.trim())) {
34+
if (StringUtils.isNotBlank(newLocale.trim())) {
3535
return Locale.forLanguageTag(newLocale);
3636
}
3737
String acceptLanguage = null;
3838
List<String> acceptLanguages = request.headers().all("Accept-Language");
3939

4040
for (String language : acceptLanguages) {
41-
if (language != null && StringUtils.isNotBlank(language.trim())) {
41+
if (StringUtils.isNotBlank(language.trim())) {
4242
acceptLanguage = language;
4343
break;
4444
}
4545
}
4646

47-
if (acceptLanguage != null && StringUtils.isNotBlank(acceptLanguage.trim())) {
47+
if (StringUtils.isNotBlank(acceptLanguage.trim())) {
4848
return Locale.forLanguageTag(acceptLanguage);
4949
}
5050

framework/fit/java/fit-builtin/services/fit-http-classic/definition/src/main/java/modelengine/fit/http/util/i18n/LocaleResolveFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void doFilter(HttpClassicServerRequest request, HttpClassicServerResponse
6969
List<String> paramLocales = request.queries().all("locale");
7070
Locale responseLocale = null;
7171
for (String paramLocale : paramLocales) {
72-
if (paramLocale != null && StringUtils.isNotBlank(paramLocale.trim())) {
72+
if (StringUtils.isNotBlank(paramLocale.trim())) {
7373
responseLocale = Locale.forLanguageTag(paramLocale);
7474
break;
7575
}

0 commit comments

Comments
 (0)