Feature/native image

.github/workflows/ci.yml

@@ -122,6 +122,31 @@ jobs:
             -Dquarkus.container-image.username=${{ secrets.DOCKER_USERNAME }} \
             -Dquarkus.container-image.password=${{ secrets.DOCKER_PASSWORD }}
 
+  push-server-native-image:
+    name: Push server native docker image
+    needs: [ engine-test, server-test ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
+        with:
+          java-version: '25'
+          distribution: 'temurin'
+          cache: 'maven'
+          cache-dependency-path: '**/pom.xml'
+      - name: Build and push server native image
+        run: |
+          mvn -B -Dmaven.test.skip=true clean package -Pnative -pl flexmodel-server -am \
+            -Dquarkus.container-image.build=true \
+            -Dquarkus.container-image.push=true \
+            -Dquarkus.container-image.image=cjbi/flexmodel-server-native:latest \
+            -Dquarkus.container-image.username=${{ secrets.DOCKER_USERNAME }} \
+            -Dquarkus.container-image.password=${{ secrets.DOCKER_PASSWORD }}
+
   push-functions-runtime-image:
     name: Push functions-runtime docker image
     needs: [ functions-runtime-test ]

.gitignore

@@ -38,5 +38,6 @@ build/
 ### Project ###
 
 *.db
-flexmodel-server/logs/
-flexmodel-server/storage/
+/logs/
+/storage/
+/database/

README.md

@@ -32,7 +32,7 @@ Flexmodel 旨在为开发者提供一个开源、灵活且高度可定制的后
 
 ## 🛠️ 技术栈
 
-- **后端**: Java 25, Quarkus 3, Maven, GraalVM JavaScript, HikariCP.
+- **后端**: Java 25, Quarkus 3, Maven, QuickJS, Agroal.
 - **前端**: React, TypeScript, Ant Design v6, Tailwind CSS, Vite, @xyflow/react, ECharts, Monaco Editor.
 - **云函数**: Deno, Hono.js.
 - **协议**: REST API, GraphQL, MCP, WebSocket, SSE.

deploy/.gitignore

@@ -1,4 +1,2 @@
 /docker-compose/mysql/data/
-/docker-compose/database/
-/docker-compose/storage/
-.idea
+/docker-compose/flexmodel-sever/

deploy/docker-compose/.env

@@ -1,5 +1,12 @@
 CONTAINER_NAME_PREFIX=prod
 
+# 运行模式: native (GraalVM 原生镜像) 或 jvm (JVM 模式)
+# 切换方式：修改 FLEXMODEL_RUN_MODE 和 FLEXMODEL_SERVER_IMAGE 两行
+#   native → FLEXMODEL_SERVER_IMAGE=cjbi/flexmodel-server-native:latest
+#   jvm    → FLEXMODEL_SERVER_IMAGE=cjbi/flexmodel-server:latest
+FLEXMODEL_RUN_MODE=native
+FLEXMODEL_SERVER_IMAGE=cjbi/flexmodel-server-native:latest
+
 # mysql
 MYSQL_DATABASE=flexmodel
 MYSQL_ROOT_PASSWORD=123456

deploy/docker-compose/docker-compose.yml

@@ -54,25 +54,21 @@ services:
       - flexmodel
   flexmodel-server:
     container_name: ${CONTAINER_NAME_PREFIX}-flexmodel-server
-    image: cjbi/flexmodel-server:latest
+    image: ${FLEXMODEL_SERVER_IMAGE:-cjbi/flexmodel-server-native:latest}
     restart: always
     volumes:
-      - ./storage:/deployments/storage
-      - ./database:/deployments/database
-      - ./logs/flexmodel-server:/deployments/logs
+      - ./flexmodel-server/storage:/deployments/storage
+      - ./flexmodel-server/database:/deployments/database
+      - ./flexmodel-server/logs:/deployments/logs
     environment:
-      - |
-        JAVA_OPTS=
-        -Dfile.encoding=UTF-8
-        -Duser.timezone=GMT+8
-        -Dflexmodel.datasource.db-kind=mysql
-        -Dflexmodel.datasource.url=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}
-        -Dflexmodel.datasource.username=root
-        -Dflexmodel.datasource.password=${MYSQL_ROOT_PASSWORD}
-        -Dflexmodel.project-url-template=jdbc:mysql://mysql:3306/{{databaseName}}
-        -Dflexmodel.datasource.dev_test.db-kind=sqlite
-        -Dflexmodel.datasource.dev_test.url=jdbc:sqlite:file:database/sqlite_dev_test.db
-        -Dquarkus.rest-client.function-runtime.url=http://flexmodel-functions-runtime:9999
+      - TZ=GMT+08
+      - FLEXMODEL_DATASOURCE_DB_KIND=mysql
+      - FLEXMODEL_DATASOURCE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}
+      - FLEXMODEL_DATASOURCE_USERNAME=root
+      - FLEXMODEL_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - FLEXMODEL_PROJECT_URL_TEMPLATE=jdbc:mysql://mysql:3306/{{databaseName}}
+      - QUARKUS_REST_CLIENT_FUNCTION_RUNTIME_URL=http://flexmodel-functions-runtime:9999
+      - QUARKUS_HTTP_LIMITS_MAX_BODY_SIZE=100M
 
     networks:
       - flexmodel

