Merge remote-tracking branch 'origin/developing' into developing

robinji0 · robinji0 · commit 64d2becd4b2c · 2023-06-24T14:18:19.000+08:00
diff --git a/.github/workflows/release_test.yml b/.github/workflows/release_test.yml
@@ -104,7 +104,8 @@ jobs:
         run: |
           cd chat2db-client
           npm install 
-          npm run build:web:prod --appVersion=${{ steps.chat2db_version.outputs.substring }} --appPort=10822
+          npm run build:web:prod --appVersion=1.0.${{ github.run_id }} --appPort=10822
+
       # cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
       # 编译服务端java版本
       - name: Build Java
diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/i18n/I18nConfig.java b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/i18n/I18nConfig.java
@@ -4,7 +4,7 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
+import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 
 /**
  * Internationalized configuration
@@ -13,12 +13,10 @@
  */
 @Configuration
 public class I18nConfig {
-
     @Bean
-    public AcceptHeaderLocaleResolver localeResolver() {
-        final AcceptHeaderLocaleResolver resolver = new AcceptHeaderLocaleResolver();
+    public CookieLocaleResolver localeResolver() {
+        CookieLocaleResolver resolver = new CookieLocaleResolver("CHAT2DB.LOCALE");
         resolver.setDefaultLocale(Locale.US);
         return resolver;
     }
-
 }
