Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-03-13 32eaa934c44a484ad22378501ecb6e96214f34b5

 ltkj-framework/src/main/java/com/ltkj/framework/datasource/DynamicDataSourceContextHolder.java

@@ -1,6 +1,5 @@
package com.ltkj.framework.datasource;

import com.ltkj.db.DataSourceContextHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -23,23 +22,20 @@
     */
    public static void setDataSourceType(String dsType) {
        log.info("切换到{}数据源", dsType);
//        CONTEXT_HOLDER.set(dsType);
        DataSourceContextHolder.setDataSourceKey(dsType);
        CONTEXT_HOLDER.set(dsType);
    }

    /**
     * 获得数据源的变量
     */
    public static String getDataSourceType() {
//        return CONTEXT_HOLDER.get();
        return DataSourceContextHolder.getDataSourceKey();
        return CONTEXT_HOLDER.get();
    }

    /**
     * 清空数据源变量
     */
    public static void clearDataSourceType() {
//        CONTEXT_HOLDER.remove();
        DataSourceContextHolder.clear();
        CONTEXT_HOLDER.remove();
    }
}