diff --git a/escheduler-api/src/main/resources/application.properties b/escheduler-api/src/main/resources/application.properties
index bf003bfdda..2709f419ef 100644
--- a/escheduler-api/src/main/resources/application.properties
+++ b/escheduler-api/src/main/resources/application.properties
@@ -2,15 +2,13 @@
server.port=12345
# session config
-server.session.timeout=7200
+server.servlet.session.timeout=7200
-
-server.context-path=/escheduler/
+server.servlet.context-path=/escheduler/
# file size limit for upload
-spring.http.multipart.max-file-size=1024MB
-spring.http.multipart.max-request-size=1024MB
+spring.servlet.multipart.max-file-size=1024MB
+spring.servlet.multipart.max-request-size=1024MB
#post content
-server.max-http-post-size=5000000
-
+server.jetty.max-http-post-size=5000000
diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtil.java b/escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtils.java
similarity index 87%
rename from escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtil.java
rename to escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtils.java
index d2d1ef203d..3520527c1a 100644
--- a/escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtil.java
+++ b/escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtils.java
@@ -21,16 +21,16 @@ import org.slf4j.LoggerFactory;
import java.sql.*;
-public class MysqlUtil {
+public class MysqlUtils {
- public static final Logger logger = LoggerFactory.getLogger(MysqlUtil.class);
+ public static final Logger logger = LoggerFactory.getLogger(MysqlUtils.class);
- private static MysqlUtil instance;
+ private static MysqlUtils instance;
- MysqlUtil() {
+ MysqlUtils() {
}
- public static MysqlUtil getInstance() {
+ public static MysqlUtils getInstance() {
if (null == instance) {
syncInit();
}
@@ -39,7 +39,7 @@ public class MysqlUtil {
private static synchronized void syncInit() {
if (instance == null) {
- instance = new MysqlUtil();
+ instance = new MysqlUtils();
}
}
@@ -75,8 +75,8 @@ public class MysqlUtil {
}
}
- public static void realeaseResource(ResultSet rs, PreparedStatement ps, Connection conn) {
- MysqlUtil.getInstance().release(rs,ps,conn);
+ public static void releaseResource(ResultSet rs, PreparedStatement ps, Connection conn) {
+ MysqlUtils.getInstance().release(rs,ps,conn);
if (null != rs) {
try {
rs.close();
diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java b/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java
index 96199b0725..6fc8a61417 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java
@@ -16,7 +16,7 @@
*/
package cn.escheduler.dao.upgrade;
-import cn.escheduler.common.utils.MysqlUtil;
+import cn.escheduler.common.utils.MysqlUtils;
import cn.escheduler.common.utils.ScriptRunner;
import cn.escheduler.dao.AbstractBaseDao;
import cn.escheduler.dao.datasource.ConnectionFactory;
@@ -98,7 +98,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException(e.getMessage(),e);
} finally {
- MysqlUtil.realeaseResource(null, null, conn);
+ MysqlUtils.releaseResource(null, null, conn);
}
@@ -126,7 +126,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException(e.getMessage(),e);
} finally {
- MysqlUtil.realeaseResource(null, null, conn);
+ MysqlUtils.releaseResource(null, null, conn);
}
@@ -152,7 +152,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException(e.getMessage(),e);
} finally {
- MysqlUtil.realeaseResource(null, null, conn);
+ MysqlUtils.releaseResource(null, null, conn);
}
@@ -179,7 +179,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException(e.getMessage(),e);
} finally {
- MysqlUtil.realeaseResource(null, null, conn);
+ MysqlUtils.releaseResource(null, null, conn);
}
@@ -207,7 +207,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException("sql: " + sql, e);
} finally {
- MysqlUtil.realeaseResource(rs, pstmt, conn);
+ MysqlUtils.releaseResource(rs, pstmt, conn);
}
}
@@ -277,7 +277,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException(e.getMessage(),e);
} finally {
- MysqlUtil.realeaseResource(null, pstmt, conn);
+ MysqlUtils.releaseResource(null, pstmt, conn);
}
}
@@ -316,7 +316,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException(e.getMessage(),e);
} finally {
- MysqlUtil.realeaseResource(null, pstmt, conn);
+ MysqlUtils.releaseResource(null, pstmt, conn);
}
}
@@ -338,7 +338,7 @@ public class UpgradeDao extends AbstractBaseDao {
logger.error(e.getMessage(),e);
throw new RuntimeException("sql: " + upgradeSQL, e);
} finally {
- MysqlUtil.realeaseResource(null, pstmt, conn);
+ MysqlUtils.releaseResource(null, pstmt, conn);
}
}
diff --git a/pom.xml b/pom.xml
index 3847b49fd3..4e9cc32dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
1.2.3
2.7.3
2.2.3
+ 2.9.8
@@ -163,27 +164,27 @@
org.apache.httpcomponents
httpclient
- 4.3.2
+ 4.4.1
org.apache.httpcomponents
httpcore
- 4.3.2
+ 4.4.1
com.fasterxml.jackson.core
jackson-annotations
- 2.8.6
+ ${jackson.version}
com.fasterxml.jackson.core
jackson-databind
- 2.8.6
+ ${jackson.version}
com.fasterxml.jackson.core
jackson-core
- 2.8.6
+ ${jackson.version}
@@ -241,8 +242,6 @@
1.10
-
-
ch.qos.logback
logback-classic
@@ -368,13 +367,13 @@
-
+
scm:git:https://github.com/analysys/EasyScheduler.git
scm:git:https://github.com/analysys/EasyScheduler.git
https://github.com/analysys/EasyScheduler.git
- HEAD
-
+ HEAD
+
@@ -435,7 +434,7 @@
-
+