wujianwei
2025-07-29 ffbbb0dc1d09d586ce1480f5fa2ab3d3c15aff06
新增财务数据库数据库
4个文件已修改
30 ■■■■■ 已修改文件
admin/src/main/resources/application-custom.yml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/main/resources/application.yml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
common/src/main/java/com/ruoyi/common/enums/DataSourceType.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/main/resources/application-custom.yml
@@ -40,6 +40,13 @@
      database:  #数据库名
      username:  #用户名
      password:  #密码
    cwsj: #从数据库
      enabled: true  #是否开启从数据库 关闭时以下信息可以不用配置
      ip: 61.143.42.70 # IP
      port: 12027 #端口
      database: zhjk_ot7 #数据库名
      username: root  #用户名
      password: Zh29_!DFFixS #密码
    druid: # 数据池
      statViewServlet: #管理控制台账号
        login-username: admin
admin/src/main/resources/application.yml
@@ -84,6 +84,12 @@
        url: jdbc:mysql://${custom.datasource.slave.ip}:${custom.datasource.slave.port}/${custom.datasource.slave.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: ${custom.datasource.slave.username}
        password: ${custom.datasource.slave.password}
      cwsj:
        # 从数据源开关/默认关闭
        enabled: ${custom.datasource.cwsj.enabled}
        url: jdbc:mysql://${custom.datasource.cwsj.ip}:${custom.datasource.cwsj.port}/${custom.datasource.cwsj.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: ${custom.datasource.cwsj.username}
        password: ${custom.datasource.cwsj.password}
      # 初始连接数
      initialSize: 5
      # 最小连接池数量
common/src/main/java/com/ruoyi/common/enums/DataSourceType.java
@@ -15,5 +15,10 @@
    /**
     * 从库
     */
    SLAVE
    SLAVE,
    /**
     * 财务数据库
     */
    CWSJ
}
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);
    }