Parcourir la source

修改时区为上海时区

gy b il y a 2 ans
Parent
révision
5ec64621fe

+ 1
- 1
ruoyi-admin/src/main/resources/application-druid.yml Voir le fichier

6
         druid:
6
         druid:
7
             # 主库数据源
7
             # 主库数据源
8
             master:
8
             master:
9
-                url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
9
+                url: jdbc:mysql://121.40.189.20:3306/arbitrate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&useSSL=false
10
                 username: root
10
                 username: root
11
                 password: root123456
11
                 password: root123456
12
             # 从库数据源
12
             # 从库数据源

+ 2
- 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java Voir le fichier

25
     @Bean
25
     @Bean
26
     public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
26
     public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
27
     {
27
     {
28
-        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
28
+//        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
29
+        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone("Asia/Shanghai");
29
     }
30
     }
30
 }
31
 }