修复错误

Author: Yager-42

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

@@ -31,12 +31,12 @@ public class DefualtLocaleResolver implements LocaleResolver {
     public Locale resolveLocale(HttpClassicServerRequest request) {
         // 先解析 Cookie，如果没有则解析 Accept-Language 头。
         String newLocale = request.cookies().get(this.cookieName).map(Cookie::value).orElse(null);
-        if (StringUtils.isNotBlank(newLocale.trim())) {
+        if (StringUtils.isNotBlank(newLocale)) {
             return Locale.forLanguageTag(newLocale);
         }
 
         String acceptLanguage = request.headers().first("Accept-Language").orElse(null);
-        if (StringUtils.isNotBlank(acceptLanguage.trim())) {
+        if (StringUtils.isNotBlank(acceptLanguage)) {
             return Locale.forLanguageTag(acceptLanguage);
         }
 

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

@@ -68,7 +68,7 @@ public List<String> mismatchPatterns() {
     public void doFilter(HttpClassicServerRequest request, HttpClassicServerResponse response,
             HttpServerFilterChain chain) throws DoHttpServerFilterException {
         try {
-            Locale responseLocale = Locale.forLanguageTag(this.resolveLocaleFromParam(request));
+            Locale responseLocale = this.resolveLocaleFromParam(request);
             // 如果参数中带有地区，说明用户想使用新地区执行后续的操作，直接设置地区。
             if (responseLocale != null) {
                 LocaleContextHolder.setLocale(responseLocale);
@@ -95,8 +95,12 @@ public Scope scope() {
         return this.scope;
     }
 
-    private String resolveLocaleFromParam(HttpClassicServerRequest request) {
+    private Locale resolveLocaleFromParam(HttpClassicServerRequest request) {
         Optional<String> paramLocale = request.queries().first("locale");
-        return paramLocale.orElse(null);
+        String localeString = paramLocale.orElse(null);
+        if (StringUtils.isNotBlank(localeString)) {
+            return Locale.forLanguageTag(localeString);
+        }
+        return null;
     }
 }