refactor(common): 替换线程本地会话上下文为CDI请求作用域

- 移除 SessionContextHolder 类及其 ThreadLocal 实现
- 引入新的 SessionContext 类，使用 @RequestScoped 注解
- 更新所有相关服务类以注入和使用新的 SessionContext
- 在 AuthFilter 中替换 SessionContextHolder 的使用
- 在 AbstractRepository 中更新会话上下文访问方式
- 在 AuditDataEventListener 中切换到新的会话上下文
- 在 TriggerFlowEventConsumer 中使用新的会话上下文并添加清理逻辑
- 在 ProcessEngineImpl 中更新调用者和操作员设置
- 在 BranchService 和 ProjectService 中更新用户ID获取方式
- 在调度相关的服务和监听器中统一使用新的会话上下文
- 移除手动清理会话上下文的代码，依赖CDI自动管理生命周期

Author: cjbi

flexmodel-server/src/main/java/dev/flexmodel/common/AbstractRepository.java

@@ -15,12 +15,15 @@ public abstract class AbstractRepository {
   @Inject
   protected SessionFactory sessionFactory;
 
+  @Inject
+  protected SessionContext sessionContext;
+
   protected Session getProjectSession(String projectId) {
     if (projectId != null) {
       // 仅当缓存的 projectId 与请求的一致时才复用 databaseName
-      String cachedProjectId = SessionContextHolder.getProjectId();
+      String cachedProjectId = sessionContext.getProjectId();
       if (projectId.equals(cachedProjectId)) {
-        String cachedDb = SessionContextHolder.getProjectDatabaseName();
+        String cachedDb = sessionContext.getProjectDatabaseName();
         if (cachedDb != null) {
           return sessionFactory.createSession(cachedDb);
         }
@@ -33,12 +36,12 @@ protected Session getProjectSession(String projectId) {
         if (project == null || project.getDatabaseName() == null) {
           throw new IllegalArgumentException("项目不存在或 databaseName 为空: " + projectId);
         }
-        SessionContextHolder.setProjectId(projectId);
-        SessionContextHolder.setProjectDatabaseName(project.getDatabaseName());
+        sessionContext.setProjectId(projectId);
+        sessionContext.setProjectDatabaseName(project.getDatabaseName());
         return sessionFactory.createSession(project.getDatabaseName());
       }
     }
-    String projectDatabaseName = SessionContextHolder.getProjectDatabaseName();
+    String projectDatabaseName = sessionContext.getProjectDatabaseName();
     if (projectDatabaseName != null) {
       return sessionFactory.createSession(projectDatabaseName);
     }

flexmodel-server/src/main/java/dev/flexmodel/common/AuditDataEventListener.java

@@ -1,20 +1,17 @@
 package dev.flexmodel.common;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import lombok.extern.slf4j.Slf4j;
 import dev.flexmodel.event.EventListener;
 import dev.flexmodel.event.PreChangeEvent;
 import dev.flexmodel.event.impl.PreInsertEvent;
 import dev.flexmodel.event.impl.PreUpdateEvent;
 import dev.flexmodel.model.EntityDefinition;
 import dev.flexmodel.model.field.TypedField;
-import dev.flexmodel.query.Query;
 import dev.flexmodel.session.SessionFactory;
-import dev.flexmodel.JsonUtils;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,6 +20,10 @@
 @Slf4j
 @ApplicationScoped
 public class AuditDataEventListener implements EventListener {
+
+  @Inject
+  SessionContext sessionContext;
+
   @Override
   public void onPreChange(PreChangeEvent event) {
     if (!"system".equals(event.getSchemaName())) {
@@ -36,8 +37,8 @@ public void onPreChange(PreChangeEvent event) {
 
   private void invokeData(PreChangeEvent event) {
     Map<String, Object> newData = event.getNewData();
-    String projectId = SessionContextHolder.getProjectId();
-    String userId = SessionContextHolder.getUserId();
+    String projectId = sessionContext.getProjectId();
+    String userId = sessionContext.getUserId();
     if (newData == null) {
       return;
     }

flexmodel-server/src/main/java/dev/flexmodel/common/SchemaRegistry.java

@@ -13,12 +13,14 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.microprofile.config.ConfigProvider;
 
 import javax.sql.DataSource;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -47,8 +49,25 @@ public class SchemaRegistry {
   @Inject
   ProjectService projectService;
 
+  @SuppressWarnings("all")
+  public Map<String, Object> getSystemVariables() {
+    Map all = new HashMap<>();
+    all.putAll(System.getenv());
+    all.putAll(System.getProperties());
+    Iterable<String> propertyNames = ConfigProvider.getConfig().getPropertyNames();
+    for (String propertyName : propertyNames) {
+      if (propertyName.isEmpty()) {
+        continue;
+      }
+      ConfigProvider.getConfig()
+        .getOptionalValue(propertyName, String.class)
+        .ifPresent(val -> all.put(propertyName, val));
+    }
+    return all;
+  }
+
   private String getContent(String template) {
-    return StringUtils.simpleRenderTemplate(template, SystemVariablesHolder.getSystemVariables());
+    return StringUtils.simpleRenderTemplate(template, getSystemVariables());
   }
 
   public List<String> getPhysicsModelNames(Project project) {

flexmodel-server/src/main/java/dev/flexmodel/common/SessionContext.java

@@ -0,0 +1,26 @@
+package dev.flexmodel.common;
+
+import jakarta.enterprise.context.RequestScoped;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 请求级别的会话上下文
+ * <p>
+ * 由 Quarkus CDI 管理生命周期：每次 HTTP 请求或手动激活的请求上下文会创建一个实例，
+ * 上下文结束时自动销毁，无需手动 clear()。
+ * <p>
+ * 虚拟线程友好：CDI @RequestScoped 由 Quarkus 内部管理上下文激活/停用，
+ *
+ * @author cjbi
+ */
+@RequestScoped
+@Getter
+@Setter
+public class SessionContext {
+
+  private String projectId;
+  private String projectDatabaseName;
+  private String userId;
+
+}

flexmodel-server/src/main/java/dev/flexmodel/common/SessionContextHolder.java

@@ -5,7 +5,7 @@
 import dev.flexmodel.codegen.entity.AuthApiKey;
 import dev.flexmodel.codegen.entity.AuthProviderConfig;
 import dev.flexmodel.codegen.entity.Project;
-import dev.flexmodel.common.SessionContextHolder;
+import dev.flexmodel.common.SessionContext;
 import dev.flexmodel.common.config.web.jwt.JwtService;
 import dev.flexmodel.project.ProjectService;
 import dev.flexmodel.projectauth.AuthProviderConfigService;
@@ -44,6 +44,8 @@ public class AuthFilter implements ContainerRequestFilter, ContainerResponseFilt
   AuthProviderConfigService authProviderConfigService;
   @Inject
   JwtService jwtService;
+  @Inject
+  SessionContext sessionContext;
 
   @Override
   public void filter(ContainerRequestContext requestContext) throws IOException {
@@ -222,10 +224,10 @@ private void fillSessionContextForUser(ContainerRequestContext requestContext, S
       if (project == null) {
         throw new AuthException("Project not found");
       }
-      SessionContextHolder.setProjectId(projectId);
-      SessionContextHolder.setProjectDatabaseName(projectService.resolveDatabaseName(projectId));
+      sessionContext.setProjectId(projectId);
+      sessionContext.setProjectDatabaseName(projectService.resolveDatabaseName(projectId));
     }
-    SessionContextHolder.setUserId(userId);
+    sessionContext.setUserId(userId);
     requestContext.setProperty("projectId", projectId);
     requestContext.setProperty("userId", userId);
   }
@@ -240,10 +242,10 @@ private void fillSessionContextForApiKey(ContainerRequestContext requestContext,
       if (project == null) {
         throw new AuthException("Project not found");
       }
-      SessionContextHolder.setProjectId(projectId);
-      SessionContextHolder.setProjectDatabaseName(projectService.resolveDatabaseName(projectId));
+      sessionContext.setProjectId(projectId);
+      sessionContext.setProjectDatabaseName(projectService.resolveDatabaseName(projectId));
     }
-    SessionContextHolder.setUserId(apiKey.getName());
+    sessionContext.setUserId(apiKey.getName());
     requestContext.setProperty("projectId", projectId);
   }
 
@@ -256,16 +258,17 @@ private void fillSessionContextForProvider(ContainerRequestContext requestContex
     if (project == null) {
       throw new AuthException("Project not found");
     }
-    SessionContextHolder.setProjectId(projectId);
-    SessionContextHolder.setProjectDatabaseName(project.getDatabaseName());
-    SessionContextHolder.setUserId(result.getUserId());
+    sessionContext.setProjectId(projectId);
+    sessionContext.setProjectDatabaseName(project.getDatabaseName());
+    sessionContext.setUserId(result.getUserId());
     requestContext.setProperty("projectId", projectId);
   }
 
   @Override
   public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
       throws IOException {
-    SessionContextHolder.clear();
+    // CDI @RequestScoped 自动管理生命周期，无需手动 clear
+    // SessionContext 在请求结束时由 CDI 自动销毁
   }
 
 }

flexmodel-server/src/main/java/dev/flexmodel/common/SystemVariablesHolder.java

@@ -1,14 +1,14 @@
 package dev.flexmodel.flow.consumer;
 
+import dev.flexmodel.common.SessionContext;
+import dev.flexmodel.flow.dto.StartProcessParamEvent;
+import dev.flexmodel.flow.dto.result.StartProcessResult;
+import dev.flexmodel.flow.service.FlowExecutionService;
+import dev.flexmodel.scheduling.JobExecutionLogService;
 import io.quarkus.vertx.ConsumeEvent;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
-import dev.flexmodel.flow.service.FlowExecutionService;
-import dev.flexmodel.flow.dto.StartProcessParamEvent;
-import dev.flexmodel.flow.dto.result.StartProcessResult;
-import dev.flexmodel.scheduling.JobExecutionLogService;
-import dev.flexmodel.common.SessionContextHolder;
 
 /**
  * @author cjbi
@@ -23,10 +23,13 @@ public class TriggerFlowEventConsumer {
   @Inject
   JobExecutionLogService jobExecutionLogService;
 
+  @Inject
+  SessionContext sessionContext;
+
   @ConsumeEvent("flow.start") // 监听特定地址的事件
   public void consume(StartProcessParamEvent param) {
-    SessionContextHolder.setProjectId(param.getProjectId());
-    SessionContextHolder.setUserId(param.getUserId());
+    sessionContext.setProjectId(param.getProjectId());
+    sessionContext.setUserId(param.getUserId());
     StartProcessResult result = null;
     try {
       result = flowExecutionService.startProcess(param);
@@ -39,6 +42,10 @@ public void consume(StartProcessParamEvent param) {
       if (param.getEventId() != null) {
         jobExecutionLogService.recordJobSuccess(param.getEventId(), result, System.currentTimeMillis() - param.getStartTime());
       }
+      // 清理会话上下文，避免状态泄漏到同一线程的下一次消息处理
+      sessionContext.setProjectId(null);
+      sessionContext.setProjectDatabaseName(null);
+      sessionContext.setUserId(null);
     }
 
   }

flexmodel-server/src/main/java/dev/flexmodel/common/config/web/filter/AuthFilter.java

@@ -1,14 +1,12 @@
 package dev.flexmodel.flow.service;
 
+import dev.flexmodel.common.SessionContext;
 import dev.flexmodel.flow.dto.param.*;
-import dev.flexmodel.flow.dto.param.*;
-import dev.flexmodel.flow.dto.result.*;
-import dev.flexmodel.common.SessionContextHolder;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
 import dev.flexmodel.flow.dto.result.*;
 import dev.flexmodel.flow.processor.DefinitionProcessor;
 import dev.flexmodel.flow.processor.RuntimeProcessor;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class ProcessEngineImpl implements ProcessService {
@@ -19,24 +17,27 @@ public class ProcessEngineImpl implements ProcessService {
   @Inject
   RuntimeProcessor runtimeProcessor;
 
+  @Inject
+  SessionContext sessionContext;
+
   @Override
   public CreateFlowResult createFlow(CreateFlowParam createFlowParam) {
-    createFlowParam.setCaller(SessionContextHolder.getUserId());
-    createFlowParam.setOperator(SessionContextHolder.getUserId());
+    createFlowParam.setCaller(sessionContext.getUserId());
+    createFlowParam.setOperator(sessionContext.getUserId());
     return definitionProcessor.create(createFlowParam);
   }
 
   @Override
   public UpdateFlowResult updateFlow(UpdateFlowParam updateFlowParam) {
-    updateFlowParam.setCaller(SessionContextHolder.getUserId());
-    updateFlowParam.setOperator(SessionContextHolder.getUserId());
+    updateFlowParam.setCaller(sessionContext.getUserId());
+    updateFlowParam.setOperator(sessionContext.getUserId());
     return definitionProcessor.update(updateFlowParam);
   }
 
   @Override
   public DeployFlowResult deployFlow(DeployFlowParam deployFlowParam) {
-    deployFlowParam.setCaller(SessionContextHolder.getUserId());
-    deployFlowParam.setOperator(SessionContextHolder.getUserId());
+    deployFlowParam.setCaller(sessionContext.getUserId());
+    deployFlowParam.setOperator(sessionContext.getUserId());
     return definitionProcessor.deploy(deployFlowParam);
   }