Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/V5-develop' into V5
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanluan
sanluan committed Jun 24, 2024
2 parents 7dfd5f9 + ca2f83b commit 3e020fd
Show file tree
Hide file tree
Showing 2,666 changed files with 172,446 additions and 240,618 deletions.
15 changes: 8 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PublicCMS V5 jakarta Verion
# PublicCMS

<p style="align:center">
English | <a href="./README.zh-CN.md">简体中文</a>
Expand All @@ -11,7 +11,7 @@

## Introduction

PublicCMS is an open source JAVACMS system developed with mainstream technologies in 2023. 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.
PublicCMS is an open source JAVACMS system developed with mainstream technologies in 2024. 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.

## Get the source code

Expand All @@ -20,7 +20,8 @@ https://github.com/sanluan/PublicCMS

## Participate in development

Switch to the develop branch and the free version to the V2019 branch
Switch to the develop,V5-develop branch and the free version to the V2019 branch
![](doc/images/commits.jpg)

## Licensing agreement

Expand All @@ -29,7 +30,7 @@ Switch to the develop branch and the free version to the V2019 branch

## Environmental requirements

* jdk or jre 17 and later
* V4.0 jdk or jre 1.8 and later,V5 Java17 and later
* mysql 5.5 and later

## Directory description
Expand All @@ -42,12 +43,12 @@ Switch to the develop branch and the free version to the V2019 branch

* Compile and run

Ensure that the operating system (OS) runs jdk17 or later
Ensure that the operating system (OS) runs jdk1.8 or later,V5 Java17 and later
```
cd publiccms-parent
mvnw clean package
cd publiccms/target
java -jar publiccms.war
java -jar -Dfile.encoding="UTF-8" -Dcms.filePath="../../../data/publiccms" publiccms.war
```
Visit the program page http://localhost:8080/ and follow the prompts to configure and initialize the database

Expand Down Expand Up @@ -98,7 +99,7 @@ Execute:
docker compose up -d
```
mysql host/port : mysql-cms/3306 ; user/password : publiccms/password!@#
mysql host/port: mysql-cms/3306 ; database: publiccms ; user/password: publiccms/password!@#

More parameters, please refer to https://hub.docker.com/r/sanluan/publiccms/

Expand Down
15 changes: 8 additions & 7 deletions README.zh-CN.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PublicCMS V5 jakarta 版
# PublicCMS

<p style="align:center">
<a href="./README.md">English</a> | 简体中文
Expand All @@ -11,7 +11,7 @@

## 简介

PublicCMS是采用2023年主流技术开发的开源JAVACMS系统。由天津黑核科技有限公司开发，架构科学，轻松支撑上千万数据、千万PV；支持可视化编辑，多维扩展，全文搜索，全站静态化，SSI，动态页面局部静态化，URL规则完全自定义等为您快速建站，建设大规模站点提供强大驱动，也是企业级项目产品原型的良好选择。
PublicCMS是采用2024年主流技术开发的开源JAVACMS系统。由天津黑核科技有限公司开发，架构科学，轻松支撑上千万数据、千万PV；支持可视化编辑，多维扩展，全文搜索，全站静态化，SSI，动态页面局部静态化，URL规则完全自定义等为您快速建站，建设大规模站点提供强大驱动，也是企业级项目产品原型的良好选择。

## 获取源码

Expand All @@ -20,7 +20,8 @@ https://github.com/sanluan/PublicCMS

## 参与开发

切换到develop分支,免费版本切换到V2019分支
切换到develop,V5-develop分支,免费版本切换到V2019分支
![](doc/images/commits.jpg)

## 授权协议

Expand All @@ -29,7 +30,7 @@ https://github.com/sanluan/PublicCMS

## 环境要求

* jdk或jre 17 及以上
* V4.0 jdk或jre 1.8 及以上,V5 Java17及以上
* mysql 5.5 及以上

## 目录说明
Expand All @@ -42,12 +43,12 @@ https://github.com/sanluan/PublicCMS

* 编译运行

保证操作系统中有jdk17及以上
保证操作系统中有jdk1.8及以上,V5 Java17及以上
```
cd publiccms-parent
mvnw clean package
cd publiccms/target
java -jar publiccms.war
java -jar -Dfile.encoding="UTF-8" -Dcms.filePath="../../../data/publiccms" publiccms.war
```
访问程序页面http://localhost:8080/ ,根据页面提示配置并初始化数据库

Expand Down Expand Up @@ -94,7 +95,7 @@ docker run -d -p 8080:8080 mypubliccms
docker compose up -d
```
mysql ip/端口 : mysql-cms/3306 ; 用户名/密码 : publiccms/password!@#
mysql ip/端口: mysql-cms/3306 ; 数据库: publiccms ; 用户名/密码: publiccms/password!@#

更多参数及含义请参考 https://hub.docker.com/r/sanluan/publiccms/

Expand Down
45 changes: 45 additions & 0 deletions Update History.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,48 @@
## V4.0.202406.a ; V5.202406.a

程序功能修改

1. 增加百度编辑器手动触发抓取远程图片功能
1. 增加下载文件、导出excel异步处理
1. 增加代码编辑器主题切换、代码折叠功能
1. 更新百度编辑器，CKeditor，TinyMCE，移除KindEditor
1. 增加私有文件上传、下载、扩展字段
1. 增加访问统计数据导出功能
1. 增加正文附件、模板示例附件列表原文件名处理
1. 增加键值对扩展类型、时间类型
1. 增加扩展字段类型时间默认值支持:now;增加日期时间、日期类型默认值支持:now,thisSunday,thisMonday,lastMonday,lastSunday,nextMonday,nextSunday
1. 增加扩展字段多选功能：输入框、数字、用户、部门、内容、分类、分类类型、投票、调查问卷、标签类型、标签
1. 增加分类批量seo设置
1. 增加分类批量复制
1. 增加数据字典批量添加值
1. 增加前台站点投稿富文本支持
1. 增加用户文件上传累计大小限制
1. 增加可视化拖拽功能移动端支持
1. 增加任务计划多节点运行选项
1. 增加对象存储、CDN加速功能
1. 增加元数据字段类型：标签、投票、问卷、分类编码
1. 增加内容模型模板取值示例
1. 修改图片编辑器为filerobot-image-editor，支持对图像裁剪、增加图文图形、滤镜等
1. 增强数据库密码加密
1. 增加封面图使用正文中图片功能
1. 增加匿名投票、问卷调查功能
1. 简化扩展数据获取方式
1. 增加内容收藏功能
1. 内容文章详情内链功能
1. 增加图片自动缩略配置
1. 增加页面片段数据超过最大点击数自动下架功能
1. 增加扩展字段排序
1. 增加pdf预览组件

BUG与缺陷修复

1. 快捷维护页面切换标签页时滚动到最上面
1. 增加PDF文件安全检查

模板相关修改

1. 投稿表单扩展字段由两个字段改为一个字段

## V4.0.202302.d ; V5.202302.d

BUG与缺陷修复
Expand Down
Loading

0 comments on commit 3e020fd

Please sign in to comment.