Merge remote-tracking branch 'origin/V5-develop' into V6-develop

Author: sanluan

README.md

@@ -11,7 +11,7 @@
 
 ## Introduction
 
-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.
+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.
 
 ## Get the source code
 

README.zh-CN.md

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

publiccms-parent/build.gradle

@@ -23,7 +23,7 @@ subprojects {
     apply plugin: "eclipse-wtp"
 
     group = "com.publiccms"
-    version = "V6.2024506.c"
+    version = "V6.2024506.d"
 
     test.enabled = false
 

publiccms-parent/pom.xml

@@ -21,7 +21,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <version.publiccms>V6.202506.c</version.publiccms>
+        <version.publiccms>V6.202506.d</version.publiccms>
         <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
         <version.servlet>6.1.0</version.servlet>
         <!-- http://mvnrepository.com/artifact/org.springframework/spring-core -->

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/base/AbstractCkEditorController.java

@@ -45,8 +45,8 @@ public class AbstractCkEditorController {
     private static final String RESULT_FILENAME = "fileName";
     private static final String RESULT_URL = "url";
 
-    protected Map<String, Object> upload(SysSite site, SysUser user, MultipartFile upload, String ckCsrfToken, String channel,
-            String csrfToken, HttpServletRequest request) {
+    protected Map<String, Object> upload(SysSite site, SysUser user, MultipartFile upload, String ckCsrfToken, 
+            String csrfToken, String channel, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         int uploaded = 0;
         if (null != upload && !upload.isEmpty() && csrfToken.equals(ckCsrfToken)) {

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

@@ -38,7 +38,7 @@ public static final String getVersion() {
      * @return revision
      */
     public static final String getRevision() {
-        return "c";
+        return "d";
     }
 
     /**

publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/component/site/SiteComponent.java

@@ -371,7 +371,7 @@ public String getWebBackupFilePath(short siteId, String filepath) {
      * @return site file path
      */
     public String getSiteFilePath(String path) {
-        return CommonUtils.joinString(rootPath, BACKUP_PATH, Constants.SEPARATOR, SITE_FILE_PATH, Constants.SEPARATOR, path);
+        return CommonUtils.joinString(rootPath, BACKUP_PATH, Constants.SEPARATOR, SITE_FILE_PATH, Constants.SEPARATOR, CmsFileUtils.getSafeFileName(path));
     }
 
     /**

publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/dao/cms/CmsContentSearchDao.java

@@ -140,20 +140,22 @@ public FacetPageHandler facetQuery(CmsContentSearchQuery queryEntity, String ord
     }
 
     private void initHighLighterQuery(HighLighterQuery highLighterQuery, String text) {
-        if (highLighterQuery.isHighlight() && CommonUtils.notEmpty(text)) {
+        if (highLighterQuery.isHighlight()) {
             highLighterQuery.setFields(highLighterTextFields);
-            Backend backend = dao.getSearchBackend();
-            Optional<? extends Analyzer> analyzer;
-            if (backend instanceof LuceneBackend) {
-                analyzer = backend.unwrap(LuceneBackend.class).analyzer(CmsContentAttributeBinder.ANALYZER_NAME);
-            } else {
-                analyzer = Optional.of(new StandardAnalyzer());
-            }
-            if (analyzer.isPresent()) {
-                MultiFieldQueryParser queryParser = new MultiFieldQueryParser(highLighterTextFields, analyzer.get());
-                try {
-                    highLighterQuery.setQuery(queryParser.parse(text));
-                } catch (ParseException e) {
+            if (CommonUtils.notEmpty(text)) {
+                Backend backend = dao.getSearchBackend();
+                Optional<? extends Analyzer> analyzer;
+                if (backend instanceof LuceneBackend) {
+                    analyzer = backend.unwrap(LuceneBackend.class).analyzer(CmsContentAttributeBinder.ANALYZER_NAME);
+                } else {
+                    analyzer = Optional.of(new StandardAnalyzer());
+                }
+                if (analyzer.isPresent()) {
+                    MultiFieldQueryParser queryParser = new MultiFieldQueryParser(highLighterTextFields, analyzer.get());
+                    try {
+                        highLighterQuery.setQuery(queryParser.parse(text));
+                    } catch (ParseException e) {
+                    }
                 }
             }
         }