From 9304aba1d5299f80db70f65a659807a6ffa1024d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 17:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application.yml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2e98aaa..7e33641 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 server:
   servlet:
     session:
-      timeout: 7200
+      timeout: 18000
   port: 8000
   undertow:
     io-threads: 16
@@ -66,6 +66,9 @@
 
 #mybatis datasource default HikariPool
 spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   datasource:
     hikari:
       idle-timeout: 600000  #10 min

--
Gitblit v1.8.0