程序版本更新 框架版本更新

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

publiccms-parent/pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.publiccms</groupId>
     <artifactId>publiccms-parent</artifactId>
     <packaging>pom</packaging>
-    <version>V4.0.202004.c</version>
+    <version>V4.0.202011.a</version>
     <modules>
         <module>publiccms</module>
         <module>publiccms-core</module>
@@ -22,10 +22,10 @@
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <!-- http://mvnrepository.com/artifact/org.springframework/spring-core -->
         <!-- http://projects.spring.io/spring-framework/ -->
-        <version.spring>5.2.9.RELEASE</version.spring>
+        <version.spring>5.2.10.RELEASE</version.spring>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
         <!-- https://projects.spring.io/spring-boot/ -->
-        <version.springBoot>2.3.4.RELEASE</version.springBoot>
+        <version.springBoot>2.3.5.RELEASE</version.springBoot>
         <!-- http://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
         <!-- http://hc.apache.org/downloads.cgi -->
         <version.httpclient>4.5.12</version.httpclient>
@@ -61,7 +61,7 @@
         <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
         <version.hikariCP>3.4.5</version.hikariCP>
         <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
-        <version.mysql>8.0.21</version.mysql>
+        <version.mysql>8.0.22</version.mysql>
         <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
         <version.poi>4.1.2</version.poi>
         <!-- http://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
@@ -75,7 +75,7 @@
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <version.log4j>2.13.3</version.log4j>
         <!-- https://mvnrepository.com/artifact/com.drewnoakes/metadata-extractor -->
-        <version.extractor>2.14.0</version.extractor>
+        <version.extractor>2.15.0</version.extractor>
         <!-- http://mvnrepository.com/artifact/eu.bitwalker/UserAgentUtils -->
         <version.userAgentUtils>1.21</version.userAgentUtils>
         <!-- https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api -->

publiccms-parent/publiccms-analyzer/pom.xml

@@ -8,13 +8,13 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-core</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>

publiccms-parent/publiccms-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <artifactId>publiccms-common</artifactId>
     <name>publiccms-common</name>

publiccms-parent/publiccms-core/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <artifactId>publiccms-core</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-common</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>

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";
     }
 
     /**

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<String> 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) {

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;

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<HandlerMethod, CsrfCache> methodCache = new HashMap<>();
     private CsrfCache DEFAULT_CACHE = new CsrfCache(false, null);
     private boolean admin = false;

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

publiccms-parent/publiccms-dmdialect/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <artifactId>publiccms-dmdialect</artifactId>
     <dependencies>

publiccms-parent/publiccms-j2cache/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <artifactId>publiccms-j2cache</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-common</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/net.oschina.j2cache/j2cache-core -->
         <dependency>

publiccms-parent/publiccms-oauth/pom.xml

@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>com.publiccms</groupId>
 		<artifactId>publiccms-parent</artifactId>
-		<version>V4.0.202004.c</version>
+		<version>V4.0.202011.a</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.publiccms</groupId>
 			<artifactId>publiccms-core</artifactId>
-			<version>V4.0.202004.c</version>
+			<version>V4.0.202011.a</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>

publiccms-parent/publiccms-redis/pom.xml

@@ -8,13 +8,13 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-common</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>

publiccms-parent/publiccms-trade/pom.xml

@@ -8,13 +8,13 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-core</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java -->
         <dependency>

publiccms-parent/publiccms/pom.xml

@@ -8,38 +8,38 @@
     <parent>
         <groupId>com.publiccms</groupId>
         <artifactId>publiccms-parent</artifactId>
-        <version>V4.0.202004.c</version>
+        <version>V4.0.202011.a</version>
     </parent>
     <dependencies>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-core</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-oauth</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-redis</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-j2cache</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-analyzer</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>com.publiccms</groupId>
             <artifactId>publiccms-trade</artifactId>
-            <version>V4.0.202004.c</version>
+            <version>V4.0.202011.a</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

publiccms-parent/publiccms/src/main/resources/templates/admin/login.html

@@ -34,7 +34,7 @@
         </form>
         <p>
             <#list langs as k,v>
-		        <a<#if springMacroRequestContext.getMessage('page.lang')=k> class="current-lang"</#if> href="${base+adminContextPath}/changeLocale?lang=${k}&returnUrl=${(base+adminContextPath+'/')?url}">${v}</a>
+		        <a<#if springMacroRequestContext.getMessage('page.lang')=k> class="current-lang"</#if> href="${base+adminContextPath}/changeLocale?lang=${k}&returnUrl=${(adminContextPath+'/')?url}">${v}</a>
             </#list>
         </p>
     </div>