V2021.a

LICENSE

@@ -1,18 +1,26 @@
-Copyright (c) 2018 PublicMS
+Copyright (c) 2024 PublicMS
 
 һ����Ȩ����
-  1.1 ����������޸ġ����ơ��ַ�����������������Դ��
-  1.2 ��������ѻ�õĻ������Э�����Ȩ�ļ�������÷���ҵ��;��ʹ��Ȩ�ޣ�����ҵ��;�޸����û�ʹ��
-  1.3 ���������Ȩ�û������ڱ�����������ҳ�����������λ������Powered by PublicCMS��ʶ����������Ʒ�е���Ȩ��logo�ȱ�ʶ
-  1.4 �ڽ�������������ҵ��;ʱ����Ҫȡ��������Ȩ����ҵʹ����Ȩ����Ȩ��λӦΪ����ʹ�ò�Ʒ���û���λ
-  1.5 �ѻ����ҵ��Ȩ���û�����ʹ�á����ơ��޸ġ��ַ�������(��Դ��)������������(��Դ��)�IJ�Ʒ
-  1.6 ��Э����Ե�ǰ�汾��Ч����ʷ�ѷ����汾�������������ʱ��������ȨЭ��
+  1.1 �������汾��ѭMIT��ȨЭ��(http://www.opensource.org/licenses/mit-license.php)
+  1.2 ����Ȩ����Ȩ��ʹ�á����ơ��޸ġ��ϲ������淢�С�ɢ��������Ȩ�����۱���������������Դ�롣
+  1.3 ����Ȩ�˿ɸ��ݳ�ʽ����Ҫ�޸���Ȩ����Ϊ�ʵ������ݡ�
+  1.4 �����������������и����ж����������Ȩ����������������
+  1.5 �����ٷ��а汾������ʹ��PublicCMS�������������
+  1.6 �������а���������ȨЭ��ĵ�������Ʒ����������ȨЭ�顣
 ������Ȩ
   2.1 ��������Ȩ��PublicCMS�ٷ�����
 ������������
   3.1 �����������������ļ�����Ϊ���ṩ�κ���ȷ�Ļ��������⳥�򵣱�����ʽ�ṩ��
   3.2 �û�������Ը��ʹ�ñ��������������˽�ʹ�ñ������ķ��գ�����δ�����Ʒ��������֮ǰ�����Dz���ŵ�ṩ�κ���ʽ�ļ���֧�֡�ʹ�õ�����Ҳ���е��κ���ʹ�ñ�����������������������
 
+### ������
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 # ������Ȩ���� Other Licenses
 
 This software includes projects with the following licenses

README.md

@@ -1,12 +1,12 @@
-# PublicCMS V4.0
+# PublicCMS V2021
 
 <a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=89ffe8cd3abc04f6794965a330b0a278fdbc31f53e46fd5ee1c4f54ed43a6b28">交流群1群 191381542</a>
 <a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=088c921c4eb74328eef0192bac1e63c7228eb31b0524a373d40cdd907ddd2d3c">交流群2群 481589563</a>
 <a target="_blank" href="//shang.qq.com/wpa/qunwpa?idkey=8b1c7e07973d9f9553c0b8d5f8410107c02456bf6b4674dc7e4d113266ee8e03">交流群3群 638756883</a>
 
 ## 简介
 
-PublicCMS是采用2020年最新主流技术开发的开源JAVACMS系统。由天津黑核科技有限公司开发，架构科学，轻松支持上千万数据、千万PV；支持全站静态化，SSI，动态页面局部静态化等为您快速建站，建设大规模站点提供强大驱动，也是企业级项目产品原型的良好选择。
+PublicCMS是采用2021年最新主流技术开发的开源JAVACMS系统。由天津黑核科技有限公司开发，架构科学，轻松支持上千万数据、千万PV；支持全站静态化，SSI，动态页面局部静态化等为您快速建站，建设大规模站点提供强大驱动，也是企业级项目产品原型的良好选择。
 
 ## 获取源码
 
@@ -15,12 +15,12 @@ https://github.com/sanluan/PublicCMS
 
 ## 参与开发
 
-切换到develop分支,免费版本切换到2017分支
+切换到develop分支,免费版本切换到V2021分支
 
 ## 授权协议
 
-* 版本:V4.0 商用付费授权协议:详情参见LICENSE
-* 版本:V1.0,V2016,V2017 完全免费授权协议:MIT
+* 版本:V4.0,V5 商用付费授权协议:详情参见LICENSE
+* 版本:V1.0,V2016,V2017,V2019,V2021 完全免费授权协议:MIT
 
 ## 环境要求
 

SECURITY.md

@@ -6,8 +6,12 @@ which versions are currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
+|V5-develop| :white_check_mark: |
+| develop | :white_check_mark: |
 |   4.0   | :white_check_mark: |
-|   2017  | :white_check_mark: |
+|   2021  | :white_check_mark: |
+|   2019  | :x: |
+|   2017  | :x: |
 |   2016  | :x:                |
 |   1.0   | :x:                |
 

Update History.md

@@ -1,4 +1,4 @@
-### V4.0.202107.a
+### V2021
 
 程序功能修改
 1. 增加访问统计功能

publiccms-parent/build.gradle

@@ -23,28 +23,28 @@ subprojects {
     apply plugin: "eclipse-wtp"
 
     group = 'com.publiccms'
-    version = 'V4.0.202107.f'
+    version = 'V2021.a'
 
     test.enabled = false
 
     ext {
         // http://mvnrepository.com/artifact/org.springframework/spring-core
         // http://projects.spring.io/spring-framework/
-        springVersion = "5.3.8"
+        springVersion = "5.3.27"
         // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
         // https://projects.spring.io/spring-boot/
-        springBootVersion = "2.5.2"
+        springBootVersion = "2.5.15"
         // http://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
         // http://hc.apache.org/downloads.cgi
         httpclientVersion = "4.5.13"
         // http://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
-        jacksonVersion = "2.12.4"
+        jacksonVersion = "2.15.4"
         // http://mvnrepository.com/artifact/org.hibernate/hibernate-core
         // http://hibernate.org/orm/downloads/
-        hibernateVersion = "5.4.32.Final"
+        hibernateVersion = "5.4.33.Final"
         // http://mvnrepository.com/artifact/org.hibernate/hibernate-search
         // http://hibernate.org/search/downloads/
-        hibernateSearchVersion = "6.0.5.Final"
+        hibernateSearchVersion = "6.0.11.Final"
         // https://mvnrepository.com/artifact/org.ehcache/ehcache
         ehcacheVersion = "3.9.4"
         // http://mvnrepository.com/artifact/org.freemarker/freemarker

publiccms-parent/pom.xml

@@ -19,24 +19,24 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <version.publiccms>V4.0.202107.f</version.publiccms>
+        <version.publiccms>V2021.a</version.publiccms>
         <!-- http://mvnrepository.com/artifact/org.springframework/spring-core -->
         <!-- http://projects.spring.io/spring-framework/ -->
-        <version.spring>5.3.18</version.spring>
+        <version.spring>5.3.27</version.spring>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
         <!-- https://projects.spring.io/spring-boot/ -->
-        <version.springBoot>2.5.12</version.springBoot>
+        <version.springBoot>2.5.15</version.springBoot>
         <!-- http://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
         <!-- http://hc.apache.org/downloads.cgi -->
         <version.httpclient>4.5.13</version.httpclient>
         <!-- http://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
-        <version.jackson>2.12.6.1</version.jackson>
+        <version.jackson>2.15.4</version.jackson>
         <!-- http://mvnrepository.com/artifact/org.hibernate/hibernate-core -->
         <!-- http://hibernate.org/orm/releases/ -->
-        <version.hibernate>5.4.32.Final</version.hibernate>
+        <version.hibernate>5.4.33.Final</version.hibernate>
         <!-- https://mvnrepository.com/artifact/org.hibernate.search/hibernate-search-mapper-orm/ -->
         <!-- http://hibernate.org/search/releases/ -->
-        <version.hibernateSearch>6.0.5.Final</version.hibernateSearch>
+        <version.hibernateSearch>6.0.11.Final</version.hibernateSearch>
         <!-- https://mvnrepository.com/artifact/org.ehcache/ehcache -->
         <version.ehcache>3.9.4</version.ehcache>
         <!-- http://mvnrepository.com/artifact/org.freemarker/freemarker -->

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CmsVersion.java

@@ -2,10 +2,6 @@
 
 import java.util.UUID;
 
-import com.publiccms.common.copyright.CmsCopyright;
-import com.publiccms.common.copyright.Copyright;
-import com.publiccms.common.copyright.License;
-
 /**
  *
  * CmsVersion
@@ -15,41 +11,18 @@ public class CmsVersion {
     private static final String clusterId = UUID.randomUUID().toString();
     private static boolean master = false;
     private static boolean initialized = false;
-    private static Copyright copyright = new CmsCopyright();
 
     /**
      * @return version
      */
     public static final String getVersion() {
-        return "V4.0.202107";
+        return "V2021";
     }
     /**
      * @return revision
      */
     public static final String getRevision() {
-        return "f";
-    }
-
-    /**
-     * @return whether the authorization edition
-     */
-    public static boolean isAuthorizationEdition() {
-        return copyright.verify(CommonConstants.CMS_FILEPATH + CommonConstants.LICENSE_FILENAME);
-    }
-
-    /**
-     * @param domain
-     * @return whether the domain authorized
-     */
-    public static boolean verifyDomain(String domain) {
-        return copyright.verify(CommonConstants.CMS_FILEPATH + CommonConstants.LICENSE_FILENAME, domain);
-    }
-
-    /**
-     * @return license
-     */
-    public static License getLicense() {
-        return copyright.getLicense(CommonConstants.CMS_FILEPATH + CommonConstants.LICENSE_FILENAME);
+        return "a";
     }
 
     /**

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/constants/CommonConstants.java

@@ -24,10 +24,6 @@ public class CommonConstants extends Constants{
      * 安装锁
      */
     public static final String INSTALL_LOCK_FILENAME = "/install.lock";
-    /**
-     * 授权文件
-     */
-    public static final String LICENSE_FILENAME = "/license.dat";
 
     /**
      * 配置文件
@@ -39,11 +35,6 @@ public class CommonConstants extends Constants{
      */
     public static final String ENCRYPT_KEY = "publiccms";
 
-    /**
-     * 公钥
-     */
-    public static final String PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/ZHiLKHR70/tuoE9TsWhcKuoAgHWIOWrt+kAl1cZotjqsZwR/55PkYkz0SLZMOhXRjY1ii5Y0SDceLG0GsdRQBSvrGb2pPCDPsWM+LuG7BM8Dr8gnHKK1CROVEHJ6wR2RYsD2UIZLRp/HIzTc5B922X9oFibIyZJphFqpZngYtwIDAQAB";
-
     /**
      * 首页模板
      */