Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

sen

2025-08-15 85b9dbfaa4afdc5738dcf97a40b50b58b1ee6ad6

 framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java

@@ -49,6 +49,15 @@
        return druidProperties.dataSource(dataSource);
    }

    @Bean
    @ConfigurationProperties("spring.datasource.druid.cwsj")
    @ConditionalOnProperty(prefix = "spring.datasource.druid.cwsj", name = "enabled", havingValue = "true")
    public DataSource cwsjDataSource(DruidProperties druidProperties)
    {
        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
        return druidProperties.dataSource(dataSource);
    }

    @Bean(name = "dynamicDataSource")
    @Primary
    public DynamicDataSource dataSource(DataSource masterDataSource)
@@ -56,6 +65,7 @@
        Map<Object, Object> targetDataSources = new HashMap<>();
        targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
        setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
        setDataSource(targetDataSources, DataSourceType.CWSJ.name(), "cwsjDataSource");
        return new DynamicDataSource(masterDataSource, targetDataSources);
    }