fix:java.io.NotSerializableException: com.tencent.supersonic.common.pojo.Order (#2121)

(fix)(docker)Fix Dockerfile.

assembly/bin/supersonic-daemon.bat

@@ -55,8 +55,8 @@ if "%command%"=="restart" (
    set "webDir=%baseDir%\webapp"
    set "logDir=%baseDir%\logs"
    set "classpath=%baseDir%;%webDir%;%libDir%\*;%confDir%"
-   set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile% -Xms1024m
+   set "property=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Dspring.profiles.active=%profile%"
-   -Xmx1024m -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

common/src/main/java/com/tencent/supersonic/common/pojo/Order.java

@@ -3,11 +3,13 @@ package com.tencent.supersonic.common.pojo;
 import com.google.common.base.Objects;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import java.io.Serializable;
 
 import static com.tencent.supersonic.common.pojo.Constants.ASC_UPPER;
 
 @Data
-public class Order {
+public class Order implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     @NotBlank(message = "Invalid order column")
     private String column;

docker/Dockerfile

@@ -1,25 +1,15 @@
-# Use an official OpenJDK runtime as a parent image
+FROM supersonicbi/supersonic:0.9.10-SNAPSHOT
-FROM openjdk:21-jdk-bullseye
 
 # Set the working directory in the container
 WORKDIR /usr/src/app
 
+# Delete old supersonic installation directory and the symbolic link
+RUN rm -rf /usr/src/app/supersonic-standalone-0.9.10-SNAPSHOT
+RUN rm -f /usr/src/app/supersonic-standalone-latest
+
 # Argument to pass in the supersonic version at build time
 ARG SUPERSONIC_VERSION
 
-# Install necessary packages, including Postgres client
-RUN apt-get update && apt-get install -y postgresql-client
-
-# Install the vim editor.
-RUN apt-get update && apt-get install -y vim && \
-    rm -rf /var/lib/apt/lists/*
-
-# Update the package list and install iputils-ping.
-RUN apt-get update && apt-get install -y iputils-ping
-
-# 更新包列表并安装 dnsutils 包
-RUN apt-get update && apt-get install -y dnsutils
-
 # Copy the supersonic standalone zip file into the container
 COPY assembly/build/supersonic-standalone-${SUPERSONIC_VERSION}.zip .
 

docker/docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - 8.8.4.4
     healthcheck:
       test: ["CMD-SHELL", "sh -c 'pg_isready -U supersonic_user -d postgres'"]
-      interval: 30s
+      interval: 10s
       timeout: 10s
       retries: 5
 

launchers/standalone/src/main/resources/application-docker.yaml

@@ -4,9 +4,9 @@ spring:
     url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/${DB_NAME}?stringtype=unspecified
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
-
   sql:
     init:
+      continue-on-error: true
       mode: always
       username: ${DB_USERNAME}
       password: ${DB_PASSWORD}

launchers/standalone/src/main/resources/db/schema-mysql.sql

@@ -5,21 +5,21 @@ CREATE TABLE IF NOT EXISTS `s2_agent` (
     `examples` TEXT COLLATE utf8_unicode_ci DEFAULT NULL,
     `status` tinyint DEFAULT NULL,
     `model` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-    `tool_config` varchar(6000) COLLATE utf8_unicode_ci DEFAULT NULL,
+    `tool_config` TEXT COLLATE utf8_unicode_ci DEFAULT NULL,
-    `llm_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL,
+    `llm_config` TEXT COLLATE utf8_unicode_ci DEFAULT NULL,
     `chat_model_config` text COLLATE utf8_unicode_ci DEFAULT NULL,
-    `visual_config` varchar(2000)  COLLATE utf8_unicode_ci DEFAULT NULL,
+    `visual_config` TEXT  COLLATE utf8_unicode_ci DEFAULT NULL,
     `enable_search` tinyint DEFAULT 1,
     `enable_feedback` tinyint DEFAULT 1,
     `created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
     `created_at` datetime DEFAULT NULL,
     `updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
     `updated_at` datetime DEFAULT NULL,
-     `admin` varchar(3000) DEFAULT NULL COMMENT '管理员',
+     `admin` varchar(1000) DEFAULT NULL COMMENT '管理员',
-     `admin_org` varchar(3000) DEFAULT NULL COMMENT '管理员组织',
+     `admin_org` varchar(1000) DEFAULT NULL COMMENT '管理员组织',
      `is_open` tinyint DEFAULT NULL COMMENT '是否公开',
-     `viewer` varchar(3000) DEFAULT NULL COMMENT '可用用户',
+     `viewer` varchar(1000) DEFAULT NULL COMMENT '可用用户',
-     `view_org` varchar(3000) DEFAULT NULL COMMENT '可用组织',
+     `view_org` varchar(1000) DEFAULT NULL COMMENT '可用组织',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 

pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <properties>
-        <revision>0.9.10-SNAPSHOT</revision>
+        <revision>0.9.10</revision>
         <java.source.version>21</java.source.version>
         <java.target.version>21</java.target.version>
         <maven.compiler.source>21</maven.compiler.source>