From 2e4ca4b2ad6682369dfe48b3964902ba4798383d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 28 Feb 2019 23:16:22 +0800
Subject: [PATCH] =?UTF-8?q?JTA=E4=BA=8B=E7=89=A9=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE3=E5=88=86=E9=92=9F?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml | 2 ++
 web/src/main/resources/config/application.yml           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index d0e50737..47c21021 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -47,6 +47,8 @@ jdbc:
   # JTA 分布式事务（v4.0.4+）
   jta:
     enabled: false
+    # 事务超时时间，单位毫秒（3分钟）
+    transactionTimeout: 180000
 
   # 表名前缀
   tablePrefix: js_
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 049138af..3eb2fa4b 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -124,6 +124,8 @@ jdbc:
 #  # JTA 分布式事务（v4.0.4+）
 #  jta:
 #    enabled: false
+#    # 事务超时时间，单位毫秒（3分钟）
+#    transactionTimeout: 180000
 
 #  # 表名前缀
 #  tablePrefix: js_