优化代码,解决已知问题。
This commit is contained in:
parent
d2cf904327
commit
2cea8178ce
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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(""));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue