From 26a418ccd04ad956c71c4c7d0b26127369803b01 Mon Sep 17 00:00:00 2001
From: aBiCDi <372903435@qq.com>
Date: Mon, 25 Nov 2019 13:43:28 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/jsite-framework.properties  | 8 ++++----
 jsite-web/pom.xml                                         | 2 +-
 jsite-web/src/main/resources/config/jsite-web.properties  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jsite-framework/src/main/resources/config/jsite-framework.properties b/jsite-framework/src/main/resources/config/jsite-framework.properties
index 08068fc8..21969f1f 100644
--- a/jsite-framework/src/main/resources/config/jsite-framework.properties
+++ b/jsite-framework/src/main/resources/config/jsite-framework.properties
@@ -1,11 +1,11 @@
 #redis settings
-redis.host=127.0.0.1
+redis.host=114.115.200.202
 redis.port=6379
-redis.password=
+redis.password=shibang
 
 #redis idGenerator
-redis.slave1.host=127.0.0.1
-redis.slave1.password=
+redis.slave1.host=192.168.3.4
+redis.slave1.password=6379
 redis.slave1.port=6379
 
 #redis.slave2.host=39.105.171.128
diff --git a/jsite-web/pom.xml b/jsite-web/pom.xml
index 3ba5fbc4..cb68c170 100644
--- a/jsite-web/pom.xml
+++ b/jsite-web/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
diff --git a/jsite-web/src/main/resources/config/jsite-web.properties b/jsite-web/src/main/resources/config/jsite-web.properties
index 72836bba..79d6e8fe 100644
--- a/jsite-web/src/main/resources/config/jsite-web.properties
+++ b/jsite-web/src/main/resources/config/jsite-web.properties
@@ -25,10 +25,10 @@ demoMode=true
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 
-jdbc.url=jdbc:mysql://localhost:3306/jsite-test?useUnicode=true&characterEncoding=utf-8&useSSL=false
+jdbc.url=jdbc:mysql://192.168.3.5:3306/jsite?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #jdbc.url=jdbc:mysql://localhost:3306/jsite?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-jdbc.password=xxxxxx
+jdbc.password=1234
 
 #mssql database settings
 #jdbc.type=mssql
-- 
Gitee


From 681236d0671186c9644bb804816fea527a1d95a4 Mon Sep 17 00:00:00 2001
From: 18016 <1101838066@qq.com>
Date: Mon, 25 Nov 2019 17:01:51 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/flow/flowModelList.html         |  2 +-
 .../views/modules/flow/flowProcessDeploy.html     | 15 ++++-----------
 .../views/modules/flow/flowProcessList.html       |  2 +-
 .../modules/flow/flowProcessRunningList.html      |  2 +-
 .../resources/views/modules/file/sysFileList.html |  2 +-
 .../views/modules/file/sysFileTreeIndex.html      |  2 +-
 .../views/modules/gen/genSchemeList.html          |  2 +-
 .../resources/views/modules/gen/genTableList.html |  2 +-
 .../resources/views/modules/sys/onlineList.html   |  2 +-
 .../resources/views/modules/sys/roleAssign.html   |  4 ++--
 .../views/modules/sys/selectUserToRole.html       |  2 +-
 .../views/modules/test/testDataList.html          |  2 +-
 .../views/modules/test/testDataMainList.html      |  2 +-
 .../views/modules/test/testTreeList.html          |  2 +-
 14 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/jsite-flowable/src/main/resources/views/modules/flow/flowModelList.html b/jsite-flowable/src/main/resources/views/modules/flow/flowModelList.html
index 26f7f4c8..1f02305b 100644
--- a/jsite-flowable/src/main/resources/views/modules/flow/flowModelList.html
+++ b/jsite-flowable/src/main/resources/views/modules/flow/flowModelList.html
@@ -41,7 +41,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'模型ID', name:'id', index:'a.id', width:90, align:"center" },
diff --git a/jsite-flowable/src/main/resources/views/modules/flow/flowProcessDeploy.html b/jsite-flowable/src/main/resources/views/modules/flow/flowProcessDeploy.html
index 068112b9..10bb10ad 100644
--- a/jsite-flowable/src/main/resources/views/modules/flow/flowProcessDeploy.html
+++ b/jsite-flowable/src/main/resources/views/modules/flow/flowProcessDeploy.html
@@ -3,7 +3,7 @@
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa fa-pencil-square-o"></i> 流程文件部署
+				<i class="fa fa-pencil-square-o"></i>流程文件部署
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -11,22 +11,18 @@
 		</div>
 		<form id="inputForm" enctype="multipart/form-data" action="${ctx}/act/process/deploy" method="post" class="form-horizontal">
 			<div class="box-body">
-				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
-							<label class="control-label col-sm-2" title="">流程分类：</i>
-							</label>
+							<label class="control-label col-sm-2" title="">流程分类：</label>
 							<div class="col-sm-8">
 								<#form:select path="category" name="label" data="getDictList:act_category" class="form-control required" />
 							</div>
 						</div>
 					</div>
-					
 				</div>
-				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 流程文件：<i class="fa icon-question hide"></i></label>
@@ -37,9 +33,7 @@
 						</div>
 					</div>
 				</div>
-				
 			</div>
