From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/common/config/ds/DataSourceConfig.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/config/ds/DataSourceConfig.java b/src/main/java/com/zy/common/config/ds/DataSourceConfig.java
index 755f6d3..e0cd18e 100644
--- a/src/main/java/com/zy/common/config/ds/DataSourceConfig.java
+++ b/src/main/java/com/zy/common/config/ds/DataSourceConfig.java
@@ -1,5 +1,7 @@
package com.zy.common.config.ds;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
@@ -8,6 +10,7 @@
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource;
+
@Configuration
public class DataSourceConfig {
@@ -32,12 +35,19 @@
// 娆℃暟鎹簮
@Bean(name = "slaveDataSource")
public DataSource secondaryDataSource() {
- return DataSourceBuilder.create()
- .driverClassName(driverClassName)
- .url(url)
- .username(username)
- .password(password)
- .build();
+ HikariConfig config = new HikariConfig();
+ config.setJdbcUrl(url);
+ config.setUsername(username);
+ config.setPassword(password);
+ config.setDriverClassName(driverClassName);
+ config.setInitializationFailTimeout(0L);
+ return new HikariDataSource( config);
+// return DataSourceBuilder.create()
+// .driverClassName(driverClassName)
+// .url(url)
+// .username(username)
+// .password(password)
+// .build();
}
--
Gitblit v1.9.1