From cec1ded044e662e9de019eaaacc1ea3c76bda556 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 21 五月 2025 11:40:48 +0800
Subject: [PATCH] 项目开发人员在开发过程中修改了pom.xml配置文件，破坏了系统架构设计，造成pom凌乱，导致不好管理依赖，当下重新规范了pom.xml配置文件内容，使重新符合系统架构设计规范。
---
pms-parent/pms-common/src/main/java/com/dy/common/dataSource/DruidDataSourceConfig.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/dataSource/DruidDataSourceConfig.java b/pms-parent/pms-common/src/main/java/com/dy/common/dataSource/DruidDataSourceConfig.java
index 455b813..3f09532 100644
--- a/pms-parent/pms-common/src/main/java/com/dy/common/dataSource/DruidDataSourceConfig.java
+++ b/pms-parent/pms-common/src/main/java/com/dy/common/dataSource/DruidDataSourceConfig.java
@@ -12,17 +12,14 @@
public class DruidDataSourceConfig {
//缂栧啓鏂规硶,娉ㄥ叆DruidDataSource
- //杩樻湁璇存槑涓�涓嬩负浠�涔堟垜浠敞鍏ヨ嚜宸辩殑DataSource , 榛樿鐨凥iKariDatasource澶辨晥?
- //1. 榛樿鐨勬暟鎹簮 濡傞厤缃�? @ConditionalOnMissingBean({ DataSource.class, XADataSource.class })
- // 瑙ｈ閫氳繃@ConditionalOnMissingBean({ DataSource.class}) 鍒ゆ柇濡傛灉瀹瑰櫒鏈塂ataSource Bean 灏变笉娉ㄥ叆榛樿鐨凥iKariDatasource
+ //榛樿鐨勬暟鎹簮@ConditionalOnMissingBean({ DataSource.class, XADataSource.class })
+ //閫氳繃@ConditionalOnMissingBean({ DataSource.class}) 鍒ゆ柇濡傛灉瀹瑰櫒鏈塂ataSource Bean 灏变笉娉ㄥ叆榛樿鐨凥iKariDatasource
@ConfigurationProperties("spring.datasource")
@Bean
public DataSource dataSource() throws SQLException {
//1. 閰嶇疆浜� @ConfigurationProperties("spring.datasource")
// 灏卞彲浠ヨ鍙栧埌application.yml鐨勯厤缃�
//2. 鎴戜滑灏变笉闇�瑕佽皟鐢―ruidDataSource 瀵硅薄鐨剆etXxx, 浼氳嚜鍔ㄥ叧鑱�
-
- DruidDataSource druidDataSource = new DruidDataSource();
- return druidDataSource;
+ return new DruidDataSource();
}
}
--
Gitblit v1.8.0