1 Commits

Author SHA1 Message Date
jerryjzhang
ffe808c85e (fix)(docker)Fix Dockerfile.
Some checks are pending
supersonic CentOS CI / build (21) (push) Waiting to run
supersonic mac CI / build (21) (push) Waiting to run
supersonic ubuntu CI / build (21) (push) Waiting to run
supersonic windows CI / build (21) (push) Waiting to run
2025-03-01 22:13:20 +08:00
7 changed files with 30 additions and 20 deletions

View File

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

View File

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

View File

@@ -1,15 +1,27 @@
FROM supersonicbi/supersonic:0.9.10-SNAPSHOT # Use an official OpenJDK runtime as a parent image
FROM openjdk:21-jdk-bullseye
# Set the working directory in the container # Set the working directory in the container
WORKDIR /usr/src/app 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 # Argument to pass in the supersonic version at build time
ARG SUPERSONIC_VERSION ARG SUPERSONIC_VERSION
RUN apt-get --reinstall install libc-bin
# 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 the supersonic standalone zip file into the container
COPY assembly/build/supersonic-standalone-${SUPERSONIC_VERSION}.zip . COPY assembly/build/supersonic-standalone-${SUPERSONIC_VERSION}.zip .

View File

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

View File

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

View File

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

View File

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