From 2f4a4b18f843a36b48b6b0a12b16565e5f9b7516 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 2 Jun 2018 12:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0jdbc.jta.enabled=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E5=BC=8F=E4=BA=8B=E5=8A=A1=E5=BC=80=E5=85=B3=EF=BC=88?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4false=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/state/web/EhCacheController.java  | 27 -------------------
 .../state/web/ServerStateController.java      | 27 -------------------
 .../main/resources/config/jeesite-core.yml    |  4 +++
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java
 delete mode 100644 modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java

diff --git a/modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java b/modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java
deleted file mode 100644
index 95aad88c..00000000
--- a/modules/core/src/main/java/com/jeesite/modules/state/web/EhCacheController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- */
-package com.jeesite.modules.state.web;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * EhCache管理
- * @author ThinkGem
- * @version 2017年12月31日
- */
-@Controller
-@RequestMapping(value="${adminPath}/state/ehcache")
-public class EhCacheController {
-
-	@RequiresPermissions("sys:stste:ehcache")
-	@RequestMapping(value="")
-	public String index(Model model){
-		model.addAttribute("message", "正在研发中，敬请期待！");
-		return "modules/state/ehcacheIndex";
-	}
-	
-}
diff --git a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java b/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java
deleted file mode 100644
index 86af7cb7..00000000
--- a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- */
-package com.jeesite.modules.state.web;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * 服务器状态
- * @author ThinkGem
- * @version 2017年12月31日
- */
-@Controller
-@RequestMapping(value="${adminPath}/state/server")
-public class ServerStateController {
-
-	@RequiresPermissions("sys:state:server")
-	@RequestMapping(value="")
-	public String index(Model model){
-		model.addAttribute("message", "正在研发中，敬请期待！");
-		return "modules/state/serverIndex";
-	}
-	
-}
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 9a90d685..d9893211 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -43,6 +43,10 @@ jdbc:
 #      init: 1
 #      minIdle: 3
 #      maxActive: 20
+  
+  # JTA 分布式事务
+  jta:
+    enabled: false
 
   # 表名前缀
   tablePrefix: js_