Skip to content

Commit c9e8745

Browse files
committed
Merge remote-tracking branch 'origin/V5' into V6
2 parents e288c57 + 3625248 commit c9e8745

11 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:17-jdk
1+
FROM eclipse-temurin:21-jdk
22
ADD publiccms-parent/publiccms/target/publiccms.war /opt/publiccms.war
33
ADD data /data
44
ENV PORT=8080

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
## Introduction
1313

14-
PublicCMS is an open source JAVACMS system developed with mainstream technologies in 2025. Developed by Tianjin Black Core Technology Co., LTD., the structure is scientific, easily support tens of millions of data, tens of millions of PV; Support visual editing, multi-dimensional expansion, full-text search, static site, SSI, dynamic page local static, URL rules completely customized for you to quickly build a site, large-scale site to provide a powerful drive, is also a good choice for enterprise project product prototype.
14+
PublicCMS is an open source JAVACMS system developed with mainstream technologies in 2026. Developed by Tianjin Black Core Technology Co., LTD., the structure is scientific, easily support tens of millions of data, tens of millions of PV; Support visual editing, multi-dimensional expansion, full-text search, static site, SSI, dynamic page local static, URL rules completely customized for you to quickly build a site, large-scale site to provide a powerful drive, is also a good choice for enterprise project product prototype.
1515

1616
## Get the source code
1717

@@ -21,17 +21,17 @@ https://github.com/sanluan/PublicCMS
2121

2222
## Participate in development
2323

24-
Switch to the V4.0-develop,V5-develop branch and the free version to the V2021 branch
24+
Switch to the develop branch and the free version to the V2021 branch
2525
![](doc/images/commits.jpg)
2626

2727
## Licensing agreement
2828

29-
* Version :V4.0,V5 Free for individuals and paid for enterprises: See LICENSE for details
29+
* Version :V4.0,V5,V6 Free for individuals and paid for enterprises: See LICENSE for details
3030
* Version :V1.0,V2016,V2017,V2019,V2021 Completely free license agreement :MIT
3131

3232
## Environmental requirements
3333

34-
* V4.0 jdk or jre 1.8 and later,V5 Java17 and later
34+
* V4.0 jdk or jre 1.8 and later,V5 Java17 and later,V6 Java21 and later
3535
* mysql 5.5 and later
3636

3737
## Directory description

README.zh-CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ https://github.com/sanluan/PublicCMS
2121

2222
## 参与开发
2323

24-
切换到V4.0-develop,V5-develop分支,免费版本切换到V2021分支
24+
切换到develop分支,免费版本切换到V2021分支
2525
![](doc/images/commits.jpg)
2626

2727
## 授权协议
2828

29-
* 版本:V4.0,V5 个人免费,企事业单位付费 授权协议:详情参见LICENSE
29+
* 版本:V4.0,V5,V6 个人免费,企事业单位付费 授权协议:详情参见LICENSE
3030
* 版本:V1.0,V2016,V2017,V2019,V2021 完全免费 授权协议:MIT
3131

3232
## 环境要求
3333

34-
* V4.0 jdk或jre 1.8 及以上,V5 Java17及以上
34+
* V4.0 jdk或jre 1.8 及以上,V5 Java17及以上,V6 Java21及以上
3535
* mysql 5.5 及以上
3636

3737
## 目录说明
1 KB
Binary file not shown.
67 KB
Binary file not shown.
0 Bytes
Binary file not shown.
63 KB
Binary file not shown.
-2 KB
Binary file not shown.
-1 KB
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)