SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #42.
This commit is contained in:
bgy
2023-10-09 22:54:42 +08:00
committed by Gitea
parent 8b60af90ab 5ec64621fe
commit 6db0bbc341
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/resources/application-druid.yml
+1 -1
View File
@@ -6,7 +6,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
username: root username: root
password: root123456 password: root123456
# 从库数据源 # 从库数据源
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
+2 -1
View File
@@ -25,6 +25,7 @@ public class ApplicationConfig
@Bean @Bean
public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
{ {
return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); // return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone("Asia/Shanghai");
} }
} }