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("")); }