From 228b881e5a893ec010a194ac42011a4169d0c590 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 14:24:15 +0800
Subject: [PATCH] 料箱码查询优化
---
rsf-server/src/main/java/com/vincent/rsf/server/common/config/CusItemSyncDataSourceConfig.java | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/CusItemSyncDataSourceConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/CusItemSyncDataSourceConfig.java
index 10d816f..110609c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/CusItemSyncDataSourceConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/CusItemSyncDataSourceConfig.java
@@ -1,41 +1,23 @@
package com.vincent.rsf.server.common.config;
import com.alibaba.druid.pool.DruidDataSource;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.JdbcTemplate;
import javax.sql.DataSource;
/**
- * cus_item_sync_view 涓撶敤鍓簱杩炴帴锛涙湭閰嶇疆 cus-item-sync.datasource.url 鏃朵笉鍒涘缓 Bean锛屾煡璇㈠洖閫�涓诲簱 Mapper
+ * 榧庢嵎 涓撶敤鍓簱杩炴帴
*/
@Configuration
-@ConditionalOnProperty(prefix = "cus-item-sync.datasource", name = "url")
-@EnableConfigurationProperties(CusItemSyncDataSourceProperties.class)
+@ConditionalOnProperty(prefix = "spring.datasource.dj-cloud-wms", name = "url")
public class CusItemSyncDataSourceConfig {
@Bean(name = "cusItemSyncDataSource")
- public DataSource cusItemSyncDataSource(CusItemSyncDataSourceProperties p) {
- DruidDataSource ds = new DruidDataSource();
- ds.setUrl(p.getUrl());
- ds.setUsername(p.getUsername());
- ds.setPassword(p.getPassword());
- ds.setDriverClassName(p.getDriverClassName());
- ds.setInitialSize(2);
- ds.setMinIdle(2);
- ds.setMaxActive(10);
- ds.setMaxWait(30000);
- ds.setTestWhileIdle(true);
- ds.setValidationQuery("SELECT 'x'");
- return ds;
- }
-
- @Bean(name = "cusItemSyncJdbcTemplate")
- public JdbcTemplate cusItemSyncJdbcTemplate(@Qualifier("cusItemSyncDataSource") DataSource dataSource) {
- return new JdbcTemplate(dataSource);
+ @ConfigurationProperties(prefix = "spring.datasource.dj-cloud-wms")
+ public DataSource cusItemSyncDataSource() {
+ return new DruidDataSource();
}
}
--
Gitblit v1.9.1