From 2cea8178ce65d2423facf02cdfcb72578e073efe Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 30 Apr 2025 14:42:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/config/DruidDataSourceConfig.java | 7 ++++++- .../software/manage/service/serviceimpl/CommonService.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/DruidDataSourceConfig.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/DruidDataSourceConfig.java index 6383885..17ce86e 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/DruidDataSourceConfig.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/DruidDataSourceConfig.java @@ -18,6 +18,11 @@ public class DruidDataSourceConfig { @ConfigurationProperties(prefix = "spring.datasource") @ConditionalOnProperty(name = "spring.datasource.type", havingValue = "com.alibaba.druid.pool.DruidDataSource") public DataSource druid() { - return new DruidDataSource(); + DruidDataSource druidDataSource = new DruidDataSource(); + druidDataSource.setValidationQuery("SELECT 1"); // 关键配置 + druidDataSource.setTestWhileIdle(true); + druidDataSource.setTimeBetweenEvictionRunsMillis(60000); + druidDataSource.setTestOnBorrow(false); // 禁用借出时检测 + return druidDataSource; } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 6becf9a..ae9ca67 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -675,7 +675,7 @@ public class CommonService { fileName, destPath, strategyStr, - fileName + "." + suffix); + finalEdFileInfo.getFileName() + "." + suffix); return ElectromagneticResultUtil.success(Optional.ofNullable(finalEdFileInfo).map(EdFileInfo::getId).orElse("")); }