新增代码生成gen.enabled开关；新增系统监控state.enabled开关；区域表单优化；

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 {
 
 	/**

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 {
 
 //	/**

modules/core/src/main/resources/config/jeesite-core.yml

@@ -49,11 +49,6 @@ jdbc:
   # 表名前缀
   tablePrefix: js_
 
-  # Druid连接池监控
-  druid:
-    stat:
-      enabled: true
-  
 #======================================#
 #========== Spring settings ===========#
 #======================================#
@@ -250,6 +245,14 @@ job:
     trigger:
       enabled: false
 
+# 代码生成
+gen:
+  enabled: true
+
+# 系统监控
+state:
+  enabled: true
+
 ## 内容管理
 #cms:
 #

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 "/>

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 =========#
 #======================================#