Skip to content

Commit 1ea4da2

Browse files
committed
完善代码
1 parent 956948e commit 1ea4da2

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class DefualtLocaleResolver implements LocaleResolver {
2727

2828
@Override
2929
public Locale resolveLocale(HttpClassicServerRequest request) {
30-
// 先解析 Cookie,如果没有则解析 Accept-Language 头
30+
// 先解析 Cookie,如果没有则解析 Accept-Language 头
3131
String newLocale = request.cookies().get(this.cookieName).map(Cookie::value).orElse(null);
3232
if (newLocale != null) {
3333
return Locale.forLanguageTag(newLocale);
@@ -42,7 +42,7 @@ public Locale resolveLocale(HttpClassicServerRequest request) {
4242
return Locale.forLanguageTag(acceptLanguage);
4343
}
4444

45-
return defaultLocale;
45+
return this.defaultLocale;
4646
}
4747

4848
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import java.util.Locale;
1616

1717
/**
18-
* 简单地区解析过滤器,只使用一种 {@link LocaleResolver} 进行地区解析,多插件同时配置 {@link LocaleResolveFilter} 可能会引发不可预知的行为
18+
* 地区解析过滤器,使用 {@link LocaleResolver} 进行地区解析。
1919
*
2020
* @author 阮睿
2121
* @since 2025-08-01
@@ -27,7 +27,7 @@ public class LocaleResolveFilter implements HttpServerFilter {
2727

2828
private List<String> mismatchPatterns = List.of();
2929

30-
private Scope scope = Scope.GLOBAL;
30+
private Scope scope = Scope.PLUGIN;
3131

3232
/**
3333
* 构造函数。

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,21 @@
1818
* @since 2025-08-01
1919
*/
2020
public interface LocaleResolver {
21+
/**
22+
* 表示要设置 cookie 的名称。
23+
*/
2124
public static final String DEFAULT_COOKIE_NAME = "locale";
25+
/**
26+
* 表示要设置 cookie 的自动过期时间。
27+
*/
2228
public static final int DEFAULT_COOKIE_MAX_AGE = 60 * 60 * 24 * 365;
29+
/**
30+
* 表示要设置 Cookie 的可见域。
31+
*/
2332
public static final String DEFAULT_COOKIE_DOMAIN = "/";
33+
/**
34+
* 表示要设置 Cookie 的可见 URL 路径。
35+
*/
2436
public static final String DEFAULT_COOKIE_PATH = "/";
2537

2638
/**

framework/fit/java/fit-util/src/main/java/modelengine/fitframework/util/i18n/LocaleContextHolder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ public class LocaleContextHolder {
2323
* @param localeContext 表示将要存储在当前线程地区上下文的 {@link LocaleContext}。
2424
*/
2525
public static void setLocaleContext(LocaleContext localeContext) {
26-
LOCALE_CONTEXT_HOLDER.set(localeContext);
26+
if (localeContext != null) {
27+
LOCALE_CONTEXT_HOLDER.set(localeContext);
28+
}
2729
}
2830

2931
/**

0 commit comments

Comments
 (0)