From e41884ae174dcd28a4bc5c89dc24185ff1e19ddd Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 30 Oct 2018 22:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90gen.enabled=E5=BC=80=E5=85=B3=EF=BC=9B=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=B3=BB=E7=BB=9F=E7=9B=91=E6=8E=A7state.enabled?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=EF=BC=9B=E5=8C=BA=E5=9F=9F=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/config/web/DruidStatConfig.java       |  2 +-
 .../modules/config/web/PageCacheConfig.java       |  4 +---
 .../src/main/resources/config/jeesite-core.yml    | 15 +++++++++------
 .../resources/views/modules/sys/areaForm.html     | 12 ++++++------
 web/src/main/resources/config/application.yml     | 13 ++++++++-----
 5 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java
index 9f86a281..37562adc 100644
--- a/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java
+++ b/modules/core/src/main/java/com/jeesite/modules/config/web/DruidStatConfig.java
@@ -18,7 +18,7 @@ import com.alibaba.druid.support.http.WebStatFilter;
  * @version 2017年11月30日
  */
 @Configuration
-@ConditionalOnProperty(name="druid.stat.enabled", havingValue="true", matchIfMissing=true)
+@ConditionalOnProperty(name="state.enabled", havingValue="true", matchIfMissing=true)
 public class DruidStatConfig {
 
 	/**
diff --git a/modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java
index 574fa514..73f1da01 100644
--- a/modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java
+++ b/modules/core/src/main/java/com/jeesite/modules/config/web/PageCacheConfig.java
@@ -3,8 +3,6 @@
  */
 package com.jeesite.modules.config.web;
 
-import org.springframework.context.annotation.Configuration;
-
 /**
  * 页面缓存，如果需要，则加入如下依赖并取消下面注释
 
@@ -25,7 +23,7 @@ ehcache:
  * @author ThinkGem
  * @version 2017年11月30日
  */
-@Configuration
+//@Configuration
 public class PageCacheConfig {
 
 //	/**
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 08497b19..67d27a46 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -49,11 +49,6 @@ jdbc:
   # 表名前缀
   tablePrefix: js_
 
-  # Druid连接池监控
-  druid:
-    stat:
-      enabled: true
-  
 #======================================#
 #========== Spring settings ===========#
 #======================================#
@@ -206,7 +201,7 @@ menu:
 # 国际化管理（专业版）
 lang:
   enabled: true
-  
+
 # 任务调度（个人版）
 job:
   enabled: true
@@ -250,6 +245,14 @@ job:
     trigger:
       enabled: false
 
+# 代码生成
+gen:
+  enabled: true
+
+# 系统监控
+state:
+  enabled: true
+
 ## 内容管理
 #cms:
 #
diff --git a/modules/core/src/main/resources/views/modules/sys/areaForm.html b/modules/core/src/main/resources/views/modules/sys/areaForm.html
index 10e236d2..f0529df5 100644
--- a/modules/core/src/main/resources/views/modules/sys/areaForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/areaForm.html
@@ -13,7 +13,7 @@
 			<div class="box-body">
 				<div class="form-unit">基本信息</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6 col-xs-9">
 						<div class="form-group">
 							<label class="control-label col-sm-4">上级区域：</label>
 							<div class="col-sm-8">
@@ -26,7 +26,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6 col-xs-9">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 								<span class="required ">*</span> 区域代码：<i class="fa icon-question hide"></i></label>
@@ -38,7 +38,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6 col-xs-9">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 								<span class="required ">*</span> 区域名称：<i class="fa icon-question hide"></i></label>
@@ -49,7 +49,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6 col-xs-9">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 								<span class="required ">*</span> 区域类型：<i class="fa icon-question hide"></i></label>
@@ -60,7 +60,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6 col-xs-9">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 								<span class="required ">*</span> 排序号：<i class="fa icon-question hide"></i></label>
@@ -73,7 +73,7 @@
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
+							<label class="control-label col-md-2 col-sm-3" title="">
 								<span class="required hide">*</span> 备注信息：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
 								<#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/>
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index ada6d994..7222033a 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -126,11 +126,6 @@ jdbc:
 #  # 表名前缀
 #  tablePrefix: js_
 
-#  # Druid连接池监控
-#  druid:
-#    stat:
-#      enabled: true
-
 #======================================#
 #========== Spring settings ===========#
 #======================================#
@@ -303,6 +298,14 @@ logging:
 #    trigger:
 #      enabled: false
 
+# 代码生成
+#gen:
+#  enabled: true
+
+# 系统监控
+#state:
+#  enabled: true
+
 #======================================#
 #========= Framework settings =========#
 #======================================#