-			
 			<div class="box-footer">
 				<div class="row">
 					<div class="col-sm-offset-2 col-sm-10">
@@ -54,7 +48,6 @@
 	</div>
 </div>
 <% } %>
-
 <script type="text/javascript">
 	$("#inputForm").validate({
 		submitHandler: function(form){
diff --git a/jsite-flowable/src/main/resources/views/modules/flow/flowProcessList.html b/jsite-flowable/src/main/resources/views/modules/flow/flowProcessList.html
index d7c6ba9c..57623f9e 100644
--- a/jsite-flowable/src/main/resources/views/modules/flow/flowProcessList.html
+++ b/jsite-flowable/src/main/resources/views/modules/flow/flowProcessList.html
@@ -31,7 +31,7 @@
 <script>
     $.fn.select2.defaults.set('width', '200px');
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'流程分类', name:'categoryName', index:'', width:90, align:"center"
diff --git a/jsite-flowable/src/main/resources/views/modules/flow/flowProcessRunningList.html b/jsite-flowable/src/main/resources/views/modules/flow/flowProcessRunningList.html
index 4370a659..e7fafdd8 100644
--- a/jsite-flowable/src/main/resources/views/modules/flow/flowProcessRunningList.html
+++ b/jsite-flowable/src/main/resources/views/modules/flow/flowProcessRunningList.html
@@ -36,7 +36,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'执行ID', name:'executionId', index:'', width:130, align:"center"
diff --git a/jsite-framework/src/main/resources/views/modules/file/sysFileList.html b/jsite-framework/src/main/resources/views/modules/file/sysFileList.html
index f73425d3..cb131660 100644
--- a/jsite-framework/src/main/resources/views/modules/file/sysFileList.html
+++ b/jsite-framework/src/main/resources/views/modules/file/sysFileList.html
@@ -36,7 +36,7 @@
 <% } %>
 <script>
 // 初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 		searchForm: $("#searchForm"),
 		columnModel: [
 			{header:'文件夹id', name:'fileTreeId',index:"a.file_tree_id",hidden:true},
diff --git a/jsite-framework/src/main/resources/views/modules/file/sysFileTreeIndex.html b/jsite-framework/src/main/resources/views/modules/file/sysFileTreeIndex.html
index 10476143..b9490334 100644
--- a/jsite-framework/src/main/resources/views/modules/file/sysFileTreeIndex.html
+++ b/jsite-framework/src/main/resources/views/modules/file/sysFileTreeIndex.html
@@ -35,7 +35,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-	$('#dataGrid').dataGrid({
+	$('#dataGrid').BTGrid({
 		searchForm: $("#searchForm"),
 		columnModel: [
 			{header:'名称', name:'name', index:'a.name', width:150, align:"left"},
diff --git a/jsite-framework/src/main/resources/views/modules/gen/genSchemeList.html b/jsite-framework/src/main/resources/views/modules/gen/genSchemeList.html
index 3721c76e..68d3cd8d 100644
--- a/jsite-framework/src/main/resources/views/modules/gen/genSchemeList.html
+++ b/jsite-framework/src/main/resources/views/modules/gen/genSchemeList.html
@@ -34,7 +34,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'方案名称', name:'name', index:'a.name', width:90, align:"center"},
diff --git a/jsite-framework/src/main/resources/views/modules/gen/genTableList.html b/jsite-framework/src/main/resources/views/modules/gen/genTableList.html
index 1fe58f23..b1e4a727 100644
--- a/jsite-framework/src/main/resources/views/modules/gen/genTableList.html
+++ b/jsite-framework/src/main/resources/views/modules/gen/genTableList.html
@@ -46,7 +46,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'表名', name:'name', index:'a.name', width:90, align:"center"},
diff --git a/jsite-framework/src/main/resources/views/modules/sys/onlineList.html b/jsite-framework/src/main/resources/views/modules/sys/onlineList.html
index 08f24cbc..e7a03282 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/onlineList.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/onlineList.html
@@ -43,7 +43,7 @@
 <% } %>
 <script>
 // 初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'用户名称', name:'userName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){
diff --git a/jsite-framework/src/main/resources/views/modules/sys/roleAssign.html b/jsite-framework/src/main/resources/views/modules/sys/roleAssign.html
index 2daa1b3e..31f2f6d3 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/roleAssign.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/roleAssign.html
@@ -62,7 +62,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'登录账号', name:'loginName', index:'a.login_name', width:200, align:"center"},
@@ -87,7 +87,7 @@ $('#dataGrid').dataGrid({
 	}
 });
 $('#btnDelUser').click(function(){
-	var userCodes = $('#dataGrid').dataGrid('getSelectRows');
+	var userCodes = $('#dataGrid').BTGrid('getSelectRows');
 	if (userCodes != null && userCodes.length > 0){
 		js.confirm('确认要取消列表中权重的用户角色权限吗？', function(){
 			js.ajaxRequest('${ctx}/sys/role/outrole', {
diff --git a/jsite-framework/src/main/resources/views/modules/sys/selectUserToRole.html b/jsite-framework/src/main/resources/views/modules/sys/selectUserToRole.html
index bf6f0d1b..16143c4a 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/selectUserToRole.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/selectUserToRole.html
@@ -54,7 +54,7 @@
 <% } %>
 <script>
 var selectData = JSON.parse(js.decodeURI('${selectData}')), selectNum = 0,
-dataGrid = $('#dataGrid').dataGrid({
+dataGrid = $('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'登录账号', name:'loginName', index:'a.login_name', width:200, align:"center"},
diff --git a/jsite-web/src/main/resources/views/modules/test/testDataList.html b/jsite-web/src/main/resources/views/modules/test/testDataList.html
index 40422a89..ae4cf8c2 100644
--- a/jsite-web/src/main/resources/views/modules/test/testDataList.html
+++ b/jsite-web/src/main/resources/views/modules/test/testDataList.html
@@ -34,7 +34,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'名称', name:'name', index:'a.name', width:90, align:"center"},
diff --git a/jsite-web/src/main/resources/views/modules/test/testDataMainList.html b/jsite-web/src/main/resources/views/modules/test/testDataMainList.html
index 052a8784..f800756c 100644
--- a/jsite-web/src/main/resources/views/modules/test/testDataMainList.html
+++ b/jsite-web/src/main/resources/views/modules/test/testDataMainList.html
@@ -34,7 +34,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'名称', name:'name', index:'a.name', width:90, align:"center"},
diff --git a/jsite-web/src/main/resources/views/modules/test/testTreeList.html b/jsite-web/src/main/resources/views/modules/test/testTreeList.html
index f8dc7d5d..266a88f4 100644
--- a/jsite-web/src/main/resources/views/modules/test/testTreeList.html
+++ b/jsite-web/src/main/resources/views/modules/test/testTreeList.html
@@ -26,7 +26,7 @@
 <% } %>
 <script>
 //初始化DataGrid对象
-$('#dataGrid').dataGrid({
+$('#dataGrid').BTGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
 		{header:'名称', name:'name', index:'a.name', width:90, align:"center"},
-- 
Gitee


From e07104540a258d9de15c58c74fb4bc815020032e Mon Sep 17 00:00:00 2001
From: luo <luoer111@163.com>
Date: Mon, 25 Nov 2019 17:21:59 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E6=97=B6=E9=97=B4=E4=B8=BA,=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E7=99=BB=E9=99=86=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/jsite-framework.properties    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsite-framework/src/main/resources/config/jsite-framework.properties b/jsite-framework/src/main/resources/config/jsite-framework.properties
index 21969f1f..94dede4a 100644
--- a/jsite-framework/src/main/resources/config/jsite-framework.properties
+++ b/jsite-framework/src/main/resources/config/jsite-framework.properties
@@ -35,7 +35,7 @@ apiPath=/api
 urlSuffix=.html
 
 #账号同时登陆数
-user.maxActive=1
+user.maxActive=3
 
 #是否允许异常信息输出到页面
 error.page.printErrorInfo=true
@@ -48,9 +48,9 @@ page.pageSize=15
 #============================#
 
 #会话超时， 单位：毫秒， 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
-session.sessionTimeout=1800000
+session.sessionTimeout=3600000
 #会话清理间隔时间， 单位：毫秒，2m=120000ms。
-session.sessionTimeoutClean=120000
+session.sessionTimeoutClean=3000000
 
 #索引页路径
 web.view.index=/a
-- 
Gitee


From 585dfb25eedbe835f4e68b54247328c9246e41b8 Mon Sep 17 00:00:00 2001
From: 18016 <1101838066@qq.com>
Date: Tue, 26 Nov 2019 16:09:36 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/views/modules/sys/userForm.html | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/jsite-framework/src/main/resources/views/modules/sys/userForm.html b/jsite-framework/src/main/resources/views/modules/sys/userForm.html
index 1d8dce69..d4d85889 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/userForm.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/userForm.html
@@ -7,11 +7,11 @@
 			</div>
 		</div>
 		
-		<#form:form id="inputForm" model="${user}" class="form-horizontal" action="${ctx}/sys/user/save" method="post">
+		<form id="inputForm" model="${user}" class="form-horizontal" action="${ctx}/sys/user/save" method="post">
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="用户名">
 								<span class="required" aria-required="true">*</span> 用户名: <i class="fa icon-question hide"></i>
@@ -21,7 +21,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="工号">
 								工号:
@@ -34,7 +34,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="登录名">
 								<span class="required" aria-required="true">*</span>登录名: <i class="fa icon-question hide"></i>
@@ -47,7 +47,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="用户类型">
 								<span class="required" aria-required="true">*</span> 用户类型: <i class="fa icon-question hide"></i>
@@ -60,7 +60,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="归属公司">
 								<span class="required" aria-required="true">*</span> 归属公司: <i class="fa icon-question hide"></i>
@@ -71,7 +71,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="归属部门">
 								<span class="required" aria-required="true">*</span> 归属部门: <i class="fa icon-question hide"></i>
@@ -85,7 +85,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="是否允许登录">
 								<span class="required" aria-required="true">*</span> 是否允许登录: <i class="fa icon-question hide"></i>
@@ -95,7 +95,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="邮箱">
 								邮箱:
@@ -108,7 +108,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="电话">
 								电话:
@@ -118,7 +118,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="手机">
 								手机:
@@ -131,7 +131,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="用户角色">
 								用户角色:
@@ -144,7 +144,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="上次登录">
 								备注:
@@ -167,7 +167,7 @@
 					</div>
 				</div>
 			</div>
-		</#form:form>
+		</form>
 	</div>
 </div>
 <% } %>
-- 
Gitee


From d0dde8343fed348a473bdbb85250bdec730f15c5 Mon Sep 17 00:00:00 2001
From: luo <luoer111@163.com>
Date: Tue, 26 Nov 2019 16:29:50 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A4?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsite/common/beetl/fn/ToDocument.java | 137 +++++++++---------
 .../resources/config/jsite-web.properties     |   4 +-
 2 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/jsite-framework/src/main/java/com/jsite/common/beetl/fn/ToDocument.java b/jsite-framework/src/main/java/com/jsite/common/beetl/fn/ToDocument.java
index 371934f4..2025fcf2 100644
--- a/jsite-framework/src/main/java/com/jsite/common/beetl/fn/ToDocument.java
+++ b/jsite-framework/src/main/java/com/jsite/common/beetl/fn/ToDocument.java
@@ -6,6 +6,7 @@ import com.jsite.common.lang.StringUtils;
 import com.jsite.common.mapper.JsonMapper;
 import com.jsite.modules.sys.entity.Dict;
 import com.jsite.modules.sys.utils.DictUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.beetl.core.BodyContent;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
@@ -119,86 +120,88 @@ public class ToDocument implements Function {
 		
 		// input 动态绑定数据 
 		List<Element> inputElmts = node.elements("input");
-		
-		for (Element element : inputElmts) {
-			String key = element.attribute("name").getValue();
-
-            JsonNode jNode;
-			String eleValue;
-			if(key.contains(".")) {
-				String[] arr = key.split("\\.");
-                jNode = data.get(arr[0])==null?null:data.get(arr[0]).get(arr[1]);
-			} else {
-				jNode = data.get(key);
-			}
+		if (CollectionUtils.isNotEmpty(inputElmts)) {
+			for (Element element : inputElmts) {
+				String key = element.attribute("name").getValue();
+
+				JsonNode jNode;
+				String eleValue;
+				if (key.contains(".")) {
+					String[] arr = key.split("\\.");
+					jNode = data.get(arr[0]) == null ? null : data.get(arr[0]).get(arr[1]);
+				} else {
+					jNode = data.get(key);
+				}
 //			JsonNode jNode = data.get(key);
-            eleValue = jNode == null ? "":jNode.asText("");
+				eleValue = jNode == null ? "" : jNode.asText("");
 
-			atr = element.attribute("type");
-			if(atr != null && atr.getValue().equals("radio")) {
-				Attribute atrRadio = element.attribute("value");
-				if(atrRadio.getValue().equals(eleValue)) {
-					element.addAttribute("checked", "true");
+				atr = element.attribute("type");
+				if (atr != null && atr.getValue().equals("radio")) {
+					Attribute atrRadio = element.attribute("value");
+					if (atrRadio.getValue().equals(eleValue)) {
+						element.addAttribute("checked", "true");
+					}
+					continue;
+				}
+				if (atr != null && atr.getValue().equals("checkbox")) {
+					continue;
+				}
+				if (atr != null && atr.getValue().equals("hidden") && element.attribute("value") != null) {
+					continue;
+				}
+				element.addAttribute("value", eleValue);
+
+				atr = element.attribute("class");
+				if (atr != null && atr.getValue().contains("readonly")) {
+					element.addAttribute("readonly", "readonly");
 				}
-				continue;
-			}
-			if(atr != null && atr.getValue().equals("checkbox")) {
-				continue;
-			}
-			if(atr != null && atr.getValue().equals("hidden") && element.attribute("value")!=null) {
-				continue;
-			}
-			element.addAttribute("value", eleValue);
-			
-			atr = element.attribute("class");
-			if(atr != null && atr.getValue().contains("readonly")) {
-				element.addAttribute("readonly", "readonly");
 			}
 		}
-		
 		//textarea 动态绑定
 		List<Element> txtAreaElmts = node.elements("textarea");
-		for (Element element : txtAreaElmts) {
-			
-			String key = element.attribute("name").getValue();
-			
-			JsonNode jNode = data.get(key);
-			element.setText(jNode==null?"":jNode.asText(""));
-			//element.addAttribute("value", jNode==null?"":jNode.asText(""));
-			
-			atr = element.attribute("class");
-			if(atr != null && atr.getValue().contains("readonly")&&jNode!=null) {
-				element.addAttribute("readonly", "readonly");
+		if (CollectionUtils.isNotEmpty(txtAreaElmts)) {
+			for (Element element : txtAreaElmts) {
+
+				String key = element.attribute("name").getValue();
+
+				JsonNode jNode = data.get(key);
+				element.setText(jNode == null ? "" : jNode.asText(""));
+				//element.addAttribute("value", jNode==null?"":jNode.asText(""));
+
+				atr = element.attribute("class");
+				if (atr != null && atr.getValue().contains("readonly") && jNode != null) {
+					element.addAttribute("readonly", "readonly");
+				}
 			}
+
 		}
-		
-		
 		// select model 设置默认选中项
 		List<Element> optElmts = node.elements("option");
-		for (Element element : optElmts) {
-			String opValue = element.attribute("value").getValue();
-			
-			String path = node.attribute("id").getValue();
-			String pathArr[];
-			
-			JsonNode jNode;
-			String ckValue;
-			
-			if(path.contains(".")) {
-				pathArr = path.split("\\.");
-				jNode = data.get(pathArr[0])==null?null:data.get(pathArr[0]).get(pathArr[1]);
-				ckValue = jNode==null?"":jNode.asText("");
-				
-			} else {
-				jNode = data.get(path);
-				ckValue = jNode==null?"":jNode.asText("");
-			}
-			
-			if(StringUtils.isNotBlank(ckValue) && ckValue.equals(opValue)) {
-				element.addAttribute("selected", "selected");
+		if (CollectionUtils.isNotEmpty(optElmts)) {
+			for (Element element : optElmts) {
+				String opValue = element.attribute("value").getValue();
+
+				String path = node.attribute("id").getValue();
+				String pathArr[];
+
+				JsonNode jNode;
+				String ckValue;
+
+				if (path.contains(".")) {
+					pathArr = path.split("\\.");
+					jNode = data.get(pathArr[0]) == null ? null : data.get(pathArr[0]).get(pathArr[1]);
+					ckValue = jNode == null ? "" : jNode.asText("");
+
+				} else {
+					jNode = data.get(path);
+					ckValue = jNode == null ? "" : jNode.asText("");
+				}
+
+				if (StringUtils.isNotBlank(ckValue) && ckValue.equals(opValue)) {
+					element.addAttribute("selected", "selected");
+				}
 			}
 		}
-		
 	}
 	
 	
diff --git a/jsite-web/src/main/resources/config/jsite-web.properties b/jsite-web/src/main/resources/config/jsite-web.properties
index 79d6e8fe..8a9b8b59 100644
--- a/jsite-web/src/main/resources/config/jsite-web.properties
+++ b/jsite-web/src/main/resources/config/jsite-web.properties
@@ -25,10 +25,10 @@ demoMode=true
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 
-jdbc.url=jdbc:mysql://192.168.3.5:3306/jsite?useUnicode=true&characterEncoding=utf-8&useSSL=false
+jdbc.url=jdbc:mysql://192.168.3.4:3306/jsite?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #jdbc.url=jdbc:mysql://localhost:3306/jsite?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-jdbc.password=1234
+jdbc.password=root
 
 #mssql database settings
 #jdbc.type=mssql
-- 
Gitee


From e378a1cb4ca84c71083f0b3d3fcab8b547844f82 Mon Sep 17 00:00:00 2001
From: 18016 <1101838066@qq.com>
Date: Tue, 26 Nov 2019 16:30:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/sys/officeForm.html         | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/jsite-framework/src/main/resources/views/modules/sys/officeForm.html b/jsite-framework/src/main/resources/views/modules/sys/officeForm.html
index 63123517..07a20bdf 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/officeForm.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/officeForm.html
@@ -6,11 +6,11 @@
 				<i class="fa fa-sitemap"></i>${office.isNewRecord?'添加机构':'修改机构信息'}
 			</div>
 		</div>
-		<#form:form id="inputForm" model="${office}" class="form-horizontal" action="${ctx}/sys/office/save" method="post">
+		<form id="inputForm" model="${office}" class="form-horizontal" action="${ctx}/sys/office/save" method="post">
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="上级区域">
 								上级机构:
@@ -27,7 +27,7 @@
 							</div>
 						</div>
 					</div>			
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="归属区域">
 								 <span class="required " aria-required="true">*</span>归属区域:<i class="fa icon-question hide"></i>
@@ -41,7 +41,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="机构名称">
 								<span class="required" aria-required="true">*</span> 机构名称:<i class="fa icon-question hide"></i></label>
@@ -50,7 +50,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="机构编码">
 								 机构编码：
@@ -63,7 +63,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="机构类型">
 								<span class="required " aria-required="true">*</span> 机构类型:<i class="fa icon-question hide"></i></label>
@@ -73,7 +73,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="机构级别">
                                 <span class="required " aria-required="true">*</span> 机构级别:<i class="fa icon-question hide"></i>
@@ -87,7 +87,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="主负责人">
 								主负责人:</label>
@@ -97,7 +97,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="副负责人">
 								 副负责人:
@@ -111,7 +111,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title=" 联系地址">
 								 联系地址:</label>
@@ -120,7 +120,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="邮政编码">
 								邮政编码:
@@ -133,7 +133,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="负责人">
 								 负责人:</label>
@@ -142,7 +142,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="电话">
 								电话:
@@ -155,7 +155,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="传真">
 								 传真:</label>
@@ -164,7 +164,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="邮箱">
 								邮箱:
@@ -177,7 +177,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="是否可用">
 								<span class="required " aria-required="true">*</span>是否可用:<i class="fa icon-question hide"></i>
@@ -189,7 +189,7 @@
 						</div>
 					</div>
 					
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="排序">
 								<span class="required " aria-required="true">*</span> 排序:<i class="fa icon-question hide"></i></label>
@@ -200,7 +200,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="备注信息">
 								备注：<i class="fa icon-question hide"></i>
@@ -223,7 +223,7 @@
 					</div>
 				</div>
 			</div>
-		</#form:form>
+		</form>
 	</div>
 </div>
 <% } %>
-- 
Gitee


From 37d7dcdbc7b0843c80686861ee30491f1102d77d Mon Sep 17 00:00:00 2001
From: 18016 <1101838066@qq.com>
Date: Thu, 28 Nov 2019 09:06:27 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=96=B9=E6=A1=88=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BA=E5=9F=9F=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/file/sysFileTreeForm.html   | 14 +++---
 .../views/modules/gen/genSchemeForm.html      | 26 +++++------
 .../resources/views/modules/sys/areaForm.html | 16 +++----
 .../resources/views/modules/sys/jobForm.html  |  6 +--
 .../resources/views/modules/sys/menuForm.html | 23 +++++-----
 .../resources/views/modules/sys/roleForm.html | 46 +++++++++----------
 .../views/modules/test/testDataForm.html      | 14 +++---
 .../views/modules/test/testDataMainForm.html  | 14 +++---
 .../views/modules/test/testTreeForm.html      |  8 ++--
 9 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/jsite-framework/src/main/resources/views/modules/file/sysFileTreeForm.html b/jsite-framework/src/main/resources/views/modules/file/sysFileTreeForm.html
index d43658b2..6f7df513 100644
--- a/jsite-framework/src/main/resources/views/modules/file/sysFileTreeForm.html
+++ b/jsite-framework/src/main/resources/views/modules/file/sysFileTreeForm.html
@@ -11,7 +11,7 @@
 				<#form:hidden path="id"/>
 				<% if(sysFileTree.isNewRecord) {%>
 					<div class="row">
-						<div class="col-xs-6">
+						<div class="col-md-6">
 							<div class="form-group">
 								<label class="control-label col-sm-4" title="根文件夹名称">
 									<span class="required " aria-required="true">*</span> 根文件夹名称：<i class="fa icon-question hide"></i></label>
@@ -20,7 +20,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="col-xs-6">
+						<div class="col-md-6">
 							<div class="form-group">
 								<label class="control-label col-sm-4" title="排序">
 									<span class="required " aria-required="true">*</span> 排序：<i class="fa icon-question hide"></i></label>
@@ -32,7 +32,7 @@
 						
 					</div>
 					<div class="row">
-						<div class="col-xs-12">
+						<div class="col-md-12">
 							<div class="form-group">
 								<label class="control-label col-sm-2" title="机房备注信息">
 									备注信息：<i class="fa icon-question hide"></i>
@@ -45,7 +45,7 @@
 					</div>
 				<%} else {%>
 					<div class="row">
-						<div class="col-xs-6">
+						<div class="col-md-6">
 							<div class="form-group">
 								<label class="control-label col-sm-4" title="父级文件夹名称">
 									<span class="required " aria-required="true">*</span> 父级文件夹名称：<i class="fa icon-question hide"></i></label>
@@ -60,7 +60,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="col-xs-6">
+						<div class="col-md-6">
 							<div class="form-group">
 								<label class="control-label col-sm-4" title="根文件夹名称">
 									<span class="required " aria-required="true">*</span> 根文件夹名称：<i class="fa icon-question hide"></i></label>
@@ -71,7 +71,7 @@
 						</div>
 					</div>
 					<div class="row">
-						<div class="col-xs-6">
+						<div class="col-md-6">
 							<div class="form-group">
 								<label class="control-label col-sm-4" title="排序">
 									<span class="required " aria-required="true">*</span> 排序：<i class="fa icon-question hide"></i></label>
@@ -82,7 +82,7 @@
 						</div>
 					</div>
 					<div class="row">
-						<div class="col-xs-12">
+						<div class="col-md-12">
 							<div class="form-group">
 								<label class="control-label col-sm-2" title="机房备注信息">
 									备注信息：<i class="fa icon-question hide"></i>
diff --git a/jsite-framework/src/main/resources/views/modules/gen/genSchemeForm.html b/jsite-framework/src/main/resources/views/modules/gen/genSchemeForm.html
index 164a72a8..8c89972f 100644
--- a/jsite-framework/src/main/resources/views/modules/gen/genSchemeForm.html
+++ b/jsite-framework/src/main/resources/views/modules/gen/genSchemeForm.html
@@ -9,12 +9,12 @@
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
 			</div>
 		</div>
-		<#form:form id="inputForm" model="${genScheme}" action="${ctx}/gen/genScheme/save" method="post" class="form-horizontal">
+		<form id="inputForm" model="${genScheme}" action="${ctx}/gen/genScheme/save" method="post" class="form-horizontal">
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<#form:hidden path="flag"/>
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 方案名称:<i class="fa icon-question hide"></i>
@@ -26,7 +26,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 模板分类:<i class="fa icon-question hide"></i></label>
@@ -39,7 +39,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title=""> 业务表名:</label>
 							<div class="col-sm-8">
@@ -51,7 +51,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 生成包路径:<i class="fa icon-question hide"></i>
@@ -64,7 +64,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 生成模块名:<i class="fa icon-question hide"></i></label>
@@ -77,7 +77,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title=""> 生成子模块名:</label>
 							<div class="col-sm-8">
@@ -89,7 +89,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 生成功能描述:<i class="fa icon-question hide"></i></label>
@@ -102,7 +102,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 生成功能名:<i class="fa icon-question hide"></i>
@@ -116,7 +116,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 生成功能作者:<i class="fa icon-question hide"></i></label>
@@ -129,7 +129,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title=""> 备注信息：</label>
 							<div class="col-sm-8">
@@ -140,7 +140,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title=""> 生成选项：</label>
 							<div class="col-sm-8">
@@ -165,7 +165,7 @@
 					</div>
 				</div>
 			</div>
-		</#form:form>
+		</form>
 	</div>
 </div>
 <% } %>
diff --git a/jsite-framework/src/main/resources/views/modules/sys/areaForm.html b/jsite-framework/src/main/resources/views/modules/sys/areaForm.html
index e2250081..bc8d322f 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/areaForm.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/areaForm.html
@@ -6,11 +6,11 @@
 				<i class="fa fa-sitemap"></i>${area.isNewRecord?'添加区域':'修改区域信息'}
 			</div>
 		</div>
-		<#form:form id="inputForm" model="${area}" class="form-horizontal" action="${ctx}/sys/area/save" method="post">
+		<form id="inputForm" model="${area}" class="form-horizontal" action="${ctx}/sys/area/save" method="post">
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="上级区域">
 								上级区域:
@@ -27,7 +27,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="区域类型">
 								 <span class="required " aria-required="true">*</span>区域类型:<i class="fa icon-question hide"></i>
@@ -41,7 +41,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="区域名称">
 								<span class="required " aria-required="true">*</span> 区域名称:<i class="fa icon-question hide"></i></label>
@@ -50,7 +50,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="编码">
 								 区域编码：
@@ -62,7 +62,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="排序">
 								<span class="required " aria-required="true">*</span>排序：<i class="fa icon-question hide"></i>
@@ -74,7 +74,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="备注信息">
 								备注：<i class="fa icon-question hide"></i>
@@ -97,7 +97,7 @@
 					</div>
 				</div>
 			</div>
-		</#form:form>
+		</form>
 	</div>
 </div>
 <% } %>
diff --git a/jsite-framework/src/main/resources/views/modules/sys/jobForm.html b/jsite-framework/src/main/resources/views/modules/sys/jobForm.html
index 52085af7..155fa6bd 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/jobForm.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/jobForm.html
@@ -9,7 +9,7 @@
 		<#form:form id="inputForm"  model="${jobAndTrigger}" action="${ctx}/sys/job/save" method="post" class="form-horizontal">
 			<div class="box-body">
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="完整的类路径名称，例如:cn.org.jsite....quartz.DemoJob">
 								<span class="required hide">*</span>任务类名称:<i class="fa icon-question"></i>
@@ -19,7 +19,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="定时任务分组">
 								<span class="required hide">*</span> 定时任务所在组:<i class="fa icon-question"></i>
@@ -32,7 +32,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="表达式，可以参考java quartzs关于时间配置说明"> 表达式:
 							<i class="fa icon-question"></i></label>
diff --git a/jsite-framework/src/main/resources/views/modules/sys/menuForm.html b/jsite-framework/src/main/resources/views/modules/sys/menuForm.html
index 80bd75c4..0c4b4ba4 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/menuForm.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/menuForm.html
@@ -1,5 +1,6 @@
 <% layout('/layout/default.html', {title: '菜单管理', libs: ['validate','icheck']}){ %>
 <div class="main-content">
+	<a href="myWebshell://hello">打开微信</a>
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
@@ -14,7 +15,7 @@
 				<div class="form-unit">基本信息</div>
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title=""> 上级菜单:</label>
 							<div class="col-sm-8">
@@ -24,7 +25,7 @@
 						</div>
 					</div>
 					
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 								<span class="required hide">*</span> 名称:<i class="fa icon-question hide"></i></label>
@@ -36,7 +37,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="点击菜单跳转的页面"> 链接:
 							<i class="fa icon-question"></i></label>
@@ -45,7 +46,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="链接地址打开的目标窗口，默认：mainFrame"> 目标:
 							<i class="fa icon-question"></i></label>
@@ -57,7 +58,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title=""> 图标:</label>
 							<div class="col-sm-8">
@@ -65,11 +66,12 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="排列顺序，升序。">
 								<span class="required hide">*</span> 排序:<i class="fa icon-question hide"></i>
-								<i class="fa icon-question"></i></label>
+								<i class="fa icon-question"></i>
+							</label>
 							<div class="col-sm-8">
 								<#form:input path="sort" maxlength="64" class="form-control required " />
 							</div>
@@ -78,7 +80,7 @@
 				</div>
 				
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="该菜单或操作是否显示到系统菜单中">
 								<span class="required hide">*</span> 可见:<i class="fa icon-question hide"></i>
@@ -89,7 +91,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="控制器中定义的权限标识，如：@RequiresPermissions(“权限标识”)"> 权限标识:
 							<i class="fa icon-question"></i></label>
@@ -103,7 +105,7 @@
 				<div class="form-unit">其它信息</div>
 				
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title=""> 备注信息：</label>
 							<div class="col-sm-10">
@@ -141,6 +143,5 @@
 			});
 	    }
 	});
-
 </script>
 
diff --git a/jsite-framework/src/main/resources/views/modules/sys/roleForm.html b/jsite-framework/src/main/resources/views/modules/sys/roleForm.html
index 31542e5d..9426af76 100644
--- a/jsite-framework/src/main/resources/views/modules/sys/roleForm.html
+++ b/jsite-framework/src/main/resources/views/modules/sys/roleForm.html
@@ -6,11 +6,11 @@
 				<i class="fa fa-sitemap"></i>${role.isNewRecord?'添加角色':'编辑角色'}
 			</div>
 		</div>
-		<#form:form id="inputForm" model="${role}" class="form-horizontal" action="${ctx}/sys/role/save" method="post">
+		<form id="inputForm" model="${role}" class="form-horizontal" action="${ctx}/sys/role/save" method="post">
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="归属机构">
 								<span class="required " aria-required="true">*</span> 归属机构:<i class="fa icon-question hide"></i></label>
@@ -21,9 +21,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="角色名称">
 								<span class="required " aria-required="true">*</span> 角色名称:<i class="fa icon-question hide"></i>
@@ -35,9 +35,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="英文名称">
 								<span class="required " aria-required="true">*</span> 英文名称:<i class="fa icon-question hide"></i></label>
@@ -49,9 +49,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="用户类型">
 								<span class="required" aria-required="true">*</span> 用户类型: <i class="fa icon-question hide"></i>
@@ -62,9 +62,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="角色类型">
 								<span class="required " aria-required="true">*</span> 角色类型:<i class="fa icon-question hide"></i></label>
@@ -73,16 +73,16 @@
 									<option value="assignment">任务分配</option>
 									<option value="security-role">管理角色</option>
 									<option value="user">普通角色</option>
-								</select>  
+								</select>
 								<span class="help-inline" title="activiti有3种预定义的组类型：security-role、assignment、user 如果使用Activiti Explorer，需要security-role才能看到manage页签，需要assignment才能claim任务">
 					工作流组用户组类型（任务分配：assignment、管理角色：security-role、普通角色：user）</span>
 							</div>
 						</div>
 					</div>
 				</div>
-			
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="是否系统数据">
 								<span class="required " aria-required="true">*</span>是否系统数据:<i class="fa icon-question hide"></i>
@@ -94,9 +94,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="是否可用">
 								<span class="required " aria-required="true">*</span>是否可用:<i class="fa icon-question hide"></i>
@@ -108,9 +108,9 @@
 						</div>
 					</div>
 				</div>
-			
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="数据范围">
 								<span class="required " aria-required="true">*</span>数据范围:<i class="fa icon-question hide"></i>
@@ -122,9 +122,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="备注信息"> 备注:</label>
 							<div class="col-sm-10">
@@ -133,9 +133,9 @@
 						</div>
 					</div>
 				</div>
-				
+
 				<div class="row">
-					<div class="col-xs-12">
+					<div class="col-md-12">
 						<div class="form-group">
 							<label class="control-label col-sm-2" title="角色授权"> 角色授权:</label>
 							<div class="col-sm-10">
@@ -147,7 +147,7 @@
 						</div>
 					</div>
 				</div>
-		
+
 			</div>
 			<div class="box-footer">
 				<div class="row">
@@ -159,7 +159,7 @@
 					</div>
 				</div>
 			</div>
-		</#form:form>
+		</form>
 	</div>
 </div>
 <% } %>
diff --git a/jsite-web/src/main/resources/views/modules/test/testDataForm.html b/jsite-web/src/main/resources/views/modules/test/testDataForm.html
index 1d7b1e25..35b8542e 100644
--- a/jsite-web/src/main/resources/views/modules/test/testDataForm.html
+++ b/jsite-web/src/main/resources/views/modules/test/testDataForm.html
@@ -13,7 +13,7 @@
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 归属用户：
@@ -24,7 +24,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 归属部门：
@@ -37,7 +37,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 归属区域：
@@ -48,7 +48,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 名称：
@@ -60,7 +60,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 性别：
@@ -70,7 +70,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 加入日期：
@@ -83,7 +83,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 备注信息：
diff --git a/jsite-web/src/main/resources/views/modules/test/testDataMainForm.html b/jsite-web/src/main/resources/views/modules/test/testDataMainForm.html
index 0e91ac3b..5b6f455b 100644
--- a/jsite-web/src/main/resources/views/modules/test/testDataMainForm.html
+++ b/jsite-web/src/main/resources/views/modules/test/testDataMainForm.html
@@ -13,7 +13,7 @@
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 归属用户：
@@ -24,7 +24,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 归属部门：
@@ -37,7 +37,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 归属区域：
@@ -48,7 +48,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 名称：
@@ -60,7 +60,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 性别：
@@ -70,7 +70,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 加入日期：
@@ -83,7 +83,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 备注信息：
diff --git a/jsite-web/src/main/resources/views/modules/test/testTreeForm.html b/jsite-web/src/main/resources/views/modules/test/testTreeForm.html
index 6254f7e9..06ffb720 100644
--- a/jsite-web/src/main/resources/views/modules/test/testTreeForm.html
+++ b/jsite-web/src/main/resources/views/modules/test/testTreeForm.html
@@ -10,7 +10,7 @@
 			<div class="box-body">
 				<#form:hidden path="id"/>
 				<div class="row">
-				    <div class="col-xs-6">
+				    <div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">父级：</label>
 							<div class="col-sm-8">
@@ -25,7 +25,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 名称：
@@ -37,7 +37,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 排序：
@@ -47,7 +47,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-6">
+					<div class="col-md-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
 							 备注信息：
-- 
Gitee