From 86d3d04f40ca800549e4260f4333a865e6398e37 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 5 Feb 2018 20:31:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=AE=9E=E7=8E=B0=EF=BC=8C?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=8F=90=E4=BA=A4=E7=A9=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E5=A4=8D=E6=9D=82=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/sys/utils/LogUtils.java | 4 +-- web/bin/startup.bat | 8 +++-- web/pom.xml | 25 ++----------- .../modules/test/dao/TestDataChildDao.java | 2 +- .../jeesite/modules/test/dao/TestDataDao.java | 2 +- .../jeesite/modules/test/entity/TestData.java | 4 +-- .../modules/test/entity/TestDataChild.java | 2 +- .../modules/test/service/TestDataService.java | 2 +- .../modules/test/web/TestDataController.java | 2 +- .../views/modules/test/testDataForm.html | 35 +++++++++---------- 10 files changed, 34 insertions(+), 52 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java index 4a1fa1cf..8a4ac4b2 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java @@ -34,9 +34,9 @@ import com.jeesite.modules.sys.service.MenuService; import eu.bitwalker.useragentutils.UserAgent; /** - * 字典工具类 + * 日志工具类 * @author ThinkGem - * @version 2014-11-7 + * @version 2017-11-7 */ public class LogUtils { diff --git a/web/bin/startup.bat b/web/bin/startup.bat index b81510ec..15be1001 100644 --- a/web/bin/startup.bat +++ b/web/bin/startup.bat @@ -5,7 +5,7 @@ rem * rem * Author: ThinkGem@163.com rem */ echo. -echo [Ϣ] Web ̡ +echo [��Ϣ] ���� Web ���̡� echo. rem pause rem echo. @@ -16,8 +16,10 @@ cd %~dp0 cd ../ title %cd% -set JAVA_OPTS= -Xms256m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m +rem set JAVA_OPTS= -Xms256m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=512m +set JAVA_OPTS= -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -jar target/jeesite-web-4.0-SNAPSHOT.war +cd target/ +java -jar jeesite-web.war pause \ No newline at end of file diff --git a/web/pom.xml b/web/pom.xml index d2632f6e..e4d94a0f 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -76,6 +76,7 @@ + ${project.artifactId} ${project.basedir}/src/main/webapp/WEB-INF/classes/ @@ -83,30 +84,10 @@ org.springframework.boot spring-boot-maven-plugin - + - - org.apache.maven.plugins - maven-war-plugin - - - - - userfiles/**, - test/** - - ${project.build.directory}/${project.artifactId} - ${project.artifactId} - - false - - false - - + --> diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java index af857ae3..17729d0d 100644 --- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java +++ b/web/src/main/java/com/jeesite/modules/test/dao/TestDataChildDao.java @@ -10,7 +10,7 @@ import com.jeesite.modules.test.entity.TestDataChild; /** * 测试数据DAO接口 * @author ThinkGem - * @version 2018-01-31 + * @version 2018-02-05 */ @MyBatisDao public interface TestDataChildDao extends CrudDao { diff --git a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java index 7813a259..aaa05da3 100644 --- a/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java +++ b/web/src/main/java/com/jeesite/modules/test/dao/TestDataDao.java @@ -10,7 +10,7 @@ import com.jeesite.modules.test.entity.TestData; /** * 测试数据DAO接口 * @author ThinkGem - * @version 2018-01-31 + * @version 2018-02-05 */ @MyBatisDao public interface TestDataDao extends CrudDao { diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java index 84ba4dab..b6e7fbe0 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -22,7 +22,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; /** * 测试数据Entity * @author ThinkGem - * @version 2018-01-31 + * @version 2018-02-05 */ @Table(name="test_data", alias="a", columns={ @Column(name="id", attrName="id", label="编号", isPK=true), @@ -37,7 +37,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"), @Column(name="test_office_code", attrName="testOffice.officeCode", label="部门选择"), @Column(name="test_area_code", attrName="testAreaCode", label="区域选择"), - @Column(name="test_area_name", attrName="testAreaName", label="区域名称", isQuery=false), + @Column(name="test_area_name", attrName="testAreaName", label="区域名称"), @Column(includeEntity=DataEntity.class), }, joinTable={ @JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="testUser", alias="u10", diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index 2d28bebf..634016d1 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -20,7 +20,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; /** * 测试数据Entity * @author ThinkGem - * @version 2018-01-31 + * @version 2018-02-05 */ @Table(name="test_data_child", alias="a", columns={ @Column(name="id", attrName="id", label="编号", isPK=true), diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java index 33de0c26..21d44725 100644 --- a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java +++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java @@ -20,7 +20,7 @@ import com.jeesite.modules.test.dao.TestDataChildDao; /** * 测试数据Service * @author ThinkGem - * @version 2018-01-31 + * @version 2018-02-05 */ @Service @Transactional(readOnly=true) diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java index f959ee22..d7c656fd 100644 --- a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -26,7 +26,7 @@ import com.jeesite.modules.test.service.TestDataService; /** * 测试数据Controller * @author ThinkGem - * @version 2018-01-31 + * @version 2018-02-05 */ @Controller @RequestMapping(value = "${adminPath}/test/testData") diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index 8fbb36fe..32a39718 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -19,7 +19,7 @@
- <#form:input path="testInput" maxlength="200" class="form-control "/> + <#form:input path="testInput" maxlength="200" class="form-control"/>
@@ -30,7 +30,7 @@
- <#form:textarea path="testTextarea" rows="4" maxlength="200" class="form-control "/> + <#form:textarea path="testTextarea" rows="4" maxlength="200" class="form-control"/>
@@ -41,7 +41,7 @@
- <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control " /> + <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control" />
@@ -50,7 +50,7 @@
- <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control required" /> + <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control" />
@@ -61,7 +61,7 @@
- <#form:radio path="testRadio" dictType="sys_menu_type" class="form-control " /> + <#form:radio path="testRadio" dictType="sys_menu_type" class="form-control" />
@@ -70,7 +70,7 @@
- <#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control " /> + <#form:checkbox path="testCheckbox" dictType="sys_menu_type" class="form-control" />
@@ -81,7 +81,7 @@
- <#form:input path="testDate" readonly="true" maxlength="20" class="form-control Wdate required " + <#form:input path="testDate" readonly="true" maxlength="20" class="form-control Wdate required" dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
@@ -91,7 +91,7 @@
- <#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control Wdate required " + <#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control Wdate required" dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/>
@@ -106,7 +106,7 @@ <#form:treeselect id="testUser" title="用户" path="testUser.userCode" labelPath="testUser.userName" url="${ctx}/sys/office/treeData?isLoadUser=true" - class=" " allowClear="true"/> + class="" allowClear="true"/> @@ -118,7 +118,7 @@ <#form:treeselect id="testOffice" title="部门" path="testOffice.officeCode" labelPath="testOffice.officeName" url="${ctx}/sys/office/treeData" - class=" " allowClear="true"/> + class="" allowClear="true"/> @@ -132,7 +132,7 @@ <#form:treeselect id="testAreaCode" title="区域" path="testAreaCode" labelPath="testAreaName" url="${ctx}/sys/area/treeData" - class=" " allowClear="true"/> + class="" allowClear="true"/> @@ -143,7 +143,7 @@
- <#form:textarea path="remarks" rows="4" maxlength="500" class="form-control "/> + <#form:textarea path="remarks" rows="4" maxlength="500" class="form-control"/>
@@ -205,7 +205,7 @@ $("#testDataChildDataGrid").dataGrid({ {header:'状态', name:'status', editable:true, hidden:true}, {header:'主键', name:'id', editable:true, hidden:true}, {header:'排序号', name:'testSort', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'11', 'class':'form-control digits'}}, - {header:'父表主键', name:'testDataId.id', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'64', 'class':'form-control'}}, + {header:'父表主键', name:'testDataId.id', editable:true, hidden:true}, {header:'单行文本', name:'testInput', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}}, {header:'多行文本', name:'testTextarea', width:150, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, {header:'下拉框', name:'testSelect', width:100, @@ -218,7 +218,7 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'下拉多选', name:'testSelectMultiple', width:100, editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', - items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ $(element).select2().on("change",function(){$(this).valid()}); } @@ -261,7 +261,7 @@ $("#testDataChildDataGrid").dataGrid({ return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName'); }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { - return template('treeselectTpl', { + return js.template('treeselectTpl', { id: 'user_'+editOptions.id, title: '用户', name: 'testUser.userCode', value: val.split('|')[0], labelName: 'testUser.userName', labelValue: val.split('|')[1], @@ -275,7 +275,7 @@ $("#testDataChildDataGrid").dataGrid({ return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName'); }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { - return template('treeselectTpl', { + return js.template('treeselectTpl', { id: 'office_'+editOptions.id, title: '部门', name: 'testOffice.officeCode', value: val.split('|')[0], labelName: 'testOffice.officeName', labelValue: val.split('|')[1], @@ -289,7 +289,7 @@ $("#testDataChildDataGrid").dataGrid({ return js.val(row, 'testAreaCode')+'|'+js.val(row, 'testAreaName'); }, editable: true, edittype: "custom", editoptions: { custom_element: function(val, editOptions) { - return template('treeselectTpl', { + return js.template('treeselectTpl', { id: 'area_'+editOptions.id, title: '区域', name: 'testAreaCode', value: val.split('|')[0], labelName: 'testAreaName', labelValue: val.split('|')[1], @@ -298,7 +298,6 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'区域名称', name:'testAreaName', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'100', 'class':'form-control'}}, {header:'操作', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){ var actions = []; if (val == 'new'){