diff --git a/len-activiti/pom.xml b/len-activiti/pom.xml index 0c11fb5275da735f22b60e8bacd6b6e22a7e8b82..51ae321d449c720eb05d33114e210712bfde1fa1 100644 --- a/len-activiti/pom.xml +++ b/len-activiti/pom.xml @@ -7,19 +7,18 @@ lenosp-2.0-SNAPSHOT 4.0.0 - len-activiti + jar len-activiti - http://maven.apache.org + https://gitee.com/zzdevelop/lenosp UTF-8 - 5.22.0 - + org.activiti @@ -54,7 +53,7 @@ junit junit - 4.12 + ${junit.version} @@ -62,7 +61,7 @@ com.len len-sys - lenosp-2.0-SNAPSHOT + ${lenosp.version} @@ -85,5 +84,4 @@ - diff --git a/len-blog/pom.xml b/len-blog/pom.xml index bb19071d777daa5f04737f88d69d3f9186202d43..14656f6ec18b6ee24baccf522f684b4e8d14ab6d 100644 --- a/len-blog/pom.xml +++ b/len-blog/pom.xml @@ -8,9 +8,15 @@ lenosp-2.0-SNAPSHOT 4.0.0 - len-blog + jar + + len-blog + https://gitee.com/zzdevelop/lenosp + + UTF-8 + @@ -21,10 +27,5 @@ com.len len-sys - - junit - junit - 4.12 - \ No newline at end of file diff --git a/len-common/pom.xml b/len-common/pom.xml index b10d3396d1bdec2276295cf3dae13a324ade62a4..e80f0c417843c37a2e4d3046f48e1d86486abb5c 100644 --- a/len-common/pom.xml +++ b/len-common/pom.xml @@ -11,7 +11,6 @@ jar len-common - https://gitee.com/zzdevelop/lenosp @@ -24,7 +23,7 @@ junit junit - 4.11 + ${junit.version} test diff --git a/len-core/pom.xml b/len-core/pom.xml index 7fe9853b1873ff213357af2f15419e44cf92985e..54a204fd343fa3c777afa0c87eff722ac8747605 100644 --- a/len-core/pom.xml +++ b/len-core/pom.xml @@ -7,12 +7,11 @@ lenosp-2.0-SNAPSHOT 4.0.0 - len-core - + jar len-core - http://maven.apache.org + https://gitee.com/zzdevelop/lenosp UTF-8 @@ -22,7 +21,7 @@ junit junit - 3.8.1 + ${junit.version} test @@ -30,9 +29,7 @@ javax.mail mail - 1.5.0-b01 + ${mail.version} - - diff --git a/len-core/src/main/java/com/len/base/BaseController.java b/len-core/src/main/java/com/len/base/BaseController.java index 90d67c099f07a06ffb7330f29d509a3eb395b22b..60a9bb711c8b5881f79fdc369b974dd5be73dd02 100644 --- a/len-core/src/main/java/com/len/base/BaseController.java +++ b/len-core/src/main/java/com/len/base/BaseController.java @@ -25,12 +25,16 @@ import com.len.util.MsHelper; import lombok.extern.slf4j.Slf4j; +/** + * 控制器基础抽象类 + * @author https://gitee.com/zzdevelop/lenosp 自行补充 + */ @Slf4j public abstract class BaseController { private static boolean isAjaxRequest(HttpServletRequest request) { String requestedWith = request.getHeader("x-requested-with"); - return requestedWith != null && requestedWith.equalsIgnoreCase("XMLHttpRequest"); + return "XMLHttpRequest".equalsIgnoreCase(requestedWith); } @InitBinder @@ -41,7 +45,7 @@ public abstract class BaseController { } @ExceptionHandler({UnauthorizedException.class, AuthorizationException.class}) - public String authorizationException(HttpServletRequest request, HttpServletResponse response) { + public String authorizationException(HttpServletRequest request) { if (isAjaxRequest(request)) { Map map = Maps.newHashMap(); map.put("code", "403"); diff --git a/len-sys/pom.xml b/len-sys/pom.xml index a70b1966ea6354c3575c48458fcd4b3585aed740..03e3e3e293dd7012e53017cc232e471fcc5872d3 100644 --- a/len-sys/pom.xml +++ b/len-sys/pom.xml @@ -7,11 +7,11 @@ lenosp-2.0-SNAPSHOT 4.0.0 - len-sys + jar len-sys - http://maven.apache.org + https://gitee.com/zzdevelop/lenosp UTF-8 @@ -22,10 +22,5 @@ com.len len-core - - junit - junit - 4.12 - diff --git a/len-web/pom.xml b/len-web/pom.xml index d9482f5f696a077e7610cbdcffd897ffbddc8d39..e9aed51b9e27ee4acd05dacfe1311baf7207fba0 100644 --- a/len-web/pom.xml +++ b/len-web/pom.xml @@ -8,18 +8,17 @@ 4.0.0 len-web - len-web - http://maven.apache.org jar + len-web + https://gitee.com/zzdevelop/lenosp - org.mybatis.generator mybatis-generator-core - 1.3.5 + ${mybatis-generator-core.version} org.springframework.boot @@ -42,7 +41,6 @@ com.len len-blog - lenosp-2.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index ba6542b21bc231738c7d9aad1cdb30abc673e9f5..585516137dbc8ada0d4e2a61b519a3666d3672a5 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,8 @@ lenosp pom lenosp-2.0-SNAPSHOT + https://gitee.com/zzdevelop/lenosp + org.springframework.boot spring-boot-starter-parent @@ -20,13 +22,14 @@ 1.8 lenosp-2.0-SNAPSHOT + 1.2.8 3.5.3 3.2.0 - 5.1.6 - 1.2.8 + 5.22.0 1.2.5 2.5.0 2.3.0 + 5.1.6 2.1.9.RELEASE 1.3.2 @@ -42,6 +45,8 @@ 3.7 1.3.2 + 4.12 + 1.5.0-b01 4.0.12 1.16.10 2.7.0 @@ -49,6 +54,7 @@ 1.2.41 1.7.25 2.0.1.Final + 1.3.5 6.0.10.Final 3.0.0