msb-public-java
/
jeecg
mirror of https://gitee.com/jeecg/jeecg.git
1
0
Code Issues Projects Releases Wiki Activity

jeecg 3.6.4 maven修改

Browse Source
jeecg-3.6.4
zhangdaiscott 8 years ago
parent 8ad87e71e0
commit 8d31e8e86f
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File

45
pom.xml
Unescape View File

@ -12,9 +12,7 @@
<guava.version>16.0.1</guava.version>
<!-- 主要依赖库的版本定义 -->
<!-- update-begin author： xugj date:20160103 for: #851 controller 单元测试升级spring 版本 -->
<spring.version>4.0.9.RELEASE</spring.version>
<!-- update-end author： xugj date:20160103 for: #851 controller 单元测试升级spring 版本 -->
<hibernate.version>4.1.0.Final</hibernate.version>
<hibernate-common-annotations.version>4.0.2.Final</hibernate-common-annotations.version>
<hibernate-jpa.version>1.0.1.Final</hibernate-jpa.version>
@ -30,13 +28,11 @@
<javassist.version>3.15.0-GA</javassist.version>
<ant.version>1.6.5</ant.version>
<!-- todo 没有用到 <spring-jpa.versoin>2.0.8</spring-jpa.versoin>-->
<mybatis-spring.version>1.1.1</mybatis-spring.version>
<!-- 工具包 -->
<!-- json start -->
<jackson.version>1.8.4</jackson.version>
<!-- todo 没有用到 <jackson2.version>2.1.2</jackson2.version>-->
<jacksonframework.version>1.84</jacksonframework.version>
<json-lib.version>2.1</json-lib.version>
<fastjson-lib.version>1.2.6</fastjson-lib.version>
@ -66,7 +62,6 @@
<antlr.version>3.3</antlr.version>
<openoffice.version>3.2.1</openoffice.version>
<jodconverter.version>3.0-beta-4</jodconverter.version>
<!-- todo 为什么要引入struts的lib呢？-->
<xwork-core.version>2.1.6</xwork-core.version>
<!-- 数据库组件包 _start -->
@ -86,16 +81,7 @@
<!-- 测试依赖包 -->
<junit.version>4.7</junit.version>
<!-- update-begin author： xugj date:20160103 for: #851 controller 单元测试使用DEMO -->
<hamcrest.version>1.3</hamcrest.version>
<!-- update-end author： xugj date:20160103 for:#851 controller 单元测试DEMO -->
<!-- todo 没有用到 <mockito.version>1.9.5</mockito.version>-->
<!-- todo 没有用到 <powermock.version>1.5</powermock.version>-->
<!-- todo 没有用到 <selenium.version>2.28.0</selenium.version>-->
<!-- todo 没有用到 <jetty.version>7.6.8.v20121106</jetty.version>-->
<!-- Plugin的属性定义 -->
<!-- todo 没有用到 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
<!-- todo 没有用到 <jdk.version>1.6</jdk.version>-->
<CKFinder.version>2.4</CKFinder.version>
<!-- java生成缩略图 -->
@ -203,20 +189,16 @@
<groupId>org.jeecgframework</groupId>
<artifactId>minidao-pe</artifactId>
<version>${minidao.version}</version>
<!-- update-begin author： xugj date:20160103 for: #851 升级spring 到4.0.9 后不需要再引入 spring-asm -->
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
</exclusion>
<!-- update-start author： xugj date:20160125 -->
<exclusion>
<groupId>org.junit</groupId>
<artifactId>com.springsource.org.junit</artifactId>
</exclusion>
<!-- update-end author： xugj date:20160125 -->
</exclusions>
<!-- update-end author： xugj date:20160103 for: #851 升级spring 到4.0.9 后不需要再引入 spring-asm -->
</dependency>
<!-- ckfinder start -->
<dependency>
@ -311,8 +293,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<!-- todo 为什么要用4.2.3，而不是统一使用${hibernate.version} -->
<version>4.2.3.Final</version>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@ -385,7 +366,6 @@
<groupId>com.cloudhopper.proxool</groupId>
<artifactId>proxool</artifactId>
<version>${proxool.version}</version>
<!-- 许仙明加入 geronimo-javamail_1.4_spec后删除-->
<exclusions>
<exclusion>
<artifactId>geronimo-spec-javamail</artifactId>
@ -836,21 +816,17 @@
<version>${junit.version}</version>
</dependency>
<!-- hamcrest -->
<!-- update-begin author： xugj date:20160103 for: #851 Spring MVC Test Framework 需要 -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest.version}</version>
</dependency>
<!-- update-end author： xugj date:20160103 for: #851 Spring MVC Test Framework 需要 -->
<!-- update-begin author： xugj date:20160103 for: #851 Spring MVC controller 测试 解析json需要 -->
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>0.8.1</version>
<scope>test</scope>
</dependency>
<!-- update-end author： xugj date:20160103 for: #851 Spring MVC controller 测试 解析json需要 -->
<!-- spring -->
<dependency>
@ -919,7 +895,6 @@
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
</dependency>
<!-- 许仙明加入 geronimo-javamail_1.4_spec-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
@ -994,9 +969,25 @@
<version>1.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency> -->
</dependency>
<dependency>
<groupId>org.p3framework</groupId>
<artifactId>jeecg-p3-biz-mail</artifactId>
<version>1.0.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
-->
<!-- jeecg plugin end -->
<dependency>
<groupId>org.p3framework</groupId>
<artifactId>jeecg-p3-biz-mail</artifactId>
<version>1.0.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
<organization>

4
src/main/webapp/webpage/system/user/user.jsp
Unescape View File

@ -27,10 +27,10 @@
$("#orgSelect").combobox("setValues", ${orgIdList});
$("#orgSelect").combotree("setValues", ${orgIdList});
}); --%>
// update-start--Author:zhangguoming Date:20140826 for：将combobox修改为combotree
function openDepartmentSelect() {
$.dialog.setting.zIndex = 9999;
$.dialog.setting.zIndex = getzIndex();
var orgIds = $("#orgIds").val();

Write Preview
Loading…
Cancel
Save