diff --git a/pom.xml b/pom.xml index 50b8db46..938e7851 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,8 @@ 0.4.6 2.5.0 1.6.2 + + 1.1.1 1.0 1.4.4 @@ -96,7 +98,8 @@ 2.2 7.6.14.v20131031 - + + 1.18 8081 UTF-8 @@ -141,6 +144,8 @@ org.jeecgframework codegenerate ${codegenerate.version} + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/codegenerate-3.6.1.jar org.jeecgframework @@ -179,6 +184,10 @@ com.springsource org.quartz ${org.quartz.version} + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/org.quartz-1.6.2.jar + + @@ -579,10 +588,19 @@ ehcache-core ${ehcache.version} + + + + + + + - org.jeecgframework - freemarker-null + org.freemarker + freemarker ${freemarker.version} + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar @@ -661,11 +679,11 @@ ${openoffice.version} - - org.artofsolving - jodconverter - ${jodconverter.version} - + + + + + com.opensymphony @@ -700,10 +718,16 @@ ${spring.version} + + + + + + - org.jeecgframework + com.hynnet jacob - 1.0.0 + ${jacob.version} @@ -895,6 +919,24 @@ 4.3.1 + + + + + com.hynnet + jacob + 1.19 + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/jacob.jar + + + + org.artofsolving + jodconverter + ${jodconverter.version} + system + ${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4-20170917.jar + diff --git a/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar b/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar new file mode 100644 index 00000000..50f438df Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/freemarker-null-2.3.19.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jacob.jar b/src/main/webapp/WEB-INF/lib/jacob.jar new file mode 100644 index 00000000..06882a09 Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jacob.jar differ diff --git a/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4-20170917.jar b/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4-20170917.jar new file mode 100644 index 00000000..af626dac Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/jodconverter-3.0-beta-4-20170917.jar differ diff --git a/src/main/webapp/WEB-INF/lib/org.quartz-1.6.2.jar b/src/main/webapp/WEB-INF/lib/org.quartz-1.6.2.jar new file mode 100644 index 00000000..30dcee7b Binary files /dev/null and b/src/main/webapp/WEB-INF/lib/org.quartz-1.6.2.jar differ diff --git a/src/test/java/org/jeecgframework/test/demo/ControllerTestDemo.java b/src/test/java/org/jeecgframework/test/demo/ControllerTestDemo.java index 95a06c50..028bd533 100644 --- a/src/test/java/org/jeecgframework/test/demo/ControllerTestDemo.java +++ b/src/test/java/org/jeecgframework/test/demo/ControllerTestDemo.java @@ -40,7 +40,7 @@ public class ControllerTestDemo extends AbstractUnitTest{ //测试登录 @Test public void testLogin() throws Exception { - yyUtil.getProduct(); +// yyUtil.getProduct(); // Map paramMap = new HashMap(); // paramMap.put("formDate","2017-01-01"); // paramMap.put("lastUpdateTime","2017-01-01");