Merge c2adb3314d into a5051c7225

assembly/bin/supersonic-daemon.bat

@@ -56,7 +56,7 @@ if "%command%"=="restart" (
    set "logDir=%baseDir%\logs"
    set "classpath=%baseDir%;%webDir%;%libDir%\*;%confDir%"
    set "property=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile%"
-   set "java-command=%property% -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%"
+   set "java-command=%property% -Xms1024m -Xmx1024m -cp %CLASSPATH% %MAIN_CLASS%"
    if not exist %logDir% mkdir %logDir%
    start /B java %java-command% >nul 2>&1
    timeout /t 10 >nul

assembly/bin/supersonic-daemon.sh

@@ -60,8 +60,7 @@ function runJavaService {
     JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}')
   fi
   export PATH=$JAVA_HOME/bin:$PATH
-  command="-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08
-  -Dapp_name=${local_app_name} -Xms1024m -Xmx2048m $main_class"
+  command="-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dapp_name=${local_app_name} -Xms1024m -Xmx1024m $main_class"
 
   mkdir -p $javaRunDir/logs
   java -Dspring.profiles.active="$profile" $command >/dev/null 2>$javaRunDir/logs/error.log &

docker/docker-compose.yml

@@ -38,11 +38,6 @@ services:
       S2_DB_PASSWORD: supersonic_password
     ports:
       - "9080:9080"
-    deploy:
-      resources:
-        limits:
-          cpus: "2.0"
-          memory: 2048M
     depends_on:
       supersonic_postgres:
         condition: service_healthy

webapp/packages/chat-sdk/src/components/ChatItem/index.tsx

@@ -420,7 +420,7 @@ const ChatItem: React.FC<Props> = ({
     if (!!queryResults) {
       const exportData = queryResults.map(item => {
         return Object.keys(item).reduce((result, key) => {
-          const columnName = queryColumns?.find(column => column.name === key)?.name || key;
+          const columnName = queryColumns?.find(column => column.nameEn === key)?.name || key;
           result[columnName] = item[key];
           return result;
         }, {});