From 8a4c9a0174d32be64ca8ca624283c3511cd47ef2 Mon Sep 17 00:00:00 2001
From: orange-form <3510245832@qq.com>
Date: Mon, 12 Aug 2024 04:40:33 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: orange-form <3510245832@qq.com>
---
 .../flow/config/CustomEngineConfigurator.java | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/OrangeFormsOpen-MybatisFlex/common/common-flow/src/main/java/com/orangeforms/common/flow/config/CustomEngineConfigurator.java b/OrangeFormsOpen-MybatisFlex/common/common-flow/src/main/java/com/orangeforms/common/flow/config/CustomEngineConfigurator.java
index bf9709a6..f64d3f43 100644
--- a/OrangeFormsOpen-MybatisFlex/common/common-flow/src/main/java/com/orangeforms/common/flow/config/CustomEngineConfigurator.java
+++ b/OrangeFormsOpen-MybatisFlex/common/common-flow/src/main/java/com/orangeforms/common/flow/config/CustomEngineConfigurator.java
@@ -1,39 +1,23 @@
 package com.orangeforms.common.flow.config;
 
-import com.orangeforms.common.core.config.DynamicDataSource;
+import com.orangeforms.common.core.config.DataSourceContextHolder;
 import com.orangeforms.common.core.constant.ApplicationConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.EngineConfigurator;
-import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
-
-import javax.sql.DataSource;
-import java.util.Map;
 
 /**
  * 服务启动过程中动态切换flowable引擎内置表所在的数据源。
  *
  * @author Jerry
- * @date 2024-07-02
+ * @date 2024-04-15
  */
 @Slf4j
 public class CustomEngineConfigurator implements EngineConfigurator {
 
     @Override
     public void beforeInit(AbstractEngineConfiguration engineConfiguration) {
-        DataSource dataSource = engineConfiguration.getDataSource();
-        if (dataSource instanceof TransactionAwareDataSourceProxy) {
-            TransactionAwareDataSourceProxy proxy = (TransactionAwareDataSourceProxy) dataSource;
-            DataSource targetDataSource = proxy.getTargetDataSource();
-            if (targetDataSource instanceof DynamicDataSource) {
-                DynamicDataSource dynamicDataSource = (DynamicDataSource) targetDataSource;
-                Map<Object, DataSource> dynamicDataSourceMap = dynamicDataSource.getResolvedDataSources();
-                DataSource flowDataSource = dynamicDataSourceMap.get(ApplicationConstant.COMMON_FLOW_AND_ONLINE_DATASOURCE_TYPE);
-                if (flowDataSource != null) {
-                    engineConfiguration.setDataSource(flowDataSource);
-                }
-            }
-        }
+        DataSourceContextHolder.setDataSourceType(ApplicationConstant.COMMON_FLOW_AND_ONLINE_DATASOURCE_TYPE);
     }
 
     @Override