flexmodel-engine/docs/API.md

@@ -199,11 +199,14 @@ schemaOps.dropIndex("User", "name_index");
 #### JDBC数据源
 
 ```java
-// 创建JDBC数据源
-DataSource dataSource = new HikariDataSource();
-((HikariDataSource) dataSource).setJdbcUrl("jdbc:mysql://localhost:3306/test");
-((HikariDataSource) dataSource).setUsername("root");
-((HikariDataSource) dataSource).setPassword("password");
+// 创建JDBC数据源（以 Agroal 连接池为例）
+AgroalDataSourceConfigurationSupplier config = new AgroalDataSourceConfigurationSupplier();
+AgroalConnectionPoolConfigurationSupplier poolConfig = config.connectionPoolConfiguration();
+AgroalConnectionFactoryConfigurationSupplier factoryConfig = poolConfig.connectionFactoryConfiguration();
+factoryConfig.jdbcUrl("jdbc:mysql://localhost:3306/test");
+factoryConfig.principal(new NamePrincipal("root"));
+factoryConfig.credential(new SimplePassword("password"));
+DataSource dataSource = AgroalDataSource.from(config);
 
 JdbcDataSourceProvider jdbcProvider = new JdbcDataSourceProvider(dataSource);
 ```
@@ -477,12 +480,14 @@ try (Session session = sessionFactory.createSession("mySchema")) {
 ### 1. 连接池配置
 
 ```java
-HikariDataSource dataSource = new HikariDataSource();
-dataSource.setMaximumPoolSize(20);
-dataSource.setMinimumIdle(5);
-dataSource.setConnectionTimeout(30000);
-dataSource.setIdleTimeout(600000);
-dataSource.setMaxLifetime(1800000);
+AgroalDataSourceConfigurationSupplier config = new AgroalDataSourceConfigurationSupplier();
+AgroalConnectionPoolConfigurationSupplier poolConfig = config.connectionPoolConfiguration();
+poolConfig.maxSize(20);
+poolConfig.minSize(5);
+poolConfig.acquisitionTimeout(Duration.ofSeconds(30));
+poolConfig.reapTimeout(Duration.ofMinutes(10));
+poolConfig.maxLifetime(Duration.ofMinutes(30));
+DataSource dataSource = AgroalDataSource.from(config);
 ```
 
 ### 2. 查询优化

flexmodel-engine/docs/flexmodel-core.md

@@ -378,8 +378,11 @@ public class SessionConfig {
     @Produces
     @ApplicationScoped
     public SessionFactory sessionFactory() {
-        HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setJdbcUrl("jdbc:sqlite:file::memory:?cache=shared");
+        AgroalDataSourceConfigurationSupplier config = new AgroalDataSourceConfigurationSupplier();
+        config.connectionPoolConfiguration()
+              .connectionFactoryConfiguration()
+              .jdbcUrl("jdbc:sqlite:file::memory:?cache=shared");
+        DataSource dataSource = AgroalDataSource.from(config);
 
         return SessionFactory.builder()
             .setDefaultDataSourceProvider(new JdbcDataSourceProvider("system", dataSource))
@@ -471,10 +474,12 @@ public class FullNameCalculator implements FieldCalculator {
 ### 连接池配置
 
 ```java
-// 配置连接池
-DataSource datasource = new HikariDataSource();
-((HikariDataSource) datasource).setMaximumPoolSize(20);
-((HikariDataSource) datasource).setMinimumIdle(5);
+// 配置连接池（以 Agroal 为例）
+AgroalDataSourceConfigurationSupplier config = new AgroalDataSourceConfigurationSupplier();
+AgroalConnectionPoolConfigurationSupplier poolConfig = config.connectionPoolConfiguration();
+poolConfig.maxSize(20);
+poolConfig.minSize(5);
+DataSource datasource = AgroalDataSource.from(config);
 ```
 
 ### 缓存机制
@@ -514,10 +519,13 @@ public class MySQLIntegrationTests extends AbstractSessionTests {
 
     @BeforeAll
     public static void beforeAll() {
-        HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setJdbcUrl(container.getJdbcUrl());
-        dataSource.setUsername(container.getUsername());
-        dataSource.setPassword(container.getPassword());
+        AgroalDataSourceConfigurationSupplier config = new AgroalDataSourceConfigurationSupplier();
+        AgroalConnectionFactoryConfigurationSupplier factoryConfig = config.connectionPoolConfiguration()
+                .connectionFactoryConfiguration();
+        factoryConfig.jdbcUrl(container.getJdbcUrl());
+        factoryConfig.principal(new NamePrincipal(container.getUsername()));
+        factoryConfig.credential(new SimplePassword(container.getPassword()));
+        DataSource dataSource = AgroalDataSource.from(config);
         initSession(new JdbcDataSourceProvider("default", dataSource));
     }
 }

flexmodel-engine/flexmodel-codegen/pom.xml

@@ -44,8 +44,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.zaxxer</groupId>
-      <artifactId>HikariCP</artifactId>
+      <groupId>io.agroal</groupId>
+      <artifactId>agroal-pool</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

flexmodel-engine/flexmodel-codegen/src/main/java/dev/flexmodel/codegen/GenerationTool.java

@@ -30,7 +30,7 @@ public static void run(Configuration configuration) {
       new EnumGenerator().generate(context, targetDirectory);
       new SchemaGenerator().generate(context, targetDirectory);
       context.putVariable("buildItems", buildItems);
-      new BuildItemSPIFileGenerator().generate(context, schema.getBaseDir());
+//      new BuildItemSPIFileGenerator().generate(context, schema.getBaseDir());
     }
   }
 }

flexmodel-engine/flexmodel-codegen/src/main/java/dev/flexmodel/codegen/ObjectUtils.java

@@ -1,25 +1,70 @@
 package dev.flexmodel.codegen;
 
-import java.io.*;
+import dev.flexmodel.JsonUtils;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
 /**
+ * Object serialization utilities.
+ * <p>
+ * Uses Jackson JSON serialization (wrapped in Base64) instead of Java native
+ * serialization ({@link ObjectOutputStream}/{@link ObjectInputStream}) to avoid
+ * {@code serialVersionUID} incompatibility between JDK versions. JDK classes
+ * like {@link java.util.HashMap} and {@link java.util.ArrayList} change their
+ * {@code serialVersionUID} across releases, which breaks deserialization when
+ * the codegen JDK differs from the runtime JDK (e.g., in GraalVM native-image).
+ * </p>
+ *
  * @author cjbi
  */
 public class ObjectUtils {
 
+  private ObjectUtils() {
+  }
+
+  /**
+   * Serialize an object to a Base64-encoded JSON string.
+   * <p>
+   * The serialized format embeds the class name as the first line, followed by
+   * the JSON representation. This allows deserialization to reconstruct the
+   * exact object type without requiring an explicit type parameter.
+   * </p>
+   */
   public static String serialize(Object obj) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(baos);
-    oos.writeObject(obj);
-    oos.flush();
-    return Base64.getEncoder().encodeToString(baos.toByteArray());
+    String json = JsonUtils.toJsonString(obj);
+    String className = obj.getClass().getName();
+    String combined = className + "\n" + json;
+    return Base64.getEncoder().encodeToString(combined.getBytes(StandardCharsets.UTF_8));
   }
 
+  /**
+   * Deserialize a Base64-encoded JSON string back to an object.
+   * <p>
+   * The first line of the decoded data is the fully qualified class name,
+   * which is used to determine the target type for Jackson deserialization.
+   * </p>
+   *
+   * @param str Base64-encoded serialized data
+   * @return the deserialized object
+   * @throws IOException            if I/O error occurs
+   * @throws ClassNotFoundException if the target class cannot be found
+   */
   public static Object deserialize(String str) throws IOException, ClassNotFoundException {
     byte[] data = Base64.getDecoder().decode(str);
-    ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(data));
-    return ois.readObject();
+    String combined = new String(data, StandardCharsets.UTF_8);
+    int newlineIdx = combined.indexOf('\n');
+    if (newlineIdx < 0) {
+      throw new IOException("Invalid serialized format: missing class name header");
+    }
+    String className = combined.substring(0, newlineIdx);
+    String json = combined.substring(newlineIdx + 1);
+    @SuppressWarnings("unchecked")
+    Class<?> clazz = Class.forName(className);
+    return JsonUtils.parseToObject(json, clazz);
   }
 
 }

