时间问题处理
This commit is contained in:
1 parent
41190a25ae
commit
d910c1afe8
66 files changed
+604
-393
No files matched your search
@@ -99,6 +99,8 @@
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<!-- LOCAL及强制会话时区需要8.0.23+,与Druid时间归一化一起部署。 -->
|
||||
<version>8.0.30</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 核心模块-->
|
||||
|
||||
@@ -6,8 +6,8 @@ spring:
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
#url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://192.168.3.243:3306/yuyue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
#url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true
|
||||
url: jdbc:mysql://192.168.3.243:3306/yuyue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true
|
||||
username: root
|
||||
password: Lqj7667213.520
|
||||
# 从库数据源
|
||||
@@ -55,4 +55,4 @@ spring:
|
||||
merge-sql: true
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
multi-statement-allow: true
|
||||
@@ -10,8 +10,8 @@ spring:
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
#url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://gitlab.chatshop.com.cn:3309/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
#url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true
|
||||
url: jdbc:mysql://gitlab.chatshop.com.cn:3309/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true
|
||||
username: root
|
||||
password: lqj7667213
|
||||
# 从库数据源
|
||||
@@ -66,4 +66,4 @@ lu:
|
||||
smtp-auth: true
|
||||
smtp-host: smtp.163.com
|
||||
user: 18959260806@163.com
|
||||
password: DAEXULJVBXRKICJP
|
||||
password: DAEXULJVBXRKICJP
|
||||
@@ -10,8 +10,8 @@ spring:
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
#url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://172.16.0.4:3308/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
#url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true
|
||||
url: jdbc:mysql://172.16.0.4:3308/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true
|
||||
username: root
|
||||
password: Lgkj@123
|
||||
# 从库数据源
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.ruoyi.web.controller.system;
|
||||
|
||||
import com.ruoyi.common.utils.DatabaseTimeZone;
|
||||
import org.junit.Test;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/** 旧驱动时区配置不能覆盖本地会话;其他连接参数保持原样。 */
|
||||
public class DatabaseTimeZoneTest {
|
||||
@Test
|
||||
public void replacesLegacyAndDuplicateTimeZonesWithoutChangingOtherOptions() {
|
||||
String url = "jdbc:mysql://db.invalid/pay?useSSL=true&serverTimezone=UTC"
|
||||
+ "&connectionTimeZone=GMT%2B8&forceConnectionTimeZoneToSession=false&characterEncoding=utf8";
|
||||
String expected = "jdbc:mysql://db.invalid/pay?useSSL=true&characterEncoding=utf8"
|
||||
+ "&connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true";
|
||||
assertEquals(expected, DatabaseTimeZone.normalizeMySqlUrl(url));
|
||||
assertEquals(expected, DatabaseTimeZone.normalizeMySqlUrl(expected));
|
||||
assertEquals("jdbc:mysql://db.invalid/pay?connectionTimeZone=LOCAL&forceConnectionTimeZoneToSession=true",
|
||||
DatabaseTimeZone.normalizeMySqlUrl("jdbc:mysql://db.invalid/pay"));
|
||||
assertEquals("jdbc:h2:mem:test", DatabaseTimeZone.normalizeMySqlUrl("jdbc:h2:mem:test"));
|
||||
}
|
||||
}
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
package com.ruoyi.web.controller.system;
|
||||
|
||||
import com.alibaba.druid.pool.DruidDataSource;
|
||||
import com.ruoyi.framework.config.DruidConfig;
|
||||
import com.ruoyi.framework.config.properties.DruidProperties;
|
||||
import org.junit.Test;
|
||||
import org.springframework.core.env.MapPropertySource;
|
||||
import org.springframework.core.env.StandardEnvironment;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/** 不创建物理连接,验证主从配置先绑定后归一化,且保留SSL和账户参数。 */
|
||||
public class DruidTimeZoneBindingTest {
|
||||
@Test
|
||||
public void normalizesBothSourcesAfterBindingWithoutOpeningConnections() throws Exception {
|
||||
Map<String, Object> values = new HashMap<>();
|
||||
for (String source : new String[] {"master", "slave"}) {
|
||||
String prefix = "spring.datasource.druid." + source;
|
||||
values.put(prefix + ".url", "jdbc:mysql://db.invalid/" + source + "?useSSL=true&serverTimezone=UTC");
|
||||
values.put(prefix + ".username", "test-user");
|
||||
}
|
||||
StandardEnvironment env = new StandardEnvironment();
|
||||
env.getPropertySources().addFirst(new MapPropertySource("test", values));
|
||||
DruidConfig config = new DruidConfig();
|
||||
java.lang.reflect.Field field = DruidConfig.class.getDeclaredField("environment");
|
||||
field.setAccessible(true);
|
||||
field.set(config, env);
|
||||
DruidProperties properties = mock(DruidProperties.class);
|
||||
when(properties.dataSource(any(DruidDataSource.class))).thenAnswer(invocation -> invocation.getArgument(0));
|
||||
for (DruidDataSource source : new DruidDataSource[] {
|
||||
(DruidDataSource) config.masterDataSource(properties),
|
||||
(DruidDataSource) config.slaveDataSource(properties)}) {
|
||||
try {
|
||||
assertEquals("test-user", source.getUsername());
|
||||
assertTrue(source.getUrl().contains("useSSL=true&connectionTimeZone=LOCAL"));
|
||||
assertTrue(source.getUrl().endsWith("forceConnectionTimeZoneToSession=true"));
|
||||
assertFalse(source.isInited());
|
||||
} finally {
|
||||
source.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user