From 19b373a58f9a843d7ddbd05d42990e5ffa2aad18 Mon Sep 17 00:00:00 2001 From: sanluan Date: Sat, 14 Nov 2020 16:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20=E6=A1=86=E6=9E=B6=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publiccms-parent/build.gradle | 10 +++++----- publiccms-parent/pom.xml | 10 +++++----- publiccms-parent/publiccms-analyzer/pom.xml | 4 ++-- publiccms-parent/publiccms-common/pom.xml | 2 +- publiccms-parent/publiccms-core/pom.xml | 4 ++-- .../com/publiccms/common/constants/CmsVersion.java | 4 ++-- .../com/publiccms/common/database/CmsUpgrader.java | 10 ++++++---- .../common/interceptor/CorsInterceptor.java | 4 ++-- .../common/interceptor/CsrfInterceptor.java | 4 ++-- .../common/interceptor/WebContextInterceptor.java | 4 ++-- ...004-preview.sql => V4.0.202004-V4.0.202011.sql} | 0 publiccms-parent/publiccms-dmdialect/pom.xml | 2 +- publiccms-parent/publiccms-j2cache/pom.xml | 4 ++-- publiccms-parent/publiccms-oauth/pom.xml | 4 ++-- publiccms-parent/publiccms-redis/pom.xml | 4 ++-- publiccms-parent/publiccms-trade/pom.xml | 4 ++-- publiccms-parent/publiccms/pom.xml | 14 +++++++------- .../src/main/resources/templates/admin/login.html | 2 +- 18 files changed, 46 insertions(+), 44 deletions(-) rename publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/{V4.0.202004-preview.sql => V4.0.202004-V4.0.202011.sql} (100%) diff --git a/publiccms-parent/build.gradle b/publiccms-parent/build.gradle index d498c52e..b05b9445 100644 --- a/publiccms-parent/build.gradle +++ b/publiccms-parent/build.gradle @@ -19,17 +19,17 @@ subprojects{ apply plugin: "eclipse-wtp" group = 'com.publiccms' - version = 'V4.0.202004.c' + version = 'V4.0.202011.a' test.enabled = false ext { // http://mvnrepository.com/artifact/org.springframework/spring-core // http://projects.spring.io/spring-framework/ - springVersion = "5.2.9.RELEASE" + springVersion = "5.2.10.RELEASE" // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web // https://projects.spring.io/spring-boot/ - springBootVersion = "2.3.4.RELEASE" + springBootVersion = "2.3.5.RELEASE" // http://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient // http://hc.apache.org/downloads.cgi httpclientVersion = "4.5.12" @@ -65,7 +65,7 @@ subprojects{ // https://mvnrepository.com/artifact/com.zaxxer/HikariCP hikariCPVersion = "3.4.5" // https://mvnrepository.com/artifact/mysql/mysql-connector-java - mysqlVersion = "8.0.21" + mysqlVersion = "8.0.22" // https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml poiVersion = "4.1.2" // http://mvnrepository.com/artifact/commons-fileupload/commons-fileupload @@ -79,7 +79,7 @@ subprojects{ // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core log4jVersion = "2.13.3" // https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor - extractorVersion = "2.14.0" + extractorVersion = "2.15.0" // http://mvnrepository.com/artifact/eu.bitwalker/UserAgentUtils userAgentUtilsVersion = "1.21" // https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api diff --git a/publiccms-parent/pom.xml b/publiccms-parent/pom.xml index 55eff97b..37fdc552 100644 --- a/publiccms-parent/pom.xml +++ b/publiccms-parent/pom.xml @@ -5,7 +5,7 @@ com.publiccms publiccms-parent pom - V4.0.202004.c + V4.0.202011.a publiccms publiccms-core @@ -22,10 +22,10 @@ UTF-8 - 5.2.9.RELEASE + 5.2.10.RELEASE - 2.3.4.RELEASE + 2.3.5.RELEASE 4.5.12 @@ -61,7 +61,7 @@ 3.4.5 - 8.0.21 + 8.0.22 4.1.2 @@ -75,7 +75,7 @@ 2.13.3 - 2.14.0 + 2.15.0 1.21 diff --git a/publiccms-parent/publiccms-analyzer/pom.xml b/publiccms-parent/publiccms-analyzer/pom.xml index fa4c29c2..746c17ae 100644 --- a/publiccms-parent/publiccms-analyzer/pom.xml +++ b/publiccms-parent/publiccms-analyzer/pom.xml @@ -8,13 +8,13 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-core - V4.0.202004.c + V4.0.202011.a org.apache.lucene diff --git a/publiccms-parent/publiccms-common/pom.xml b/publiccms-parent/publiccms-common/pom.xml index 3b27e17a..f5e9d724 100644 --- a/publiccms-parent/publiccms-common/pom.xml +++ b/publiccms-parent/publiccms-common/pom.xml @@ -5,7 +5,7 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a publiccms-common publiccms-common diff --git a/publiccms-parent/publiccms-core/pom.xml b/publiccms-parent/publiccms-core/pom.xml index d4c4d5c4..dca84edb 100644 --- a/publiccms-parent/publiccms-core/pom.xml +++ b/publiccms-parent/publiccms-core/pom.xml @@ -5,14 +5,14 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a publiccms-core com.publiccms publiccms-common - V4.0.202004.c + V4.0.202011.a com.zaxxer diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java index 4c38c2d6..5a101d94 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java @@ -21,13 +21,13 @@ public class CmsVersion { * @return version */ public static final String getVersion() { - return "V4.0.202004"; + return "V4.0.202011"; } /** * @return revision */ public static final String getRevision() { - return "c"; + return "a"; } /** diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java index e123da56..6642dcca 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/database/CmsUpgrader.java @@ -32,12 +32,12 @@ public class CmsUpgrader extends AbstractCmsUpgrader { */ private final static String VERSION_20170708 = "V2017.0708", VERSION_20180210 = "V4.0.20180210", VERSION_180707 = "V4.0.180707", VERSION_180825 = "V4.0.180825", VERSION_181024 = "V4.0.181024", - VERSION_190312 = "V4.0.190312"; + VERSION_190312 = "V4.0.190312", VERSION_202004 = "V4.0.202004"; /** * */ private final static List VERSION_LIST = Arrays.asList(VERSION_20170708, VERSION_20180210, VERSION_180707, - VERSION_180825, VERSION_181024, VERSION_190312); + VERSION_180825, VERSION_181024, VERSION_190312, VERSION_202004); public CmsUpgrader(Properties config) { super(config); @@ -62,7 +62,9 @@ public class CmsUpgrader extends AbstractCmsUpgrader { case VERSION_181024: runScript(stringWriter, connection, VERSION_181024, VERSION_190312); case VERSION_190312: - runScript(stringWriter, connection, VERSION_190312, CmsVersion.getVersion()); + runScript(stringWriter, connection, VERSION_190312, VERSION_202004); + case VERSION_202004: + runScript(stringWriter, connection, VERSION_202004, CmsVersion.getVersion()); } } @@ -84,7 +86,7 @@ public class CmsUpgrader extends AbstractCmsUpgrader { if (CommonUtils.notEmpty(timeZone)) { try { sb.append("&serverTimezone=GMT"); - if(!"Z".equalsIgnoreCase(timeZone)) { + if (!"Z".equalsIgnoreCase(timeZone)) { sb.append(URLEncoder.encode(timeZone, Constants.DEFAULT_CHARSET_NAME)); } } catch (UnsupportedEncodingException e) { diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CorsInterceptor.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CorsInterceptor.java index 2560ef39..0996b0a2 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CorsInterceptor.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CorsInterceptor.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.cors.CorsProcessor; import org.springframework.web.cors.DefaultCorsProcessor; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; import com.publiccms.logic.component.config.CorsConfigComponent; import com.publiccms.logic.component.site.SiteComponent; @@ -18,7 +18,7 @@ import com.publiccms.logic.component.site.SiteComponent; * */ @Component -public class CorsInterceptor extends HandlerInterceptorAdapter { +public class CorsInterceptor implements HandlerInterceptor { public static final CorsProcessor corsProcessor = new DefaultCorsProcessor(); @Autowired private CorsConfigComponent corsConfigComponent; diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CsrfInterceptor.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CsrfInterceptor.java index 723ac1d5..1f3d3d31 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CsrfInterceptor.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/CsrfInterceptor.java @@ -9,14 +9,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; import com.publiccms.common.annotation.Csrf; import com.publiccms.common.constants.CommonConstants; import com.publiccms.common.tools.ControllerUtils; import com.publiccms.common.tools.LanguagesUtils; -public class CsrfInterceptor extends HandlerInterceptorAdapter { +public class CsrfInterceptor implements HandlerInterceptor { protected Map methodCache = new HashMap<>(); private CsrfCache DEFAULT_CACHE = new CsrfCache(false, null); private boolean admin = false; diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/WebContextInterceptor.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/WebContextInterceptor.java index d3ad8226..8ff5d0e8 100644 --- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/WebContextInterceptor.java +++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/interceptor/WebContextInterceptor.java @@ -9,7 +9,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.util.UrlPathHelper; @@ -32,7 +32,7 @@ import com.publiccms.logic.service.sys.SysUserTokenService; * WebContextInterceptor 权限拦截器 * */ -public class WebContextInterceptor extends HandlerInterceptorAdapter { +public class WebContextInterceptor implements HandlerInterceptor { protected UrlPathHelper urlPathHelper = new UrlPathHelper(); protected final Log log = LogFactory.getLog(getClass()); @Autowired diff --git a/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202004-preview.sql b/publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202004-V4.0.202011.sql similarity index 100% rename from publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202004-preview.sql rename to publiccms-parent/publiccms-core/src/main/resources/initialization/upgrade/V4.0.202004-V4.0.202011.sql diff --git a/publiccms-parent/publiccms-dmdialect/pom.xml b/publiccms-parent/publiccms-dmdialect/pom.xml index c7069bec..df7393f6 100644 --- a/publiccms-parent/publiccms-dmdialect/pom.xml +++ b/publiccms-parent/publiccms-dmdialect/pom.xml @@ -6,7 +6,7 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a publiccms-dmdialect diff --git a/publiccms-parent/publiccms-j2cache/pom.xml b/publiccms-parent/publiccms-j2cache/pom.xml index ad8ab2ff..589e045d 100644 --- a/publiccms-parent/publiccms-j2cache/pom.xml +++ b/publiccms-parent/publiccms-j2cache/pom.xml @@ -5,14 +5,14 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a publiccms-j2cache com.publiccms publiccms-common - V4.0.202004.c + V4.0.202011.a diff --git a/publiccms-parent/publiccms-oauth/pom.xml b/publiccms-parent/publiccms-oauth/pom.xml index f9a00aca..329b806e 100644 --- a/publiccms-parent/publiccms-oauth/pom.xml +++ b/publiccms-parent/publiccms-oauth/pom.xml @@ -7,13 +7,13 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-core - V4.0.202004.c + V4.0.202011.a javax.servlet diff --git a/publiccms-parent/publiccms-redis/pom.xml b/publiccms-parent/publiccms-redis/pom.xml index 81241e1d..b3fe2bdd 100644 --- a/publiccms-parent/publiccms-redis/pom.xml +++ b/publiccms-parent/publiccms-redis/pom.xml @@ -8,13 +8,13 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-common - V4.0.202004.c + V4.0.202011.a org.mybatis diff --git a/publiccms-parent/publiccms-trade/pom.xml b/publiccms-parent/publiccms-trade/pom.xml index b378415a..b4affc8b 100644 --- a/publiccms-parent/publiccms-trade/pom.xml +++ b/publiccms-parent/publiccms-trade/pom.xml @@ -8,13 +8,13 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-core - V4.0.202004.c + V4.0.202011.a diff --git a/publiccms-parent/publiccms/pom.xml b/publiccms-parent/publiccms/pom.xml index 1a28eb24..80bf64cb 100644 --- a/publiccms-parent/publiccms/pom.xml +++ b/publiccms-parent/publiccms/pom.xml @@ -8,38 +8,38 @@ com.publiccms publiccms-parent - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-core - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-oauth - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-redis - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-j2cache - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-analyzer - V4.0.202004.c + V4.0.202011.a com.publiccms publiccms-trade - V4.0.202004.c + V4.0.202011.a mysql diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/login.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/login.html index 903b4d93..53520546 100644 --- a/publiccms-parent/publiccms/src/main/resources/templates/admin/login.html +++ b/publiccms-parent/publiccms/src/main/resources/templates/admin/login.html @@ -34,7 +34,7 @@

<#list langs as k,v> - class="current-lang" href="${base+adminContextPath}/changeLocale?lang=${k}&returnUrl=${(base+adminContextPath+'/')?url}">${v} + class="current-lang" href="${base+adminContextPath}/changeLocale?lang=${k}&returnUrl=${(adminContextPath+'/')?url}">${v}

-- GitLab