时间问题处理
This commit is contained in:
1 parent
41190a25ae
commit
d910c1afe8
66 files changed
+604
-393
No files matched your search
@@ -10,7 +10,10 @@ import javax.servlet.ServletRequest;
|
||||
import javax.servlet.ServletResponse;
|
||||
import javax.sql.DataSource;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.context.properties.bind.Bindable;
|
||||
import org.springframework.boot.context.properties.bind.Binder;
|
||||
import org.springframework.core.env.Environment;
|
||||
import com.ruoyi.common.utils.DatabaseTimeZone;
|
||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -32,21 +35,31 @@ import com.ruoyi.framework.datasource.DynamicDataSource;
|
||||
@Configuration
|
||||
public class DruidConfig
|
||||
{
|
||||
@org.springframework.beans.factory.annotation.Autowired
|
||||
private Environment environment;
|
||||
|
||||
/** 先绑定用户配置,再归一化时区,避免@ConfigurationProperties后续覆盖修正后的URL。 */
|
||||
private DataSource createDataSource(String prefix, DruidProperties properties) {
|
||||
DruidDataSource source = DruidDataSourceBuilder.create().build();
|
||||
Binder.get(environment).bind(prefix, Bindable.ofInstance(source));
|
||||
source.setUrl(DatabaseTimeZone.normalizeMySqlUrl(source.getUrl()));
|
||||
org.slf4j.LoggerFactory.getLogger(DruidConfig.class).info(
|
||||
"数据库时间配置 source={} jvmZone={} connectionTimeZone=LOCAL forceSessionTimeZone=true",
|
||||
prefix, java.time.ZoneId.systemDefault());
|
||||
return properties.dataSource(source);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConfigurationProperties("spring.datasource.druid.master")
|
||||
public DataSource masterDataSource(DruidProperties druidProperties)
|
||||
{
|
||||
DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
|
||||
return druidProperties.dataSource(dataSource);
|
||||
return createDataSource("spring.datasource.druid.master", druidProperties);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConfigurationProperties("spring.datasource.druid.slave")
|
||||
@ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
|
||||
public DataSource slaveDataSource(DruidProperties druidProperties)
|
||||
{
|
||||
DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
|
||||
return druidProperties.dataSource(dataSource);
|
||||
return createDataSource("spring.datasource.druid.slave", druidProperties);
|
||||
}
|
||||
|
||||
@Bean(name = "dynamicDataSource")
|
||||
@@ -123,4 +136,4 @@ public class DruidConfig
|
||||
registrationBean.addUrlPatterns(commonJsPattern);
|
||||
return registrationBean;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user