flexmodel-engine/flexmodel-codegen/src/main/java/dev/flexmodel/codegen/SchemaGenerator.java

@@ -7,7 +7,9 @@
 import java.io.PrintWriter;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Generates the schema BuildItem Java class.
@@ -38,6 +40,26 @@ public void write(PrintWriter out, GenerationContext context) {
         out.println("import dev.flexmodel.model.EnumDefinition;");
         out.println("import dev.flexmodel.model.SchemaObject;");
         out.println("import dev.flexmodel.ModelImportBundle;");
+      out.println("import dev.flexmodel.query.FilterExpression;");
+      out.println();
+
+      // Collect all imports from entity models' own import lists
+      Set<String> allEntityImports = new LinkedHashSet<>();
+      for (ModelClass model : modelClassList) {
+        for (String imp : model.getImports()) {
+          if (imp != null && !imp.isEmpty() && !imp.startsWith("dev.flexmodel.annotation")) {
+            allEntityImports.add(imp);
+          }
+        }
+        // Also add the entity class itself (may be needed for relation field references)
+        if (model.getFullClassName() != null && !model.getFullClassName().startsWith("null.")) {
+          allEntityImports.add(model.getFullClassName());
+        }
+      }
+      for (String importType : allEntityImports) {
+        out.println("import " + importType + ";");
+      }
+
         out.println();
         out.println("import java.util.ArrayList;");
         out.println("import java.util.List;");
@@ -74,6 +96,39 @@ public void write(PrintWriter out, GenerationContext context) {
         out.println("  }");
         out.println();
 
+      // === Entity field models (zero-reflection, instance fields) ===
+      // e.g.:  System.project.enabled.eq(true)
+      // First pass: declare the nested field class for each entity
+      for (ModelClass model : modelClassList) {
+        String entityName = model.getShortClassName();
+        String fieldsClassName = entityName + "Fields";
+        out.println("  /** Field references for {@link " + entityName + "} */");
+        out.println("  public static final class " + fieldsClassName + " {");
+        for (ModelField field : model.getAllFields()) {
+          String rawType = field.getShortTypeName();
+          if (rawType == null || rawType.isEmpty()) {
+            rawType = "Object";
+          }
+          String typeStr = boxType(rawType);
+          String variableName = field.getVariableName();
+          out.println("    public final FilterExpression<" + typeStr + "> "
+            + variableName + " = new FilterExpression<>(\"" + field.getOriginal().getName() + "\");");
+        }
+        out.println("  }");
+      }
+      out.println();
+
+      // Second pass: declare static instances, one per entity
+      for (ModelClass model : modelClassList) {
+        String entityName = model.getShortClassName();
+        String fieldsClassName = entityName + "Fields";
+        String instanceName = StringUtils.uncapitalize(entityName);
+        out.println("  /** {@link " + entityName + "} field references */");
+        out.println("  public static final " + fieldsClassName + " " + instanceName
+          + " = new " + fieldsClassName + "();");
+      }
+      out.println();
+
         // getData() method
         out.println("  @Override");
         out.println("  @SuppressWarnings(\"all\")");
@@ -122,4 +177,22 @@ private void writeDataBody(PrintWriter out, GenerationContext context) throws IO
             }
         }
     }
+
+  /**
+   * Box primitive types for use in generics (e.g. int → Integer).
+   */
+  private static String boxType(String type) {
+    return switch (type) {
+      case "int" -> "Integer";
+      case "long" -> "Long";
+      case "boolean" -> "Boolean";
+      case "double" -> "Double";
+      case "float" -> "Float";
+      case "short" -> "Short";
+      case "byte" -> "Byte";
+      case "char" -> "Character";
+      default -> type;
+    };
+  }
+
 }