diff --git a/README.md b/README.md
index d414132b..3d98fe48 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ChestnutCMS v1.4.1
+# ChestnutCMS v1.4.2
 
 ### 系统简介
 
@@ -20,6 +20,8 @@ ChestnutCMS是前后端分离的企业级内容管理系统。项目基于[RuoYi
 
 游戏站演示地址：PC端：<http://game.1000mz.com> 移动端：<http://mgame.1000mz.com>
 
+影视站演示地址：PC端：<http://movie.1000mz.com> 移动端：<http://movie.1000mz.com>
+
 ### 开发环境
 - OpenJDK 17
 - Maven 3.8+
diff --git a/chestnut-admin/pom.xml b/chestnut-admin/pom.xml
index 63374b21..377669be 100644
--- a/chestnut-admin/pom.xml
+++ b/chestnut-admin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>chestnut</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/chestnut-admin/src/main/resources/application-dev.yml b/chestnut-admin/src/main/resources/application-dev.yml
index 2c4af02b..fcfb4da8 100644
--- a/chestnut-admin/src/main/resources/application-dev.yml
+++ b/chestnut-admin/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@ chestnut:
   # 代号
   alias: ChestnutCMS
   # 版本
-  version: 1.4.1
+  version: 1.4.2
   # 版权年份
   copyrightYear: 2022-2024
   system:
diff --git a/chestnut-admin/src/main/resources/application-prod.yml b/chestnut-admin/src/main/resources/application-prod.yml
index b80b411f..a470c805 100644
--- a/chestnut-admin/src/main/resources/application-prod.yml
+++ b/chestnut-admin/src/main/resources/application-prod.yml
@@ -5,7 +5,7 @@ chestnut:
   # 代号
   alias: ChestnutCMS
   # 版本
-  version: 1.4.1
+  version: 1.4.2
   # 版权年份
   copyrightYear: 2022-2024
   system:
diff --git a/chestnut-admin/src/main/resources/application-test.yml b/chestnut-admin/src/main/resources/application-test.yml
index f34dbb88..fa051efa 100644
--- a/chestnut-admin/src/main/resources/application-test.yml
+++ b/chestnut-admin/src/main/resources/application-test.yml
@@ -5,7 +5,7 @@ chestnut:
   # 代号
   alias: ChestnutCMS
   # 版本
-  version: 1.4.1
+  version: 1.4.2
   # 版权年份
   copyrightYear: 2022-2024
   system:
diff --git a/chestnut-admin/src/main/resources/db/migration/mysql/V1.4.0__update.sql b/chestnut-admin/src/main/resources/db/migration/mysql/V1.4.0__update.sql
index b4d25895..5140c446 100644
--- a/chestnut-admin/src/main/resources/db/migration/mysql/V1.4.0__update.sql
+++ b/chestnut-admin/src/main/resources/db/migration/mysql/V1.4.0__update.sql
@@ -1,3 +1,22 @@
+CREATE TABLE `cms_site_visit_log` (
+  `log_id` bigint NOT NULL,
+  `site_id` bigint NOT NULL,
+  `catalog_id` bigint DEFAULT NULL,
+  `content_id` bigint DEFAULT NULL,
+  `host` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `uri` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ip` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `address` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `referer` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `browser` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `user_agent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `os` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `device_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `locale` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `evt_time` datetime NOT NULL,
+  PRIMARY KEY (`log_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
 CREATE TABLE `cms_dynamic_page` (
   `page_id` bigint NOT NULL COMMENT 'ID',
   `site_id` bigint NOT NULL COMMENT '站点ID',
diff --git a/chestnut-admin/src/main/resources/db/migration/mysql/V1.4.2__update.sql b/chestnut-admin/src/main/resources/db/migration/mysql/V1.4.2__update.sql
new file mode 100644
index 00000000..5904d52d
--- /dev/null
+++ b/chestnut-admin/src/main/resources/db/migration/mysql/V1.4.2__update.sql
@@ -0,0 +1,30 @@
+CREATE TABLE `search_word` (
+  `word_id` bigint NOT NULL COMMENT '主键ID',
+  `word` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '搜索词',
+  `search_total` bigint NOT NULL COMMENT '历史累计搜索次数',
+  `top_flag` bigint NOT NULL COMMENT '置顶标识',
+  `top_date` datetime DEFAULT NULL COMMENT '置顶结束时间',
+  `source` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '来源标识',
+  `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后修改人',
+  `update_time` datetime DEFAULT NULL COMMENT '最后修改时间',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`word_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+CREATE TABLE `search_word_hour_stat` (
+  `stat_id` bigint NOT NULL AUTO_INCREMENT,
+  `hour` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `word_id` bigint NOT NULL,
+  `word` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `search_count` bigint NOT NULL,
+  PRIMARY KEY (`stat_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+# 菜单名称路由调整
+UPDATE sys_menu SET component = 'search/wordTab', path = 'searchWord' where menu_id = 2053;
+
+ALTER TABLE cms_content ADD COLUMN prop1 VARCHAR(100);
+ALTER TABLE cms_content ADD COLUMN prop2 VARCHAR(100);
+ALTER TABLE cms_content ADD COLUMN prop3 VARCHAR(255);
+ALTER TABLE cms_content ADD COLUMN prop4 VARCHAR(255);
diff --git a/chestnut-cms/chestnut-cms-advertisement/pom.xml b/chestnut-cms/chestnut-cms-advertisement/pom.xml
index 377e895f..91dc4025 100644
--- a/chestnut-cms/chestnut-cms-advertisement/pom.xml
+++ b/chestnut-cms/chestnut-cms-advertisement/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-advertisement</artifactId>
diff --git a/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/controller/AdLogController.java b/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/controller/AdLogController.java
index d31055fb..e8688128 100644
--- a/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/controller/AdLogController.java
+++ b/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/controller/AdLogController.java
@@ -77,8 +77,17 @@ public class AdLogController extends BaseRestController {
 	}
 
 	@GetMapping("/chart")
-	public R<?> getLineChartStatDatas(@RequestParam @Min(1) Long advertisementId, @RequestParam Date beginTime, @RequestParam Date endTime) {
-		List<CmsAdHourStat> list = this.advHourStatMapper.selectHourStat(advertisementId, FORMAT.format(beginTime), FORMAT.format(endTime));
+	public R<?> getLineChartStatDatas(
+			@RequestParam @Min(1) Long advertisementId,
+			@RequestParam Date beginTime,
+			@RequestParam Date endTime
+	) {
+		LambdaQueryWrapper<CmsAdHourStat> q = new LambdaQueryWrapper<CmsAdHourStat>()
+				.eq(CmsAdHourStat::getAdvertisementId, advertisementId)
+				.gt(Objects.nonNull(beginTime), CmsAdHourStat::getHour, beginTime)
+				.gt(Objects.nonNull(endTime), CmsAdHourStat::getHour, endTime)
+				.orderByAsc(CmsAdHourStat::getHour);
+		List<CmsAdHourStat> list = this.advHourStatMapper.selectList(q);
 		if (!list.isEmpty()) {
 			Map<String, String> map = this.advService.getAdvertisementMap();
 			list.forEach(l -> l.setAdName(map.get(l.getAdvertisementId().toString())));
diff --git a/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/mapper/CmsAdHourStatMapper.java b/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/mapper/CmsAdHourStatMapper.java
index daa49060..16915228 100644
--- a/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/mapper/CmsAdHourStatMapper.java
+++ b/chestnut-cms/chestnut-cms-advertisement/src/main/java/com/chestnut/advertisement/mapper/CmsAdHourStatMapper.java
@@ -25,18 +25,6 @@ import com.chestnut.advertisement.domain.CmsAdHourStat;
 
 public interface CmsAdHourStatMapper extends BaseMapper<CmsAdHourStat> {
 
-	@Select("""
-			<script>
-			SELECT * FROM `cms_ad_hour_stat`
-			WHERE advertisement_id = #{advertisementId}
-			<if test='begin != null'> and hour &gt;= #{begin} </if>
-			<if test='end != null'> and hour &lt;= #{end} </if>
-			ORDER BY hour ASC
-			</script>
-			""")
-	public List<CmsAdHourStat> selectHourStat(@Param("advertisementId") Long advertisementId,
-			@Param("begin") String begin, @Param("end") String end);
-
 	@Select("""
 			<script>
 			SELECT advertisement_id, sum(click) click, sum(view) view FROM `cms_ad_hour_stat`
diff --git a/chestnut-cms/chestnut-cms-article/pom.xml b/chestnut-cms/chestnut-cms-article/pom.xml
index c69ddc4e..f5ad68e7 100644
--- a/chestnut-cms/chestnut-cms-article/pom.xml
+++ b/chestnut-cms/chestnut-cms-article/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-article</artifactId>
diff --git a/chestnut-cms/chestnut-cms-article/src/main/java/com/chestnut/article/template/func/dealArticleBodyFunction.java b/chestnut-cms/chestnut-cms-article/src/main/java/com/chestnut/article/template/func/dealArticleBodyFunction.java
index 23bb3207..ffb292f7 100644
--- a/chestnut-cms/chestnut-cms-article/src/main/java/com/chestnut/article/template/func/dealArticleBodyFunction.java
+++ b/chestnut-cms/chestnut-cms-article/src/main/java/com/chestnut/article/template/func/dealArticleBodyFunction.java
@@ -16,7 +16,6 @@
 package com.chestnut.article.template.func;
 
 import com.chestnut.article.ArticleUtils;
-import com.chestnut.article.service.IArticleService;
 import com.chestnut.common.staticize.FreeMarkerUtils;
 import com.chestnut.common.staticize.core.TemplateContext;
 import com.chestnut.common.staticize.func.AbstractFunc;
@@ -41,8 +40,6 @@ public class dealArticleBodyFunction extends AbstractFunc  {
 	
 	private static final String DESC = "{FREEMARKER.FUNC.DESC." + FUNC_NAME + "}";
 
-	private final IArticleService articleService;
-
 	@Override
 	public String getFuncName() {
 		return FUNC_NAME;
diff --git a/chestnut-cms/chestnut-cms-block/pom.xml b/chestnut-cms/chestnut-cms-block/pom.xml
index ebbd2f17..471490b8 100644
--- a/chestnut-cms/chestnut-cms-block/pom.xml
+++ b/chestnut-cms/chestnut-cms-block/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-block</artifactId>
diff --git a/chestnut-cms/chestnut-cms-comment/pom.xml b/chestnut-cms/chestnut-cms-comment/pom.xml
index f473ed4e..a36d69d9 100644
--- a/chestnut-cms/chestnut-cms-comment/pom.xml
+++ b/chestnut-cms/chestnut-cms-comment/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-comment</artifactId>
diff --git a/chestnut-cms/chestnut-cms-contentcore/pom.xml b/chestnut-cms/chestnut-cms-contentcore/pom.xml
index efc03c1c..eb1833d6 100644
--- a/chestnut-cms/chestnut-cms-contentcore/pom.xml
+++ b/chestnut-cms/chestnut-cms-contentcore/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-contentcore</artifactId>
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/CoreController.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/CoreController.java
index d8fcc4aa..4871931b 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/CoreController.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/CoreController.java
@@ -16,6 +16,7 @@
 package com.chestnut.contentcore.controller;
 
 import com.chestnut.common.domain.R;
+import com.chestnut.common.i18n.I18nUtils;
 import com.chestnut.common.security.anno.Priv;
 import com.chestnut.common.security.web.BaseRestController;
 import com.chestnut.common.staticize.StaticizeService;
@@ -24,6 +25,7 @@ import com.chestnut.common.utils.Assert;
 import com.chestnut.common.utils.ServletUtils;
 import com.chestnut.contentcore.core.IInternalDataType;
 import com.chestnut.contentcore.domain.CmsSite;
+import com.chestnut.contentcore.domain.vo.DynamicPageTypeVO;
 import com.chestnut.contentcore.exception.ContentCoreErrorCode;
 import com.chestnut.contentcore.service.ISiteService;
 import com.chestnut.contentcore.service.ITemplateService;
@@ -44,6 +46,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -154,6 +157,11 @@ public class CoreController extends BaseRestController {
 	@Priv(type = AdminUserType.TYPE)
 	@GetMapping("/cms/dynamicPageTypes")
 	public R<?> getDynamicPageTypes() {
-		return R.ok(ContentCoreUtils.getDynamicPageTypes());
+		List<DynamicPageTypeVO> list = ContentCoreUtils.getDynamicPageTypes().stream()
+				.map(DynamicPageTypeVO::newInstance).toList();
+		list.forEach( vo ->
+			vo.setName(I18nUtils.get(vo.getName()))
+		);
+		return R.ok(list);
 	}
 }
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/TemplateController.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/TemplateController.java
index 3840c00d..e139653d 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/TemplateController.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/controller/TemplateController.java
@@ -100,6 +100,7 @@ public class TemplateController extends BaseRestController {
 				.filesize(t.getFilesize())
 				.filesizeName(FileUtils.byteCountToDisplaySize(t.getFilesize()))
 				.modifyTime(DateUtils.epochMilliToLocalDateTime(t.getModifyTime()))
+				.remark(t.getRemark())
 				.build()).toList();
 		return this.bindDataTable(list, (int) page.getTotal());
 	}
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/core/SiteExportContext.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/core/SiteExportContext.java
index 21b7e5f8..2e95f68f 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/core/SiteExportContext.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/core/SiteExportContext.java
@@ -97,9 +97,9 @@ public class SiteExportContext implements ISiteThemeContext {
      * @param dest 目标路径，项目资源根目录（resourceRoot）
      */
     public void saveFile(File source, String dest) {
+        dest = ExportDir + SiteDirPath + dest;
         File destFile = new File(SiteUtils.getSiteResourceRoot(site) + dest);
         try {
-            dest = ExportDir + SiteDirPath + dest;
             if (source.isDirectory()) {
                 FileUtils.copyDirectory(source, destFile);
             } else {
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/CmsContent.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/CmsContent.java
index fe91aa64..3a7bd4fa 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/CmsContent.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/CmsContent.java
@@ -288,6 +288,26 @@ public class CmsContent extends BaseEntityWithLogicDelete {
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, Object> configProps;
+
+    /**
+     * 备用字段1
+     */
+    private String prop1;
+
+    /**
+     * 备用字段2
+     */
+    private String prop2;
+
+    /**
+     * 备用字段3
+     */
+    private String prop3;
+
+    /**
+     * 备用字段4
+     */
+    private String prop4;
     
     public boolean isLock() {
     	return YesOrNo.isYes(this.isLock);
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/DynamicPageTypeVO.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/DynamicPageTypeVO.java
new file mode 100644
index 00000000..d4326e3b
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/DynamicPageTypeVO.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.contentcore.domain.vo;
+
+import com.chestnut.contentcore.core.IDynamicPageType;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class DynamicPageTypeVO {
+
+	private String type;
+	
+	private String name;
+	
+	private String desc;
+	
+	private String requestPath;
+
+	private String publishPipeKey;
+	
+	private List<IDynamicPageType.RequestArg> requestArgs;
+
+	public static DynamicPageTypeVO newInstance(IDynamicPageType dynamicPageType) {
+		DynamicPageTypeVO vo = new DynamicPageTypeVO();
+		vo.setType(dynamicPageType.getType());
+		vo.setName(dynamicPageType.getName());
+		vo.setDesc(dynamicPageType.getDesc());
+		vo.setRequestPath(dynamicPageType.getRequestPath());
+		vo.setPublishPipeKey(dynamicPageType.getPublishPipeKey());
+		vo.setRequestArgs(dynamicPageType.getRequestArgs());
+		return vo;
+	}
+}
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/TemplateListVO.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/TemplateListVO.java
index 72bcef69..f8b1ab96 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/TemplateListVO.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/domain/vo/TemplateListVO.java
@@ -54,4 +54,6 @@ public class TemplateListVO {
      * 模板文件最后变更时间
      */
     private LocalDateTime modifyTime;
+
+    private String remark;
 }
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/service/ISiteService.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/service/ISiteService.java
index 8702bcef..ed53d5b9 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/service/ISiteService.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/service/ISiteService.java
@@ -36,12 +36,12 @@ public interface ISiteService extends IService<CmsSite> {
 	 * @param siteId
 	 * @return
 	 */
-	public boolean checkSiteUnique(String siteName, String sitePath, Long siteId);
+	boolean checkSiteUnique(String siteName, String sitePath, Long siteId);
 
     /**
      * 获取当前站点，保存在token中
      */
-    public CmsSite getCurrentSite(HttpServletRequest request);
+    CmsSite getCurrentSite(HttpServletRequest request);
 
 	/**
 	 * 获取站点数据
@@ -49,7 +49,7 @@ public interface ISiteService extends IService<CmsSite> {
 	 * @param siteId
 	 * @return
 	 */
-	public CmsSite getSite(Long siteId);
+	CmsSite getSite(Long siteId);
 
 	/**
 	 * 新增站点数据
@@ -58,7 +58,7 @@ public interface ISiteService extends IService<CmsSite> {
 	 * @return
 	 * @throws IOException
 	 */
-	public CmsSite addSite(SiteDTO dto) throws IOException;
+	CmsSite addSite(SiteDTO dto) throws IOException;
 	
 	/**
 	 * 修改站点数据
@@ -67,7 +67,7 @@ public interface ISiteService extends IService<CmsSite> {
 	 * @return
 	 * @throws IOException
 	 */
-	public CmsSite saveSite(SiteDTO site) throws IOException;
+	CmsSite saveSite(SiteDTO site) throws IOException;
 	
 	/**
 	 * 删除站点数据
@@ -76,7 +76,7 @@ public interface ISiteService extends IService<CmsSite> {
 	 * @return
 	 * @throws IOException
 	 */
-	public void deleteSite(Long siteId) throws IOException;
+	void deleteSite(Long siteId) throws IOException;
 
 	/**
 	 * 保存站点默认模板配置
@@ -84,7 +84,7 @@ public interface ISiteService extends IService<CmsSite> {
 	 * @param dto
 	 * @return
 	 */
-	public void saveSiteDefaultTemplate(SiteDefaultTemplateDTO dto);
+	void saveSiteDefaultTemplate(SiteDefaultTemplateDTO dto);
 
 	/**
 	 * 清理站点缓存数据
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/func/ContentPageLinkFunction.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/func/ContentPageLinkFunction.java
new file mode 100644
index 00000000..5540816d
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/func/ContentPageLinkFunction.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.contentcore.template.func;
+
+import com.chestnut.common.staticize.FreeMarkerUtils;
+import com.chestnut.common.staticize.core.TemplateContext;
+import com.chestnut.common.staticize.func.AbstractFunc;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.service.ICatalogService;
+import freemarker.core.Environment;
+import freemarker.template.SimpleNumber;
+import freemarker.template.TemplateModelException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Freemarker模板自定义函数：获取内容分页链接
+ */
+@Component
+@RequiredArgsConstructor
+public class ContentPageLinkFunction extends AbstractFunc {
+
+	private static final String FUNC_NAME = "contentPageLink";
+	
+	private static final String DESC = "{FREEMARKER.FUNC.DESC." + FUNC_NAME + "}";
+
+	private final ICatalogService catalogService;
+
+	@Override
+	public String getFuncName() {
+		return FUNC_NAME;
+	}
+
+	@Override
+	public String getDesc() {
+		return DESC;
+	}
+
+	@Override
+	public Object exec0(Object... args) throws TemplateModelException {
+		if (args.length == 0) {
+			return StringUtils.EMPTY;
+		}
+		String link = args[0].toString();
+		if (args.length == 1) {
+			return link;
+		}
+		int pageNumber = ((SimpleNumber) args[1]).getAsNumber().intValue();
+		if(pageNumber <= 1) {
+			return link;
+		}
+		TemplateContext context = FreeMarkerUtils.getTemplateContext(Environment.getCurrentEnvironment());
+		if (context.isPreview()) {
+			link += "&pi=" + pageNumber;
+		} else {
+			int dotIndex = link.lastIndexOf(StringUtils.DOT);
+			link = link.substring(0, dotIndex) + "_" + pageNumber + link.substring(dotIndex);
+		}
+		return link;
+	}
+
+	@Override
+	public List<FuncArg> getFuncArgs() {
+		return List.of(new FuncArg("内容链接", FuncArgType.String, true, null),
+				new FuncArg("页码", FuncArgType.Int, true, null));
+	}
+}
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/func/InternalUrlFunction.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/func/InternalUrlFunction.java
index a5c9cf6b..b9a117db 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/func/InternalUrlFunction.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/func/InternalUrlFunction.java
@@ -16,6 +16,7 @@
 package com.chestnut.contentcore.template.func;
 
 import java.util.List;
+import java.util.Objects;
 
 import org.springframework.stereotype.Component;
 
@@ -58,6 +59,9 @@ public class InternalUrlFunction extends AbstractFunc  {
 		}
 		TemplateContext context = FreeMarkerUtils.getTemplateContext(Environment.getCurrentEnvironment());
 		SimpleScalar simpleScalar = (SimpleScalar) args[0];
+		if (Objects.isNull(simpleScalar)) {
+			return StringUtils.EMPTY;
+		}
 		return InternalUrlUtils.getActualUrl(simpleScalar.getAsString(), context.getPublishPipeCode(), context.isPreview());
 	}
 
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsContentTag.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsContentTag.java
index 0233c488..1886dac7 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsContentTag.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsContentTag.java
@@ -129,7 +129,7 @@ public class CmsContentTag extends AbstractListTag {
 
 		TemplateContext context = FreeMarkerUtils.getTemplateContext(env);
 		Page<CmsContent> pageResult = this.contentService.page(new Page<>(pageIndex, size, page), q);
-		if (pageIndex > 1 & pageResult.getRecords().size() == 0) {
+		if (pageIndex > 1 & pageResult.getRecords().isEmpty()) {
 			throw new TemplateException("内容列表页码超出上限：" + pageIndex, env);
 		}
 		List<ContentDTO> list = new ArrayList<>();
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsSitePropertyTag.java b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsSitePropertyTag.java
index ec493248..1401d8d7 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsSitePropertyTag.java
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/java/com/chestnut/contentcore/template/tag/CmsSitePropertyTag.java
@@ -73,7 +73,7 @@ public class CmsSitePropertyTag extends AbstractListTag {
 				.eq(StringUtils.isNotEmpty(code), CmsSiteProperty::getPropCode, code);
 		q.apply(StringUtils.isNotEmpty(condition), condition);
 		Page<CmsSiteProperty> pageResult = this.sitePropertyService.page(new Page<>(pageIndex, size, page), q);
-		if (pageIndex > 1 & pageResult.getRecords().size() == 0) {
+		if (pageIndex > 1 & pageResult.getRecords().isEmpty()) {
 			throw new TemplateException("站点自定义属性数据列表页码超出上限：" + pageIndex, env);
 		}
 		return TagPageData.of(pageResult.getRecords(), pageResult.getTotal());
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages.properties b/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages.properties
index b3123297..a6573447 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages.properties
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages.properties
@@ -106,6 +106,7 @@ FREEMARKER.FUNC.DESC.dynamicPageLink=动态页面链接获取函数，例如：$
 FREEMARKER.FUNC.DESC.dict=获取字典数据列表，例如：${dict('YesOrNo', 'Y')}
 FREEMARKER.FUNC.DESC.sysConfig=获取系统参数配置值，例如：${sysConfig('SiteApiUrl')}
 FREEMARKER.FUNC.DESC.listHtmlInternalUrl=获取html文本中的iurl列表，例如：${listHtmlInternalUrl(ArticleContent)}
+FREEMARKER.FUNC.DESC.contentPageLink=获取内容分页链接，例如：${contentPageLink(content.link, 2)}
 FREEMARKER.FUNC.DESC.videoPlayer=将html文本中的视频资源链接替换为<video>视频播放器
 FREEMARKER.FUNC.videoPlayer.Arg1.Name=Html文本内容
 FREEMARKER.FUNC.videoPlayer.Arg2.Name=视频宽度
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_en.properties b/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_en.properties
index f229c6ac..a0fb0de7 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_en.properties
@@ -106,6 +106,7 @@ FREEMARKER.FUNC.DESC.dynamicPageLink=Use ${dynamicPageLink('Search')} in templat
 FREEMARKER.FUNC.DESC.dict=Use ${dict(content.linkFlag, 'YesOrNo')} in template to get the dict data label.
 FREEMARKER.FUNC.DESC.sysConfig=Use ${sysConfig('SiteApiUrl')} in template to get the system config value.
 FREEMARKER.FUNC.DESC.listHtmlInternalUrl=Use ${listHtmlInternalUrl(ArticleContent)} in template to get the iurl list.
+FREEMARKER.FUNC.DESC.contentPageLink=Use ${contentPageLink(content.link, 2)} in template to get the content page link.
 FREEMARKER.FUNC.DESC.videoPlayer=Replace html video resource link tag to video tag.
 FREEMARKER.FUNC.videoPlayer.Arg1.Name=Html content
 FREEMARKER.FUNC.videoPlayer.Arg2.Name=Width
diff --git a/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_zh_TW.properties
index d1c22c16..c9603398 100644
--- a/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-cms/chestnut-cms-contentcore/src/main/resources/i18n/messages_zh_TW.properties
@@ -106,6 +106,7 @@ FREEMARKER.FUNC.DESC.dynamicPageLink=動態頁面連結獲取函數，例如：$
 FREEMARKER.FUNC.DESC.dict=獲取字典數據列表，例如：${dict('YesOrNo', 'Y')}
 FREEMARKER.FUNC.DESC.sysConfig=獲取系統參數配置值，例如：${sysConfig('SiteApiUrl')}
 FREEMARKER.FUNC.DESC.listHtmlInternalUrl=獲取html文本中的iurl列表，例如：${listHtmlInternalUrl(ArticleContent)}
+FREEMARKER.FUNC.DESC.contentPageLink=獲取內容分頁鏈接，例如：${contentPageLink(content.link, 2)}
 FREEMARKER.FUNC.DESC.videoPlayer=將html文本中的視頻資源連結替換為<video>視頻播放器
 FREEMARKER.FUNC.videoPlayer.Arg1.Name=Html文本內容
 FREEMARKER.FUNC.videoPlayer.Arg2.Name=視頻寬度
diff --git a/chestnut-cms/chestnut-cms-customform/pom.xml b/chestnut-cms/chestnut-cms-customform/pom.xml
index 5bf66ba5..abf3cbb0 100644
--- a/chestnut-cms/chestnut-cms-customform/pom.xml
+++ b/chestnut-cms/chestnut-cms-customform/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.chestnut</groupId>
         <artifactId>chestnut-cms</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <artifactId>chestnut-cms-customform</artifactId>
diff --git a/chestnut-cms/chestnut-cms-customform/src/main/java/com/chestnut/customform/CustomFormCoreDataHandler.java b/chestnut-cms/chestnut-cms-customform/src/main/java/com/chestnut/customform/CustomFormCoreDataHandler.java
new file mode 100644
index 00000000..4a659f09
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-customform/src/main/java/com/chestnut/customform/CustomFormCoreDataHandler.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.customform;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chestnut.common.async.AsyncTaskManager;
+import com.chestnut.common.utils.IdUtils;
+import com.chestnut.common.utils.JacksonUtils;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.core.ICoreDataHandler;
+import com.chestnut.contentcore.core.SiteExportContext;
+import com.chestnut.contentcore.core.SiteImportContext;
+import com.chestnut.contentcore.util.InternalUrlUtils;
+import com.chestnut.customform.domain.CmsCustomForm;
+import com.chestnut.customform.domain.CmsCustomFormData;
+import com.chestnut.customform.mapper.CustomFormDataMapper;
+import com.chestnut.customform.service.ICustomFormService;
+import com.chestnut.exmodel.MetaControlType_CmsImage;
+import com.chestnut.exmodel.MetaControlType_UEditor;
+import com.chestnut.xmodel.core.MetaModel;
+import com.chestnut.xmodel.domain.XModel;
+import com.chestnut.xmodel.domain.XModelField;
+import com.chestnut.xmodel.service.IModelFieldService;
+import com.chestnut.xmodel.service.IModelService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+
+/**
+ * 自定义表单内容核心数据处理器
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CustomFormCoreDataHandler implements ICoreDataHandler {
+
+    private static final String XMODEL_TABLE_SUFFIX = "_cms_custom_form";
+
+    private final ICustomFormService customFormService;
+
+    private final CustomFormDataMapper customFormDataMapper;
+
+    private final IModelService modelService;
+
+    private final IModelFieldService modelFieldService;
+
+    @Override
+    public void onSiteExport(SiteExportContext context) {
+        AsyncTaskManager.setTaskTenPercentProgressInfo("正在导出自定义表单数据");
+        // 自定义表单数据导出
+        List<CmsCustomForm> customForms = customFormService.lambdaQuery()
+                .eq(CmsCustomForm::getSiteId, context.getSite().getSiteId())
+                .list();
+        context.saveData(CmsCustomForm.TABLE_NAME, JacksonUtils.to(customForms));
+
+        // 自定义表单关联扩展模型
+        List<Long> modelIds = customForms.stream().map(CmsCustomForm::getModelId).toList();
+        if (modelIds.isEmpty()) {
+            return;
+        }
+        List<XModel> modelList = this.modelService.lambdaQuery().in(XModel::getModelId, modelIds).list();
+        context.saveData(XModel.TABLE_NAME + XMODEL_TABLE_SUFFIX, JacksonUtils.to(modelList));
+        // 扩展模型字段
+        List<XModelField> fieldList = this.modelFieldService.lambdaQuery()
+                .in(XModelField::getModelId, modelIds).list();
+        context.saveData(XModelField.TABLE_NAME + XMODEL_TABLE_SUFFIX, JacksonUtils.to(fieldList));
+        // 扩展模型数据
+        int pageSize = 200;
+        int fileIndex = 1;
+        for (XModel model : modelList) {
+            int pageIndex = 1;
+            while (true) {
+                LambdaQueryWrapper<CmsCustomFormData> q = new LambdaQueryWrapper<CmsCustomFormData>()
+                        .eq(CmsCustomFormData::getModelId, model.getModelId());
+                Page<CmsCustomFormData> page = customFormDataMapper.selectPage(new Page<>(pageIndex, pageSize, false), q);
+                if (page.getRecords().isEmpty()) {
+                    break;
+                }
+                pageIndex++;
+                context.saveData(CmsCustomFormData.TABLE_NAME, JacksonUtils.to(page.getRecords()), fileIndex);
+                fileIndex++;
+            }
+        }
+    }
+
+    @Override
+    public void onSiteImport(SiteImportContext context) {
+        // CmsCustomForm
+        AsyncTaskManager.setTaskTenPercentProgressInfo("正在导入自定义表单");
+        Map<Long, Long> customFormIdMapping = new HashMap<>();
+        List<File> files = context.readDataFiles(CmsCustomForm.TABLE_NAME);
+        files.forEach(f -> {
+            List<CmsCustomForm> list = JacksonUtils.fromList(f, CmsCustomForm.class);
+            for (CmsCustomForm data : list) {
+                try {
+                    Long oldFormId = data.getFormId();
+                    data.setFormId(IdUtils.getSnowflakeId());
+                    data.setModelId(data.getFormId());
+                    data.setSiteId(context.getSite().getSiteId());
+                    data.createBy(context.getOperator());
+                    customFormService.save(data);
+                    customFormIdMapping.put(oldFormId, data.getFormId());
+                } catch (Exception e) {
+                    AsyncTaskManager.addErrMessage("导入自定义表单失败：" + data.getName()
+                            + "[" + data.getModelId() + "]");
+                    log.error("Import custom form failed: {}", data.getCode(), e);
+                }
+            }
+        });
+        if (files.isEmpty()) {
+            return;
+        }
+        // XModel
+        AsyncTaskManager.setTaskTenPercentProgressInfo("正在导入自定义表单元数据模型");
+        files = context.readDataFiles(XModel.TABLE_NAME + XMODEL_TABLE_SUFFIX);
+        files.forEach(f -> {
+            List<XModel> list = JacksonUtils.fromList(f, XModel.class);
+            for (XModel data : list) {
+                try {
+                    data.setModelId(customFormIdMapping.get(data.getModelId()));
+                    data.setCode(data.getModelId().toString());
+                    data.setOwnerId(context.getSite().getSiteId().toString());
+                    data.createBy(context.getOperator());
+                    modelService.save(data);
+                } catch (Exception e) {
+                    AsyncTaskManager.addErrMessage("导入自定义表单元数据模型失败：" + data.getName()
+                            + "[" + data.getModelId() + "]");
+                    log.error("Import custom form xmodel failed: {}", data.getCode(), e);
+                }
+            }
+        });
+        // XModelField
+        AsyncTaskManager.setTaskTenPercentProgressInfo("正在导入自定义表单模型字段");
+        files = context.readDataFiles(XModelField.TABLE_NAME + XMODEL_TABLE_SUFFIX);
+        files.forEach(f -> {
+            List<XModelField> list = JacksonUtils.fromList(f, XModelField.class);
+            for (XModelField data : list) {
+                try {
+                    data.setFieldId(IdUtils.getSnowflakeId());
+                    data.setModelId(customFormIdMapping.get(data.getModelId()));
+                    data.createBy(context.getOperator());
+                    modelFieldService.save(data);
+                } catch (Exception e) {
+                    AsyncTaskManager.addErrMessage("导入自定义表单模型字段失败：" + data.getName()
+                            + "[" + data.getFieldId() + "]");
+                    log.error("Import custom form xmodel field failed: {}", data.getCode(), e);
+                }
+            }
+        });
+        // CmsCustomFormData
+        AsyncTaskManager.setTaskTenPercentProgressInfo("正在导入自定义表单数据");
+        files = context.readDataFiles(CmsCustomFormData.TABLE_NAME);
+        files.forEach(f -> {
+            List<CmsCustomFormData> list = JacksonUtils.fromList(f, CmsCustomFormData.class);
+            for (CmsCustomFormData data : list) {
+                try {
+                    data.setDataId(IdUtils.getSnowflakeId());
+                    data.setModelId(customFormIdMapping.get(data.getModelId()));
+                    // 处理图片和富文本内部链接
+                    MetaModel model = modelService.getMetaModel(data.getModelId());
+                    model.getFields().forEach(field -> {
+                        if (MetaControlType_CmsImage.TYPE.equals(field.getControlType())) {
+                            String fieldValue = data.getStringFieldValue(field.getFieldName());
+                            data.setFieldValue(field.getFieldName(), context.dealInternalUrl(fieldValue));
+                        } else if (MetaControlType_UEditor.TYPE.equals(field.getControlType())) {
+                            String fieldValue = data.getStringFieldValue(field.getFieldName());
+                            if (StringUtils.isNotEmpty(fieldValue)) {
+                                // 替换正文内部资源地址
+                                StringBuilder html = new StringBuilder();
+                                int index = 0;
+                                Matcher matcher = InternalUrlUtils.InternalUrlTagPattern.matcher(fieldValue);
+                                while (matcher.find()) {
+                                    String tagStr = matcher.group();
+                                    String iurl = matcher.group(1);
+                                    String newIurl = context.dealInternalUrl(iurl);
+                                    tagStr = StringUtils.replaceEx(tagStr, iurl, newIurl);
+                                    html.append(fieldValue, index, matcher.start()).append(tagStr);
+                                    index = matcher.end();
+                                }
+                                html.append(fieldValue.substring(index));
+                                data.setFieldValue(field.getFieldName(), html.toString());
+                            }
+                        }
+                    });
+                    customFormDataMapper.insert(data);
+                } catch (Exception e) {
+                    AsyncTaskManager.addErrMessage("导入自定义及表单数据失败：" + data.getModelId() + "-" + data.getDataId());
+                    log.error("Import custom form data failed: {} - {}", data.getModelId(), data.getDataId(), e);
+                }
+            }
+        });
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-customform/src/main/java/com/chestnut/customform/domain/CmsCustomForm.java b/chestnut-cms/chestnut-cms-customform/src/main/java/com/chestnut/customform/domain/CmsCustomForm.java
index 61e77642..130c6a72 100644
--- a/chestnut-cms/chestnut-cms-customform/src/main/java/com/chestnut/customform/domain/CmsCustomForm.java
+++ b/chestnut-cms/chestnut-cms-customform/src/main/java/com/chestnut/customform/domain/CmsCustomForm.java
@@ -51,7 +51,7 @@ public class CmsCustomForm extends BaseEntity {
     private Long siteId;
     
     /**
-     * 关联元数据模型ID
+     * 关联元数据模型ID（与主键form_id一致）
      */
     private Long modelId;
 
diff --git a/chestnut-cms/chestnut-cms-dynamic/pom.xml b/chestnut-cms/chestnut-cms-dynamic/pom.xml
index b4955c54..70d1eaf7 100644
--- a/chestnut-cms/chestnut-cms-dynamic/pom.xml
+++ b/chestnut-cms/chestnut-cms-dynamic/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.chestnut</groupId>
         <artifactId>chestnut-cms</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <artifactId>chestnut-cms-dynamic</artifactId>
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/DynamicPageController.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/DynamicPageController.java
index efcfad55..ffb3eb34 100644
--- a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/DynamicPageController.java
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/DynamicPageController.java
@@ -18,6 +18,7 @@ package com.chestnut.cms.dynamic.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chestnut.cms.dynamic.core.IDynamicPageInitData;
 import com.chestnut.cms.dynamic.domain.CmsDynamicPage;
+import com.chestnut.cms.dynamic.domain.vo.DynamicPageInitDataTypeVO;
 import com.chestnut.cms.dynamic.service.IDynamicPageService;
 import com.chestnut.common.domain.R;
 import com.chestnut.common.exception.CommonErrorCode;
@@ -78,7 +79,9 @@ public class DynamicPageController extends BaseRestController {
 
 	@GetMapping("/init_data_types")
 	public R<?> getInitDataTypes() {
-		return R.ok(initDataTypes);
+		List<DynamicPageInitDataTypeVO> list = initDataTypes.stream()
+				.map(DynamicPageInitDataTypeVO::newInstance).toList();
+		return R.ok(list);
 	}
 
 	@GetMapping("/{pageId}")
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/front/DynamicPageFrontController.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/front/DynamicPageFrontController.java
index b5f7831b..d1ec9f0b 100644
--- a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/front/DynamicPageFrontController.java
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/controller/front/DynamicPageFrontController.java
@@ -52,7 +52,7 @@ public class DynamicPageFrontController extends BaseRestController {
 	public void handleDynamicPageRequest(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		Map<String, String> parameters = ServletUtils.getParameters();
 		String requestURI = request.getRequestURI();
-		System.out.println("dynamicPage: " + requestURI);
+
 		Long siteId = MapUtils.getLong(parameters, "sid", 0L);
 		String publishPipeCode = parameters.get("pp");
 		boolean preview = MapUtils.getBoolean(parameters, "preview", false);
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/IDynamicPageInitData.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/IDynamicPageInitData.java
index 96eb5d39..193f938c 100644
--- a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/IDynamicPageInitData.java
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/IDynamicPageInitData.java
@@ -17,6 +17,8 @@ package com.chestnut.cms.dynamic.core;
 
 import com.chestnut.common.staticize.core.TemplateContext;
 
+import java.util.Map;
+
 /**
  * 动态页面初始化数据接口
  *
@@ -27,7 +29,7 @@ public interface IDynamicPageInitData {
 
     String BEAN_PREFIX = "DynamicPageInitData.";
 
-    void initTemplateData(TemplateContext context);
+    void initTemplateData(TemplateContext context, Map<String, String> parameters);
 
     String getType();
 
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/impl/MemberDynamicPageInitData.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/impl/MemberDynamicPageInitData.java
index 83d44909..d3b86a22 100644
--- a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/impl/MemberDynamicPageInitData.java
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/impl/MemberDynamicPageInitData.java
@@ -22,27 +22,31 @@ import com.chestnut.member.security.StpMemberUtil;
 import com.chestnut.member.util.MemberUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * MemberDynamicPageInitData
  *
  * @author 兮玥
  * @email 190785909@qq.com
  */
-@Component
+@Component(IDynamicPageInitData.BEAN_PREFIX + MemberDynamicPageInitData.TYPE)
 public class MemberDynamicPageInitData implements IDynamicPageInitData {
 
+    public static final String TYPE = "Member";
+
     @Override
     public String getType() {
-        return "Member";
+        return TYPE;
     }
 
     @Override
     public String getName() {
-        return "登录会员";
+        return "{DYNAMIC_PAGE_INIT_DATA." + TYPE + "}";
     }
 
     @Override
-    public void initTemplateData(TemplateContext context) {
+    public void initTemplateData(TemplateContext context, Map<String, String> parameters) {
         if (StpMemberUtil.isLogin()) {
             LoginUser loginUser = StpMemberUtil.getLoginUser();
             context.getVariables().put("Member", loginUser.getUser());
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/impl/PaginationDynamicPageInitData.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/impl/PaginationDynamicPageInitData.java
new file mode 100644
index 00000000..42493799
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/core/impl/PaginationDynamicPageInitData.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.dynamic.core.impl;
+
+import com.chestnut.cms.dynamic.core.IDynamicPageInitData;
+import com.chestnut.common.staticize.core.TemplateContext;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * PaginationDynamicPageInitData
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Component(IDynamicPageInitData.BEAN_PREFIX + PaginationDynamicPageInitData.TYPE)
+public class PaginationDynamicPageInitData implements IDynamicPageInitData {
+
+    public static final String TYPE = "Pagination";
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    @Override
+    public String getName() {
+        return "{DYNAMIC_PAGE_INIT_DATA." + TYPE + "}";
+    }
+
+    @Override
+    public void initTemplateData(TemplateContext context, Map<String, String> parameters) {
+        int pageIndex = MapUtils.getIntValue(parameters, "pi", 1);
+        context.setPageIndex(pageIndex);
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/domain/vo/DynamicPageInitDataTypeVO.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/domain/vo/DynamicPageInitDataTypeVO.java
new file mode 100644
index 00000000..916cf0af
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/domain/vo/DynamicPageInitDataTypeVO.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.dynamic.domain.vo;
+
+import com.chestnut.cms.dynamic.core.IDynamicPageInitData;
+import com.chestnut.common.i18n.I18nUtils;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 自定义动态页面初始化数据类型VO
+ * 
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Getter
+@Setter
+public class DynamicPageInitDataTypeVO {
+
+    /**
+     * 类型，唯一标识
+     */
+    private String type;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    public static DynamicPageInitDataTypeVO newInstance(IDynamicPageInitData dynamicPageInitData) {
+        DynamicPageInitDataTypeVO vo = new DynamicPageInitDataTypeVO();
+        vo.setType(dynamicPageInitData.getType());
+        vo.setName(I18nUtils.get(dynamicPageInitData.getName()));
+        return vo;
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/IDynamicPageService.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/IDynamicPageService.java
index b6c9d3c1..164265ff 100644
--- a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/IDynamicPageService.java
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/IDynamicPageService.java
@@ -25,8 +25,6 @@ import java.util.Map;
 
 public interface IDynamicPageService extends IService<CmsDynamicPage> {
 
-	String getDynamicPagePath(Long siteId, String code);
-
 	void addDynamicPage(CmsDynamicPage dynamicPage);
 
 	void saveDynamicPage(CmsDynamicPage dynamicPage);
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/impl/DynamicPageHelper.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/impl/DynamicPageHelper.java
new file mode 100644
index 00000000..a5b37195
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/impl/DynamicPageHelper.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.dynamic.service.impl;
+
+import com.chestnut.cms.dynamic.core.IDynamicPageInitData;
+import com.chestnut.cms.dynamic.domain.CmsDynamicPage;
+import com.chestnut.common.redis.RedisCache;
+import com.chestnut.contentcore.config.CMSConfig;
+import com.chestnut.contentcore.core.IDynamicPageType;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.Objects;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class DynamicPageHelper {
+
+    private static final String CACHE_PREFIX = CMSConfig.CachePrefix + "dynamic_page:";
+
+
+    private final RedisCache redisCache;
+
+    private final Map<String, IDynamicPageInitData> dynamicPageInitDataMap;
+
+    private final Map<String, IDynamicPageType> dynamicPageTypeMap;
+
+    public IDynamicPageInitData getDynamicPageInitData(String type) {
+        return dynamicPageInitDataMap.get(IDynamicPageInitData.BEAN_PREFIX + type);
+    }
+
+    public String getDynamicPagePath(Long siteId, String code) {
+        IDynamicPageType dynamicPageType = this.dynamicPageTypeMap.get(IDynamicPageType.BEAN_PREFIX + code);
+        if (Objects.nonNull(dynamicPageType)) {
+            return dynamicPageType.getRequestPath();
+        }
+        CmsDynamicPage dynamicPage = getDynamicPage(siteId, code);
+        if (Objects.nonNull(dynamicPage)) {
+            return dynamicPage.getPath();
+        }
+        return null;
+    }
+
+    public void clearCache(CmsDynamicPage dynamicPage) {
+        this.redisCache.deleteObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getPath());
+        this.redisCache.deleteObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getCode());
+    }
+
+    public void updateCache(CmsDynamicPage dynamicPage) {
+        this.redisCache.setCacheObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getPath(), dynamicPage);
+        this.redisCache.setCacheObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getCode(), dynamicPage);
+    }
+
+    public CmsDynamicPage getDynamicPage(Long siteId, String path) {
+        if (path.startsWith("/")) {
+            path = path.substring(1);
+        }
+        return redisCache.getCacheObject(CACHE_PREFIX + siteId + ":" + path);
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/impl/DynamicPageServiceImpl.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/impl/DynamicPageServiceImpl.java
index 503c88a8..0d6b9377 100644
--- a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/impl/DynamicPageServiceImpl.java
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/service/impl/DynamicPageServiceImpl.java
@@ -24,15 +24,12 @@ import com.chestnut.cms.dynamic.mapper.CmsDynamicPageMapper;
 import com.chestnut.cms.dynamic.service.IDynamicPageService;
 import com.chestnut.common.exception.CommonErrorCode;
 import com.chestnut.common.exception.GlobalException;
-import com.chestnut.common.redis.RedisCache;
 import com.chestnut.common.staticize.StaticizeService;
 import com.chestnut.common.staticize.core.TemplateContext;
 import com.chestnut.common.utils.Assert;
 import com.chestnut.common.utils.IdUtils;
-import com.chestnut.common.utils.ServletUtils;
 import com.chestnut.common.utils.SpringUtils;
 import com.chestnut.contentcore.config.CMSConfig;
-import com.chestnut.contentcore.core.IDynamicPageType;
 import com.chestnut.contentcore.domain.CmsSite;
 import com.chestnut.contentcore.service.ISiteService;
 import com.chestnut.contentcore.service.ITemplateService;
@@ -67,33 +64,17 @@ public class DynamicPageServiceImpl extends ServiceImpl<CmsDynamicPageMapper, Cm
 
     private final StaticizeService staticizeService;
 
-    private final RedisCache redisCache;
-
-    private final Map<String, IDynamicPageInitData> dynamicPageInitDataMap;
-
     private final List<RequestMappingHandlerMapping> allRequestMapping;
 
     private final DynamicPageRequestMappingHandlerMapping dynamicPageRequestMapping;
 
-    private final Map<String, IDynamicPageType> dynamicPageTypeMap;
+    private final DynamicPageHelper dynamicPageHelper;
 
-    @Override
-    public String getDynamicPagePath(Long siteId, String code) {
-        IDynamicPageType dynamicPageType = this.dynamicPageTypeMap.get(IDynamicPageType.BEAN_PREFIX + code);
-        if (Objects.nonNull(dynamicPageType)) {
-            return dynamicPageType.getRequestPath();
-        }
-        CmsDynamicPage dynamicPage = getDynamicPage(siteId, code);
-        if (Objects.nonNull(dynamicPage)) {
-            return dynamicPage.getPath();
-        }
-        return null;
-    }
 
     @Override
     public void addDynamicPage(CmsDynamicPage dynamicPage) {
-        if (!dynamicPage.getPath().startsWith("/")) {
-            dynamicPage.setPath("/" + dynamicPage.getPath());
+        if (dynamicPage.getPath().startsWith("/")) {
+            dynamicPage.setPath(dynamicPage.getPath().substring(1));
         }
         this.checkDynamicPage(dynamicPage);
 
@@ -102,7 +83,7 @@ public class DynamicPageServiceImpl extends ServiceImpl<CmsDynamicPageMapper, Cm
 
         this.registerDynamicPageMapping(dynamicPage);
 
-        this.updateCache(dynamicPage);
+        dynamicPageHelper.updateCache(dynamicPage);
     }
 
     @Override
@@ -119,7 +100,7 @@ public class DynamicPageServiceImpl extends ServiceImpl<CmsDynamicPageMapper, Cm
         dbDynamicPage.setTemplates(dynamicPage.getTemplates());
         this.updateById(dbDynamicPage);
 
-        this.updateCache(dbDynamicPage);
+        dynamicPageHelper.updateCache(dbDynamicPage);
     }
 
     @Override
@@ -129,24 +110,10 @@ public class DynamicPageServiceImpl extends ServiceImpl<CmsDynamicPageMapper, Cm
 
         dynamicPages.forEach(dynamicPage -> {
             this.unregisterDynamicPageMapping(dynamicPage);
-            this.clearCache(dynamicPage);
+            dynamicPageHelper.clearCache(dynamicPage);
         });
     }
 
-    private void clearCache(CmsDynamicPage dynamicPage) {
-        this.redisCache.deleteObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getPath());
-        this.redisCache.deleteObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getCode());
-    }
-
-    private void updateCache(CmsDynamicPage dynamicPage) {
-        this.redisCache.setCacheObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getPath(), dynamicPage);
-        this.redisCache.setCacheObject(CACHE_PREFIX + dynamicPage.getSiteId() + ":" + dynamicPage.getCode(), dynamicPage);
-    }
-
-    private CmsDynamicPage getDynamicPage(Long siteId, String path) {
-        return redisCache.getCacheObject(CACHE_PREFIX + siteId + ":" + path);
-    }
-
     private void checkDynamicPage(CmsDynamicPage dynamicPage) {
         Long count = this.lambdaQuery()
                 .and(wrapper -> wrapper.eq(CmsDynamicPage::getPath, dynamicPage.getPath())
@@ -201,7 +168,7 @@ public class DynamicPageServiceImpl extends ServiceImpl<CmsDynamicPageMapper, Cm
     public void run(String... args) throws Exception {
         // 初始化DynamicPageRequestMapping
         this.list().forEach(dynamicPage -> {
-            this.updateCache(dynamicPage);
+            dynamicPageHelper.updateCache(dynamicPage);
 
             this.registerDynamicPageMapping(dynamicPage);
         });
@@ -218,7 +185,7 @@ public class DynamicPageServiceImpl extends ServiceImpl<CmsDynamicPageMapper, Cm
             this.catchException("/", response, new RuntimeException("Site not found: " + siteId));
             return;
         }
-        CmsDynamicPage dynamicPage = this.getDynamicPage(siteId, requestURI);
+        CmsDynamicPage dynamicPage = dynamicPageHelper.getDynamicPage(siteId, requestURI);
         String template = dynamicPage.getTemplates().get(publishPipeCode);
         File templateFile = this.templateService.findTemplateFile(site, template, publishPipeCode);
         if (Objects.isNull(templateFile) || !templateFile.exists()) {
@@ -236,13 +203,13 @@ public class DynamicPageServiceImpl extends ServiceImpl<CmsDynamicPageMapper, Cm
             // init template datamode
             TemplateUtils.initGlobalVariables(site, templateContext);
             // init templateType data to datamode
-            templateContext.getVariables().put("Request", ServletUtils.getParameters());
+            templateContext.getVariables().put("Request", parameters);
             // 动态页面自定义数据
             if (Objects.nonNull(dynamicPage.getInitDataTypes())) {
                 dynamicPage.getInitDataTypes().forEach(initDataType -> {
-                    IDynamicPageInitData initData = dynamicPageInitDataMap.get(IDynamicPageInitData.BEAN_PREFIX + initDataType);
+                    IDynamicPageInitData initData = dynamicPageHelper.getDynamicPageInitData(initDataType);
                     if (Objects.nonNull(initData)) {
-                        initData.initTemplateData(templateContext);
+                        initData.initTemplateData(templateContext, parameters);
                     }
                 });
             }
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/template/func/CustomDynamicPageLinkFunction.java b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/template/func/CustomDynamicPageLinkFunction.java
new file mode 100644
index 00000000..cfa007e7
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/java/com/chestnut/cms/dynamic/template/func/CustomDynamicPageLinkFunction.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.dynamic.template.func;
+
+import com.chestnut.cms.dynamic.service.impl.DynamicPageHelper;
+import com.chestnut.common.staticize.FreeMarkerUtils;
+import com.chestnut.common.staticize.core.TemplateContext;
+import com.chestnut.common.staticize.func.AbstractFunc;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.util.TemplateUtils;
+import freemarker.core.Environment;
+import freemarker.template.TemplateBooleanModel;
+import freemarker.template.TemplateModelException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Freemarker模板自定义函数：获取自定义动态模板链接
+ */
+@Component
+@RequiredArgsConstructor
+public class CustomDynamicPageLinkFunction extends AbstractFunc  {
+
+	static final String FUNC_NAME = "customDynamicPageLink";
+
+	private static final String DESC = "{FREEMARKER.FUNC.DESC." + FUNC_NAME + "}";
+
+	private final DynamicPageHelper dynamicPageHelper;
+
+	@Override
+	public String getFuncName() {
+		return FUNC_NAME;
+	}
+
+	@Override
+	public String getDesc() {
+		return DESC;
+	}
+
+	@Override
+	public Object exec0(Object... args) throws TemplateModelException {
+		if (args.length < 1) {
+			return StringUtils.EMPTY;
+		}
+		String code = args[0].toString(); // 自动动态模板编码
+
+		Environment env = Environment.getCurrentEnvironment();
+		TemplateContext context = FreeMarkerUtils.getTemplateContext(env);
+		long siteId = FreeMarkerUtils.evalLongVariable(env, "Site.siteId");
+		String path = this.dynamicPageHelper.getDynamicPagePath(siteId, code);
+		if (StringUtils.isEmpty(path)) {
+			throw new TemplateModelException("Unknown dynamic page code: " + code);
+		}
+		if (context.isPreview()) {
+			path += "?preview=true";
+			path = TemplateUtils.appendTokenParameter(path, Environment.getCurrentEnvironment());
+		}
+		if (args.length == 2) {
+			String queryString = args[1].toString();
+			path += (path.contains("?") ? "&" : "?") + queryString;
+		}
+		boolean ignoreBaseArg = true;
+		if (args.length == 3) {
+			ignoreBaseArg = ((TemplateBooleanModel) args[2]).getAsBoolean();
+		}
+		if (context.isPreview() || !ignoreBaseArg) {
+			path += (path.contains("?") ? "&" : "?") + "sid=" + siteId + "&pp=" + context.getPublishPipeCode();
+		}
+		return path;
+	}
+
+	@Override
+	public List<FuncArg> getFuncArgs() {
+		return List.of(
+				new FuncArg("动态页面编码", FuncArgType.String, true, null),
+				new FuncArg("自定义参数", FuncArgType.String, false, null),
+				new FuncArg("忽略sid/pp参数", FuncArgType.String, false, "默认：true")
+		);
+	}
+}
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages.properties b/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages.properties
new file mode 100644
index 00000000..636f94fb
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages.properties
@@ -0,0 +1,4 @@
+DYNAMIC_PAGE_INIT_DATA.Member=登录会员
+DYNAMIC_PAGE_INIT_DATA.Pagination=分页参数
+
+FREEMARKER.FUNC.DESC.customDynamicPageLink=获取自定义动态模板页面链接，例如：${customDynamicPageLink('Test','a=1&b=2',true)}
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages_en.properties b/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages_en.properties
new file mode 100644
index 00000000..4ebbfff4
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages_en.properties
@@ -0,0 +1,4 @@
+DYNAMIC_PAGE_INIT_DATA.Member=Member
+DYNAMIC_PAGE_INIT_DATA.Pagination=Pagination
+
+FREEMARKER.FUNC.DESC.customDynamicPageLink=Get custom dynamic page link, eg: ${customDynamicPageLink('Test','a=1&b=2',true)}
diff --git a/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 00000000..90a3191e
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-dynamic/src/main/resources/i18n/messages_zh_TW.properties
@@ -0,0 +1,4 @@
+DYNAMIC_PAGE_INIT_DATA.Member=登錄會員
+DYNAMIC_PAGE_INIT_DATA.Pagination=分頁參數
+
+FREEMARKER.FUNC.DESC.customDynamicPageLink=獲取自定義動態模板頁面鏈接，例如：${customDynamicPageLink('Test','a=1&b=2',true)}
diff --git a/chestnut-cms/chestnut-cms-exmodel/pom.xml b/chestnut-cms/chestnut-cms-exmodel/pom.xml
index 11b2f33e..f7a3d8d7 100644
--- a/chestnut-cms/chestnut-cms-exmodel/pom.xml
+++ b/chestnut-cms/chestnut-cms-exmodel/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-exmodel</artifactId>
diff --git a/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/EXModelCoreDataHandler.java b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/EXModelCoreDataHandler.java
index d3433330..81cdba1d 100644
--- a/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/EXModelCoreDataHandler.java
+++ b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/EXModelCoreDataHandler.java
@@ -59,6 +59,8 @@ import java.util.regex.Matcher;
 @RequiredArgsConstructor
 public class EXModelCoreDataHandler implements ICoreDataHandler {
 
+    private static final String XMODEL_TABLE_SUFFIX = "_cms_exmodel";
+
     private final ExtendModelMapper modelDataMapper;
 
     private final IModelService modelService;
@@ -88,11 +90,11 @@ public class EXModelCoreDataHandler implements ICoreDataHandler {
 
         // 扩展模型
         List<XModel> modelList = this.modelService.lambdaQuery().in(XModel::getModelId, modelIdStrings).list();
-        context.saveData(XModel.TABLE_NAME, JacksonUtils.to(modelList));
+        context.saveData(XModel.TABLE_NAME + XMODEL_TABLE_SUFFIX, JacksonUtils.to(modelList));
         // 扩展模型字段
         List<XModelField> fieldList = this.modelFieldService.lambdaQuery()
                 .in(XModelField::getModelId, modelIdStrings).list();
-        context.saveData(XModelField.TABLE_NAME, JacksonUtils.to(fieldList));
+        context.saveData(XModelField.TABLE_NAME + XMODEL_TABLE_SUFFIX, JacksonUtils.to(fieldList));
         // 扩展模型数据
         int pageSize = 200;
         int fileIndex = 1;
@@ -117,7 +119,7 @@ public class EXModelCoreDataHandler implements ICoreDataHandler {
         AsyncTaskManager.setTaskTenPercentProgressInfo("正在导入扩展模型");
         // XModel
         Map<Long, Long> modelIdMapping = new HashMap<>();
-        List<File> files = context.readDataFiles(XModel.TABLE_NAME);
+        List<File> files = context.readDataFiles(XModel.TABLE_NAME + XMODEL_TABLE_SUFFIX);
         files.forEach(f -> {
             List<XModel> list = JacksonUtils.fromList(f, XModel.class);
             for (XModel data : list) {
@@ -141,7 +143,7 @@ public class EXModelCoreDataHandler implements ICoreDataHandler {
         });
         // XModelField
         AsyncTaskManager.setTaskTenPercentProgressInfo("正在导入扩展模型字段");
-        files = context.readDataFiles(XModelField.TABLE_NAME);
+        files = context.readDataFiles(XModelField.TABLE_NAME + XMODEL_TABLE_SUFFIX);
         files.forEach(f -> {
             List<XModelField> list = JacksonUtils.fromList(f, XModelField.class);
             for (XModelField data : list) {
@@ -198,7 +200,7 @@ public class EXModelCoreDataHandler implements ICoreDataHandler {
                     });
                     modelDataMapper.insert(data);
                 } catch (Exception e) {
-                    AsyncTaskManager.addErrMessage("导入扩展模型字段失败：" + data.getModelId()
+                    AsyncTaskManager.addErrMessage("导入扩展模型数据失败：" + data.getModelId()
                             + data.getDataType() + "-" + data.getDataId());
                     log.error("Import xmodel data failed: {} - {}", data.getModelId(), data.getDataId(), e);
                 }
diff --git a/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/MetaControlType_CmsImage.java b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/MetaControlType_CmsImage.java
index 99f5215e..0b73ce95 100644
--- a/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/MetaControlType_CmsImage.java
+++ b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/MetaControlType_CmsImage.java
@@ -52,9 +52,9 @@ public class MetaControlType_CmsImage implements IMetaControlType {
         String imagePath = value.toString();
         if (InternalUrlUtils.isInternalUrl(imagePath)) {
             String previewUrl = InternalUrlUtils.getActualPreviewUrl(imagePath);
-            fieldData.setValueSrc(previewUrl);
+            fieldData.setValueObj(previewUrl);
         } else {
-            fieldData.setValueSrc(imagePath);
+            fieldData.setValueObj(imagePath);
         }
     }
 }
diff --git a/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/MetaControlType_ContentSelect.java b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/MetaControlType_ContentSelect.java
new file mode 100644
index 00000000..d0a40664
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-exmodel/src/main/java/com/chestnut/exmodel/MetaControlType_ContentSelect.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.exmodel;
+
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.domain.CmsContent;
+import com.chestnut.contentcore.service.IContentService;
+import com.chestnut.xmodel.core.IMetaControlType;
+import com.chestnut.xmodel.dto.XModelFieldDataDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * 元数据模型字段控件类型：内容选择
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@RequiredArgsConstructor
+@Component(IMetaControlType.BEAN_PREFIX + MetaControlType_ContentSelect.TYPE)
+public class MetaControlType_ContentSelect implements IMetaControlType {
+
+    public static final String TYPE = "CMSContentSelect";
+
+    private final IContentService contentService;
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    @Override
+    public String getName() {
+        return "{META.CONTROL_TYPE." + TYPE + "}";
+    }
+
+    @Override
+    public void parseFieldValue(XModelFieldDataDTO fieldData) {
+        Object value = fieldData.getValue();
+        if (Objects.isNull(value) || StringUtils.isEmpty(value.toString())) {
+            fieldData.setValueObj(Map.of());
+            return;
+        }
+        Optional<CmsContent> content = contentService.lambdaQuery()
+                .select(List.of(CmsContent::getContentId, CmsContent::getTitle))
+                .eq(CmsContent::getContentId, value).oneOpt();
+        if (content.isEmpty()) {
+            fieldData.setValue(StringUtils.EMPTY);
+            fieldData.setValueObj(Map.of());
+            return;
+        }
+        fieldData.setValueObj(Map.of(
+                "contentId", content.get().getContentId(),
+                "title", content.get().getTitle()
+        ));
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages.properties b/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages.properties
index d6029bdb..78f74f7e 100644
--- a/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages.properties
+++ b/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages.properties
@@ -11,4 +11,5 @@ DICT.ExtendModelDataType.catalog=栏目
 DICT.ExtendModelDataType.content=内容
 
 META.CONTROL_TYPE.CMSImage=图片上传
-META.CONTROL_TYPE.UEditor=富文本编辑器
\ No newline at end of file
+META.CONTROL_TYPE.UEditor=富文本编辑器
+META.CONTROL_TYPE.CMSContentSelect=内容选择
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_en.properties b/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_en.properties
index a0cb846b..7136f4f7 100644
--- a/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_en.properties
@@ -11,4 +11,5 @@ DICT.ExtendModelDataType.catalog=Catalog
 DICT.ExtendModelDataType.content=Content
 
 META.CONTROL_TYPE.CMSImage=Image Upload
-META.CONTROL_TYPE.UEditor=Rich Text Editor
\ No newline at end of file
+META.CONTROL_TYPE.UEditor=Rich Text Editor
+META.CONTROL_TYPE.CMSContentSelect=Content Selector
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_zh_TW.properties
index 23761c45..7e115748 100644
--- a/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-cms/chestnut-cms-exmodel/src/main/resources/i18n/messages_zh_TW.properties
@@ -12,3 +12,4 @@ DICT.ExtendModelDataType.content=內容
 
 META.CONTROL_TYPE.CMSImage=圖片上傳
 META.CONTROL_TYPE.UEditor=富文本編輯器
+META.CONTROL_TYPE.CMSContentSelect=內容選擇
diff --git a/chestnut-cms/chestnut-cms-image/pom.xml b/chestnut-cms/chestnut-cms-image/pom.xml
index c77b3d18..ffee28c3 100644
--- a/chestnut-cms/chestnut-cms-image/pom.xml
+++ b/chestnut-cms/chestnut-cms-image/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-image</artifactId>
diff --git a/chestnut-cms/chestnut-cms-image/src/main/java/com/chestnut/cms/image/ImageCoreDataHandler.java b/chestnut-cms/chestnut-cms-image/src/main/java/com/chestnut/cms/image/ImageCoreDataHandler.java
new file mode 100644
index 00000000..6cc2cd9b
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-image/src/main/java/com/chestnut/cms/image/ImageCoreDataHandler.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.image;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chestnut.cms.image.domain.CmsImage;
+import com.chestnut.cms.image.service.IImageService;
+import com.chestnut.common.async.AsyncTaskManager;
+import com.chestnut.common.utils.IdUtils;
+import com.chestnut.common.utils.JacksonUtils;
+import com.chestnut.contentcore.core.ICoreDataHandler;
+import com.chestnut.contentcore.core.SiteExportContext;
+import com.chestnut.contentcore.core.SiteImportContext;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * 图集内容扩展内容核心数据处理器
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ImageCoreDataHandler implements ICoreDataHandler {
+
+    private final IImageService imageService;
+
+    @Override
+    public void onSiteExport(SiteExportContext context) {
+        // cms_image
+        AsyncTaskManager.setTaskTenPercentProgressInfo("正在导出图集内容数据");
+        int pageSize = 200;
+        long offset = 0;
+        int fileIndex = 1;
+        while (true) {
+            LambdaQueryWrapper<CmsImage> q = new LambdaQueryWrapper<CmsImage>()
+                    .eq(CmsImage::getSiteId, context.getSite().getSiteId())
+                    .gt(CmsImage::getImageId, offset)
+                    .orderByAsc(CmsImage::getImageId);
+            Page<CmsImage> page = imageService.page(new Page<>(1, pageSize, false), q);
+            if (!page.getRecords().isEmpty()) {
+                context.saveData(CmsImage.TABLE_NAME, JacksonUtils.to(page.getRecords()), fileIndex);
+                if (page.getRecords().size() < pageSize) {
+                    break;
+                }
+                offset = page.getRecords().get(page.getRecords().size() - 1).getContentId();
+                fileIndex++;
+            } else {
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void onSiteImport(SiteImportContext context) {
+        // cms_image
+        AsyncTaskManager.setTaskTenPercentProgressInfo("正在导入图集内容数据");
+        List<File> files = context.readDataFiles(CmsImage.TABLE_NAME);
+        files.forEach(f -> {
+            List<CmsImage> list = JacksonUtils.fromList(f, CmsImage.class);
+            for (CmsImage data : list) {
+                try {
+                    data.setImageId(IdUtils.getSnowflakeId());
+                    data.setSiteId(context.getSite().getSiteId());
+                    data.setContentId(context.getContentIdMap().get(data.getContentId()));
+                    data.createBy(context.getOperator());
+                    data.setPath(context.dealInternalUrl(data.getPath()));
+                    imageService.save(data);
+                } catch (Exception e) {
+                    AsyncTaskManager.addErrMessage("导入图集内容数据失败：" + data.getTitle()
+                            + "[" + data.getImageId() + "]");
+                    log.error("Import cms_image failed: {}", data.getImageId(), e);
+                }
+            }
+        });
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-link/pom.xml b/chestnut-cms/chestnut-cms-link/pom.xml
index 45415e8c..1efbc6d6 100644
--- a/chestnut-cms/chestnut-cms-link/pom.xml
+++ b/chestnut-cms/chestnut-cms-link/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-link</artifactId>
diff --git a/chestnut-cms/chestnut-cms-media/pom.xml b/chestnut-cms/chestnut-cms-media/pom.xml
index d731b8cd..1f7c92e4 100644
--- a/chestnut-cms/chestnut-cms-media/pom.xml
+++ b/chestnut-cms/chestnut-cms-media/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-media</artifactId>
diff --git a/chestnut-cms/chestnut-cms-media/src/main/java/com/chestnut/media/template/tag/CmsVideoTag.java b/chestnut-cms/chestnut-cms-media/src/main/java/com/chestnut/media/template/tag/CmsVideoTag.java
index 736fdbc7..ab195bf1 100644
--- a/chestnut-cms/chestnut-cms-media/src/main/java/com/chestnut/media/template/tag/CmsVideoTag.java
+++ b/chestnut-cms/chestnut-cms-media/src/main/java/com/chestnut/media/template/tag/CmsVideoTag.java
@@ -77,7 +77,7 @@ public class CmsVideoTag extends AbstractListTag {
 		q.orderByAsc(CmsVideo::getSortFlag);
 
 		Page<CmsVideo> pageResult = this.videoService.page(new Page<>(pageIndex, size, page), q);
-		if (pageIndex > 1 & pageResult.getRecords().size() == 0) {
+		if (pageIndex > 1 & pageResult.getRecords().isEmpty()) {
 			throw new TemplateException("内容列表页码超出上限：" + pageIndex, env);
 		}
 		TemplateContext context = FreeMarkerUtils.getTemplateContext(env);
diff --git a/chestnut-cms/chestnut-cms-member/pom.xml b/chestnut-cms/chestnut-cms-member/pom.xml
index 96df4cdb..8168e827 100644
--- a/chestnut-cms/chestnut-cms-member/pom.xml
+++ b/chestnut-cms/chestnut-cms-member/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.chestnut</groupId>
         <artifactId>chestnut-cms</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <artifactId>chestnut-cms-member</artifactId>
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountBindEmailDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountBindEmailDynamicPageType.java
index f35b8a72..7862da13 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountBindEmailDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountBindEmailDynamicPageType.java
@@ -63,7 +63,7 @@ public class AccountBindEmailDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "会员绑定邮箱页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountCentreDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountCentreDynamicPageType.java
index c6dff498..564198e1 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountCentreDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountCentreDynamicPageType.java
@@ -59,7 +59,7 @@ public class AccountCentreDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "个人中心页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountContributeDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountContributeDynamicPageType.java
index b58c7335..dfff7779 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountContributeDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountContributeDynamicPageType.java
@@ -76,7 +76,7 @@ public class AccountContributeDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "会员投稿页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountForgetPasswordDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountForgetPasswordDynamicPageType.java
index d4e38ad3..fe01a292 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountForgetPasswordDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountForgetPasswordDynamicPageType.java
@@ -47,7 +47,7 @@ public class AccountForgetPasswordDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "会员找回密码页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountLoginDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountLoginDynamicPageType.java
index 96476495..a6d7a12b 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountLoginDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountLoginDynamicPageType.java
@@ -47,7 +47,7 @@ public class AccountLoginDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "会员登录页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountPasswordDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountPasswordDynamicPageType.java
index ee7e4325..dc47f025 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountPasswordDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountPasswordDynamicPageType.java
@@ -58,12 +58,12 @@ public class AccountPasswordDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getType() {
-        return TYPE;
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
     public String getName() {
-        return "会员修改密码页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountRegisterDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountRegisterDynamicPageType.java
index 97aa6a66..3c7b1496 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountRegisterDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountRegisterDynamicPageType.java
@@ -47,7 +47,7 @@ public class AccountRegisterDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "会员注册页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountSettingDynamicPageType.java b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountSettingDynamicPageType.java
index 1374b4b4..c7ccf5d9 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountSettingDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-member/src/main/java/com/chestnut/cms/member/impl/AccountSettingDynamicPageType.java
@@ -63,7 +63,7 @@ public class AccountSettingDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "会员设置页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages.properties b/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages.properties
index b1f0f2d8..5cc6cae5 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages.properties
+++ b/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages.properties
@@ -9,3 +9,13 @@ FREEMARKER.TAG.DESC.cms_member_follow=获取关注/粉丝数据列表，内嵌<#
 
 # freemarker模板函数
 FREEMARKER.FUNC.DESC.accountUrl=会员中心动态页面地址，例如：${accountUrl('comment')}
+
+# 动态模板
+DYNAMIC_PAGE_TYPE.NAME.AccountBindEmail=会员绑定邮箱页
+DYNAMIC_PAGE_TYPE.NAME.AccountCentre=会员个人中心页
+DYNAMIC_PAGE_TYPE.NAME.AccountContribute=会员投稿页
+DYNAMIC_PAGE_TYPE.NAME.AccountForgetPassword=会员找回密码页
+DYNAMIC_PAGE_TYPE.NAME.AccountLogin=会员登录页
+DYNAMIC_PAGE_TYPE.NAME.AccountPassword=会员修改密码页
+DYNAMIC_PAGE_TYPE.NAME.AccountRegister=会员注册页
+DYNAMIC_PAGE_TYPE.NAME.AccountSetting=会员设置页
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_en.properties b/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_en.properties
index 73a97051..5e475ce7 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_en.properties
@@ -9,3 +9,13 @@ FREEMARKER.TAG.DESC.cms_member_follow=Fetch member follow/follower list, use <#l
 
 # freemarker模板函数
 FREEMARKER.FUNC.DESC.accountUrl=Account centre page url, eg: ${accountUrl('comment')}.
+
+# 动态模板
+DYNAMIC_PAGE_TYPE.NAME.AccountBindEmail=Account binding email page
+DYNAMIC_PAGE_TYPE.NAME.AccountCentre=Account centre page
+DYNAMIC_PAGE_TYPE.NAME.AccountContribute=Account contribute page
+DYNAMIC_PAGE_TYPE.NAME.AccountForgetPassword=Account forget password page
+DYNAMIC_PAGE_TYPE.NAME.AccountLogin=Account login page
+DYNAMIC_PAGE_TYPE.NAME.AccountPassword=Account modify password page
+DYNAMIC_PAGE_TYPE.NAME.AccountRegister=Account register page
+DYNAMIC_PAGE_TYPE.NAME.AccountSetting=Account setting page
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_zh_TW.properties
index 933a0b10..d4a40490 100644
--- a/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-cms/chestnut-cms-member/src/main/resources/i18n/messages_zh_TW.properties
@@ -9,3 +9,13 @@ FREEMARKER.TAG.DESC.cms_member_follow=獲取關注/粉絲數據列表，內嵌<#
 
 # freemarker模板函數
 FREEMARKER.FUNC.DESC.accountUrl=會員中心動態頁面地址，例如：${accountUrl('comment')}
+
+# 动态模板
+DYNAMIC_PAGE_TYPE.NAME.AccountBindEmail=會員綁定郵箱頁
+DYNAMIC_PAGE_TYPE.NAME.AccountCentre=會員個人中心頁
+DYNAMIC_PAGE_TYPE.NAME.AccountContribute=會員投稿頁
+DYNAMIC_PAGE_TYPE.NAME.AccountForgetPassword=會員找回密碼頁
+DYNAMIC_PAGE_TYPE.NAME.AccountLogin=會員登錄頁
+DYNAMIC_PAGE_TYPE.NAME.AccountPassword=會員修改密碼頁
+DYNAMIC_PAGE_TYPE.NAME.AccountRegister=會員註冊頁
+DYNAMIC_PAGE_TYPE.NAME.AccountSetting=會員設置頁
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-search/pom.xml b/chestnut-cms/chestnut-cms-search/pom.xml
index 25795bab..6e46b448 100644
--- a/chestnut-cms/chestnut-cms-search/pom.xml
+++ b/chestnut-cms/chestnut-cms-search/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-search</artifactId>
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/CmsSearchConstants.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/CmsSearchConstants.java
new file mode 100644
index 00000000..6dd8376b
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/CmsSearchConstants.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.search;
+
+/**
+ * CmsSearchConstants
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+public interface CmsSearchConstants {
+
+    String SEARCH_SOURCE_PREFIX = "cms:";
+
+    static String generateSearchSource(Long siteId) {
+        return SEARCH_SOURCE_PREFIX + siteId;
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/CMSSearchLogController.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/CMSSearchLogController.java
new file mode 100644
index 00000000..817d5537
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/CMSSearchLogController.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.search.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chestnut.cms.search.CmsSearchConstants;
+import com.chestnut.common.domain.R;
+import com.chestnut.common.security.anno.Priv;
+import com.chestnut.common.security.web.BaseRestController;
+import com.chestnut.common.security.web.PageRequest;
+import com.chestnut.common.utils.ServletUtils;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.domain.CmsSite;
+import com.chestnut.contentcore.service.ISiteService;
+import com.chestnut.search.domain.SearchLog;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.service.ISearchLogService;
+import com.chestnut.system.security.AdminUserType;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/cms/search/log")
+public class CMSSearchLogController extends BaseRestController {
+
+	private final ISiteService siteService;
+
+	private final ISearchLogService searchLogService;
+	
+	@Priv(type = AdminUserType.TYPE)
+	@GetMapping
+	public R<?> getPageList(@RequestParam(value = "query", required = false) String query) {
+		PageRequest pr = this.getPageRequest();
+		CmsSite site = this.siteService.getCurrentSite(ServletUtils.getRequest());
+		Page<SearchLog> page = this.searchLogService.lambdaQuery()
+				.eq(SearchLog::getSource, CmsSearchConstants.generateSearchSource(site.getSiteId()))
+				.like(StringUtils.isNotEmpty(query), SearchLog::getWord, query)
+				.orderByDesc(SearchLog::getLogId)
+				.page(new Page<>(pr.getPageNumber(), pr.getPageSize(), true));
+		return this.bindDataTable(page);
+	}
+}
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/CMSSearchWordStatController.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/CMSSearchWordStatController.java
new file mode 100644
index 00000000..cd222022
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/CMSSearchWordStatController.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.search.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chestnut.cms.search.CmsSearchConstants;
+import com.chestnut.common.domain.R;
+import com.chestnut.common.log.annotation.Log;
+import com.chestnut.common.log.enums.BusinessType;
+import com.chestnut.common.security.anno.Priv;
+import com.chestnut.common.security.web.BaseRestController;
+import com.chestnut.common.security.web.PageRequest;
+import com.chestnut.common.utils.ServletUtils;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.domain.CmsSite;
+import com.chestnut.contentcore.service.ISiteService;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.service.ISearchWordService;
+import com.chestnut.system.security.AdminUserType;
+import com.chestnut.system.security.StpAdminUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@Priv(type = AdminUserType.TYPE)
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/cms/search/word")
+public class CMSSearchWordStatController extends BaseRestController {
+
+	private final ISiteService siteService;
+
+	private final ISearchWordService searchWordStatService;
+	
+	@GetMapping
+	public R<?> getPageList(@RequestParam(value = "query", required = false) String query) {
+		PageRequest pr = this.getPageRequest();
+		CmsSite site = this.siteService.getCurrentSite(ServletUtils.getRequest());
+		Page<SearchWord> page = this.searchWordStatService.lambdaQuery()
+				.eq(SearchWord::getSource, CmsSearchConstants.generateSearchSource(site.getSiteId()))
+				.like(StringUtils.isNotEmpty(query), SearchWord::getWord, query)
+				.orderByDesc(SearchWord::getTopFlag, SearchWord::getSearchTotal)
+				.page(new Page<>(pr.getPageNumber(), pr.getPageSize(), true));
+		return this.bindDataTable(page);
+	}
+
+	@Log(title = "新增搜索词", businessType = BusinessType.INSERT)
+	@PostMapping
+	public R<?> addWord(@RequestBody SearchWord wordStat) {
+		CmsSite site = this.siteService.getCurrentSite(ServletUtils.getRequest());
+		wordStat.setSource(CmsSearchConstants.generateSearchSource(site.getSiteId()));
+		wordStat.createBy(StpAdminUtil.getLoginUser().getUsername());
+		this.searchWordStatService.addWord(wordStat);
+		return R.ok();
+	}
+}
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/front/SearchApiController.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/front/SearchApiController.java
index 6251e7fe..2e88566b 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/front/SearchApiController.java
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/controller/front/SearchApiController.java
@@ -19,6 +19,7 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.ElasticsearchException;
 import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
+import com.chestnut.cms.search.CmsSearchConstants;
 import com.chestnut.cms.search.es.doc.ESContent;
 import com.chestnut.cms.search.vo.ESContentVO;
 import com.chestnut.common.domain.R;
@@ -153,7 +154,7 @@ public class SearchApiController extends BaseRestController {
 			c.setCommentCount(cdd.getComments());
 		});
 		// 记录搜索日志
-		this.logService.addSearchLog("site:" + siteId, query, ServletUtils.getRequest());
+		this.logService.addSearchLog(CmsSearchConstants.generateSearchSource(siteId), query, ServletUtils.getRequest());
 		return this.bindDataTable(list, Objects.isNull(sr.hits().total()) ? 0 : sr.hits().total().value());
 	}
 
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/impl/SearchDynamicPageType.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/impl/SearchDynamicPageType.java
index 49de146f..197b404a 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/impl/SearchDynamicPageType.java
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/impl/SearchDynamicPageType.java
@@ -58,7 +58,7 @@ public class SearchDynamicPageType implements IDynamicPageType {
 
     @Override
     public String getName() {
-        return "搜索结果页";
+        return "{DYNAMIC_PAGE_TYPE.NAME." + TYPE + "}";
     }
 
     @Override
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/properties/EnableIndexProperty.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/properties/EnableIndexProperty.java
index e2f70bab..0e9bc024 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/properties/EnableIndexProperty.java
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/properties/EnableIndexProperty.java
@@ -15,6 +15,7 @@
  */
 package com.chestnut.cms.search.properties;
 
+import com.chestnut.common.utils.StringUtils;
 import com.chestnut.contentcore.core.IProperty;
 import com.chestnut.contentcore.util.ConfigPropertyUtils;
 import com.chestnut.system.fixed.dict.YesOrNo;
@@ -29,6 +30,8 @@ import java.util.Map;
 public class EnableIndexProperty implements IProperty {
 
 	public final static String ID = "EnableIndex";
+
+	private final static String DEFAULT_VALUE = YesOrNo.YES;
 	
 	static UseType[] UseTypes = new UseType[] { UseType.Site, UseType.Catalog };
 	
@@ -49,11 +52,14 @@ public class EnableIndexProperty implements IProperty {
 	
 	@Override
 	public String defaultValue() {
-		return YesOrNo.YES;
+		return DEFAULT_VALUE;
 	}
 	
 	public static String getValue(Map<String, String> firstConfigProps, Map<String, String> secondConfigProps) {
 		String value = ConfigPropertyUtils.getStringValue(ID, firstConfigProps, secondConfigProps);
+		if (StringUtils.isEmpty(value)) {
+			value = DEFAULT_VALUE;
+		}
 		return YesOrNo.isYes(value) ? value : YesOrNo.NO;
 	}
 }
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/service/ContentIndexService.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/service/ContentIndexService.java
index 29f00145..82de6180 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/service/ContentIndexService.java
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/service/ContentIndexService.java
@@ -29,7 +29,6 @@ import com.chestnut.cms.search.properties.EnableIndexProperty;
 import com.chestnut.common.async.AsyncTask;
 import com.chestnut.common.async.AsyncTaskManager;
 import com.chestnut.common.utils.Assert;
-import com.chestnut.common.utils.DateUtils;
 import com.chestnut.contentcore.core.IContent;
 import com.chestnut.contentcore.core.IContentType;
 import com.chestnut.contentcore.core.impl.InternalDataType_Content;
@@ -105,7 +104,7 @@ public class ContentIndexService implements CommandLineRunner {
 		Assert.isTrue(response.acknowledged(), () -> new RuntimeException("Create Index[cms_content] failed."));
 	}
 
-	public void recreateIndex(CmsSite site) throws IOException {
+	public void deleteContentIndices(CmsSite site) throws IOException {
 		boolean exists = esClient.indices().exists(fn -> fn.index(ESContent.INDEX_NAME)).value();
 		if (exists) {
 			// 删除站点索引文档数据
@@ -119,9 +118,7 @@ public class ContentIndexService implements CommandLineRunner {
 						.getRecords().stream().map(CmsContent::getContentId).toList();
 				deleteContentDoc(contentIds);
 			}
-			esClient.indices().delete(fn -> fn.index(ESContent.INDEX_NAME));
 		}
-		this.createIndex();
 	}
 
 	/**
@@ -219,8 +216,8 @@ public class ContentIndexService implements CommandLineRunner {
 
 			@Override
 			public void run0() throws Exception {
-				// 先重建索引
-				recreateIndex(site);
+				// 先删除内容索引 TODO batchDelete
+				deleteContentIndices(site);
 
 				List<CmsCatalog> catalogs = catalogService.lambdaQuery()
 						.eq(CmsCatalog::getSiteId, site.getSiteId()).list();
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsRelaContentTag.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsRelaContentTag.java
index 2e191ffe..6a8e1937 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsRelaContentTag.java
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsRelaContentTag.java
@@ -47,6 +47,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ThreadLocalRandom;
 
+@Deprecated(since = "1.4.2", forRemoval = true)
 @Component
 @RequiredArgsConstructor
 public class CmsRelaContentTag extends AbstractListTag {
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsSearchContentTag.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsSearchContentTag.java
index 2e6bdcdd..5302357f 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsSearchContentTag.java
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsSearchContentTag.java
@@ -17,6 +17,7 @@ package com.chestnut.cms.search.template.tag;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.SortOrder;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
 import com.chestnut.cms.search.es.doc.ESContent;
 import com.chestnut.cms.search.vo.ESContentVO;
@@ -36,6 +37,7 @@ import freemarker.template.TemplateException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
+import org.ehcache.shadow.org.terracotta.context.query.QueryBuilder;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -64,7 +66,7 @@ public class CmsSearchContentTag extends AbstractListTag {
 	@Override
 	public List<TagAttr> getTagAttrs() {
 		List<TagAttr> tagAttrs = super.getTagAttrs();
-		tagAttrs.add(new TagAttr(ATTR_QUERY, true, TagAttrDataType.STRING, "检索词"));
+		tagAttrs.add(new TagAttr(ATTR_QUERY, false, TagAttrDataType.STRING, "检索词"));
 		tagAttrs.add(new TagAttr(ATTR_CATALOG_ID, false, TagAttrDataType.STRING, "栏目ID"));
 		tagAttrs.add(new TagAttr(ATTR_CONTENT_TYPE, false, TagAttrDataType.STRING, "内容类型"));
 		tagAttrs.add(new TagAttr(ATTR_MODE, false, TagAttrDataType.STRING, "检索方式",
@@ -77,9 +79,9 @@ public class CmsSearchContentTag extends AbstractListTag {
 		long siteId = FreeMarkerUtils.evalLongVariable(env, "Site.siteId");
 		String mode = MapUtils.getString(attrs, ATTR_MODE, SearchMode.FullText.name());
 		String query = MapUtils.getString(attrs, ATTR_QUERY);
-		if (StringUtils.isEmpty(query)) {
-			throw new TemplateException("Tag attr `query` cannot be empty.", env);
-		}
+//		if (StringUtils.isEmpty(query)) {
+//			throw new TemplateException("Tag attr `query` cannot be empty.", env);
+//		}
 		String contentType = MapUtils.getString(attrs, ATTR_CONTENT_TYPE);
 		Long catalogId = MapUtils.getLong(attrs, ATTR_CATALOG_ID);
 		try {
@@ -94,25 +96,38 @@ public class CmsSearchContentTag extends AbstractListTag {
 							if (IdUtils.validate(catalogId)) {
 								b.must(must -> must.term(tq -> tq.field("catalogId").value(catalogId)));
 							}
-							if (SearchMode.isFullText(mode)) {
-								b.must(must -> must
-									.multiMatch(match -> match
-										.analyzer(SearchConsts.IKAnalyzeType_Smart)
-										.fields("title^10", "fullText^1")
-										.query(query)
-									)
-								);
-							} else {
-								b.must(should -> {
+							if (StringUtils.isNotEmpty(query)) {
+								if (SearchMode.isFullText(mode)) {
+									b.must(must -> must
+										.multiMatch(match -> match
+											.analyzer(SearchConsts.IKAnalyzeType_Smart)
+											.fields("title^10", "fullText^1")
+											.query(query)
+										)
+									);
+								} else if (SearchMode.isTagAnd(mode)) {
 									String[] keywords = StringUtils.split(query, ",");
 									for (String keyword : keywords) {
-										should.constantScore(cs ->
-												cs.boost(1F).filter(f ->
-														f.match(m ->
-																m.field("tags").query(keyword))));
+										if (StringUtils.isNotEmpty(keyword)) {
+											b.must(must -> must.match(term -> term.field("tags").query(keyword)));
+										}
 									}
-									return should;
-								});
+								} else {
+									b.must(must -> {
+										String[] keywords = StringUtils.split(query, ",");
+										for (String keyword : keywords ) {
+											if (StringUtils.isNotEmpty(keyword)) {
+												must.match(m ->
+														m.field("tags").query(keyword));
+//												must.constantScore(cs ->
+//														cs.boost(1F).filter(f ->
+//																f.match(m ->
+//																		m.field("tags").query(keyword))));
+											}
+										}
+										return must;
+									});
+								}
 							}
 							return b;
 						})
@@ -184,7 +199,9 @@ public class CmsSearchContentTag extends AbstractListTag {
 		// 所有站点
 		FullText("全文检索"),
 		// 当前站点
-		Tag("标签检索，多个标签英文逗号隔开");
+		Tag("标签检索，多个标签英文逗号隔开"),
+		// 当前站点
+		TagAnd("标签检索，多个标签英文逗号隔开");
 
 		private final String desc;
 
@@ -200,10 +217,15 @@ public class CmsSearchContentTag extends AbstractListTag {
 			return Tag.name().equalsIgnoreCase(mode);
 		}
 
+		static boolean isTagAnd(String mode) {
+			return TagAnd.name().equalsIgnoreCase(mode);
+		}
+
 		static List<TagAttrOption> toTagAttrOptions() {
 			return List.of(
 					new TagAttrOption(FullText.name(), FullText.desc),
-					new TagAttrOption(Tag.name(), Tag.desc)
+					new TagAttrOption(Tag.name(), Tag.desc),
+					new TagAttrOption(TagAnd.name(), Tag.desc)
 			);
 		}
 	}
diff --git a/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsSearchWordTag.java b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsSearchWordTag.java
new file mode 100644
index 00000000..0f55e183
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-search/src/main/java/com/chestnut/cms/search/template/tag/CmsSearchWordTag.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.search.template.tag;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chestnut.cms.search.CmsSearchConstants;
+import com.chestnut.common.staticize.FreeMarkerUtils;
+import com.chestnut.common.staticize.tag.AbstractListTag;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.service.ISearchWordService;
+import freemarker.core.Environment;
+import freemarker.template.TemplateException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class CmsSearchWordTag extends AbstractListTag {
+
+	public final static String TAG_NAME = "cms_search_word";
+
+	public final static String NAME = "{FREEMARKER.TAG.NAME." + TAG_NAME + "}";
+	public final static String DESC = "{FREEMARKER.TAG.DESC." + TAG_NAME + "}";
+
+	private final ISearchWordService searchWordService;
+	
+	@Override
+	public TagPageData prepareData(Environment env, Map<String, String> attrs, boolean page, int size, int pageIndex) throws TemplateException {
+		long siteId = FreeMarkerUtils.evalLongVariable(env, "Site.siteId");
+		String source = CmsSearchConstants.generateSearchSource(siteId);
+		Page<SearchWord> pageResult = this.searchWordService.lambdaQuery()
+				.eq(SearchWord::getSource, source)
+				.orderByDesc(SearchWord::getTopFlag, SearchWord::getSearchTotal)
+				.page(new Page<>(pageIndex, size, page));
+		return TagPageData.of(pageResult.getRecords(), pageResult.getTotal());
+	}
+
+	@Override
+	public String getTagName() {
+		return TAG_NAME;
+	}
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public String getDescription() {
+		return DESC;
+	}
+}
diff --git a/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages.properties b/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages.properties
index ccc7f8f0..4f83feb6 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages.properties
+++ b/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages.properties
@@ -2,5 +2,9 @@ FREEMARKER.TAG.NAME.cms_rela_content=相关内容标签
 FREEMARKER.TAG.DESC.cms_rela_content=相关内容标签
 FREEMARKER.TAG.NAME.cms_search_content=检索内容标签
 FREEMARKER.TAG.DESC.cms_search_content=检索内容标签
+FREEMARKER.TAG.NAME.cms_search_word=搜索热词标签
+FREEMARKER.TAG.DESC.cms_search_word=搜索热词标签
 
-CONFIG.CMSSearchAnalyzeType=索引分词方式
\ No newline at end of file
+CONFIG.CMSSearchAnalyzeType=索引分词方式
+
+DYNAMIC_PAGE_TYPE.NAME.Search=搜索结果页
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_en.properties b/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_en.properties
index 752ba467..fd0c7812 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_en.properties
@@ -2,5 +2,9 @@ FREEMARKER.TAG.NAME.cms_rela_content=Rela content tag
 FREEMARKER.TAG.DESC.cms_rela_content=Rela content tag
 FREEMARKER.TAG.NAME.cms_search_content=Search content tag
 FREEMARKER.TAG.DESC.cms_search_content=Search content tag
+FREEMARKER.TAG.NAME.cms_search_word=Search hot word tag
+FREEMARKER.TAG.DESC.cms_search_word=Search hot word tag
 
-CONFIG.CMSSearchAnalyzeType=ES Index Analyze Type
\ No newline at end of file
+CONFIG.CMSSearchAnalyzeType=ES Index Analyze Type
+
+DYNAMIC_PAGE_TYPE.NAME.Search=Search result page
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_zh_TW.properties
index 29273502..3b3d3cfb 100644
--- a/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-cms/chestnut-cms-search/src/main/resources/i18n/messages_zh_TW.properties
@@ -2,5 +2,9 @@ FREEMARKER.TAG.NAME.cms_rela_content=相關內容標籤
 FREEMARKER.TAG.DESC.cms_rela_content=相關內容標籤
 FREEMARKER.TAG.NAME.cms_search_content=檢索內容標籤
 FREEMARKER.TAG.DESC.cms_search_content=檢索內容標籤
+FREEMARKER.TAG.NAME.cms_search_word=檢索詞熱詞標籤
+FREEMARKER.TAG.DESC.cms_search_word=檢索詞熱詞標籤
 
 CONFIG.CMSSearchAnalyzeType=索引分詞方式
+
+DYNAMIC_PAGE_TYPE.NAME.Search=搜索結果頁
diff --git a/chestnut-cms/chestnut-cms-seo/pom.xml b/chestnut-cms/chestnut-cms-seo/pom.xml
index 92b8f7b5..b07daf1e 100644
--- a/chestnut-cms/chestnut-cms-seo/pom.xml
+++ b/chestnut-cms/chestnut-cms-seo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.chestnut</groupId>
         <artifactId>chestnut-cms</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <artifactId>chestnut-cms-seo</artifactId>
diff --git a/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/controller/SitePushController.java b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/controller/SitePushController.java
new file mode 100644
index 00000000..13e4e517
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/controller/SitePushController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.seo.controller;
+
+import com.chestnut.common.domain.R;
+import com.chestnut.common.security.anno.Priv;
+import com.chestnut.common.security.web.BaseRestController;
+import com.chestnut.common.utils.ServletUtils;
+import com.chestnut.contentcore.domain.CmsSite;
+import com.chestnut.contentcore.service.ISiteService;
+import com.chestnut.seo.service.BaiduPushService;
+import com.chestnut.system.security.AdminUserType;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 百度收录推送前端控制器
+ * </p>
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@RestController
+@RequestMapping("/cms/seo")
+@RequiredArgsConstructor
+public class SitePushController extends BaseRestController {
+
+	private final ISiteService siteService;
+
+	private final BaiduPushService baiduPushService;
+
+	@Priv(type = AdminUserType.TYPE)
+	@PostMapping("/baidu_push")
+	public R<?> generateSitemap(@RequestBody @NotEmpty List<Long> contentIds) {
+		CmsSite site = siteService.getCurrentSite(ServletUtils.getRequest());
+
+		List<BaiduPushService.BaiduPushResult> results = baiduPushService.pushContents(site, contentIds);
+
+		return R.ok(results);
+	}
+}
diff --git a/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/fixed/dict/SitemapPageType.java b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/fixed/dict/SitemapPageType.java
index e6d802bf..4847e98f 100644
--- a/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/fixed/dict/SitemapPageType.java
+++ b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/fixed/dict/SitemapPageType.java
@@ -44,7 +44,7 @@ public class SitemapPageType extends FixedDictType {
 		super(TYPE, "{DICT." + TYPE + "}");
 		super.addDictData("{DICT." + TYPE + "." + PC + "}", PC, 1);
 		super.addDictData("{DICT." + TYPE + "." + Mobile + "}", Mobile, 2);
-		super.addDictData("{DICT." + TYPE + ".pc_mobile}", PC_Mobile, 3);
+		super.addDictData("{DICT." + TYPE + "." + PC_Mobile + "}", PC_Mobile, 3);
 	}
 
 	public static <T> void decode(List<T> list, Function<T, String> getter, BiConsumer<T, String> setter) {
diff --git a/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/properties/BaiduPushAccessSecretProperty.java b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/properties/BaiduPushAccessSecretProperty.java
new file mode 100644
index 00000000..d1c3d379
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/properties/BaiduPushAccessSecretProperty.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.seo.properties;
+
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.core.IProperty;
+import com.chestnut.contentcore.util.ConfigPropertyUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 百度收录API秘钥
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Component(IProperty.BEAN_NAME_PREFIX + BaiduPushAccessSecretProperty.ID)
+public class BaiduPushAccessSecretProperty implements IProperty {
+
+	public final static String ID = "BaiduPushAccessSecret";
+
+	private final static String DEFAULT_VALUE = StringUtils.EMPTY;
+	
+	static UseType[] UseTypes = new UseType[] { UseType.Site };
+	
+	@Override
+	public UseType[] getUseTypes() {
+		return UseTypes;
+	}
+
+	@Override
+	public String getId() {
+		return ID;
+	}
+
+	@Override
+	public String getName() {
+		return "百度收录API秘钥";
+	}
+	
+	@Override
+	public String defaultValue() {
+		return DEFAULT_VALUE;
+	}
+	
+	public static String getValue(Map<String, String> configProps) {
+		String value = ConfigPropertyUtils.getStringValue(ID, configProps);
+		if (StringUtils.isEmpty(value)) {
+			value = DEFAULT_VALUE;
+		}
+		return value;
+	}
+}
diff --git a/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/service/BaiduPushService.java b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/service/BaiduPushService.java
new file mode 100644
index 00000000..5053045b
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-seo/src/main/java/com/chestnut/seo/service/BaiduPushService.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.seo.service;
+
+import com.chestnut.common.utils.HttpUtils;
+import com.chestnut.common.utils.JacksonUtils;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.contentcore.domain.CmsContent;
+import com.chestnut.contentcore.domain.CmsPublishPipe;
+import com.chestnut.contentcore.domain.CmsSite;
+import com.chestnut.contentcore.service.IContentService;
+import com.chestnut.contentcore.service.IPublishPipeService;
+import com.chestnut.seo.properties.BaiduPushAccessSecretProperty;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import org.springframework.stereotype.Service;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * BaiduUrlPusher
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Service
+@RequiredArgsConstructor
+public class BaiduPushService {
+
+    private final IContentService contentService;
+
+    private final IPublishPipeService publishPipeService;
+
+    private static final String API = "http://data.zz.baidu.com/urls?site={0}&token={1}";
+
+    public List<BaiduPushResult> pushContents(CmsSite site, List<Long> contentIds) {
+        String secret = BaiduPushAccessSecretProperty.getValue(site.getConfigProps());
+        if (StringUtils.isEmpty(secret)) {
+            return List.of();
+        }
+        List<CmsPublishPipe> publishPipes = publishPipeService.getPublishPipes(site.getSiteId());
+        List<BaiduPushResult> results = new ArrayList<>(publishPipes.size());
+        publishPipes.forEach(pp -> {
+            String domain = site.getUrl(pp.getCode());
+            if (StringUtils.isEmpty(domain)) {
+                return;
+            }
+            if (domain.contains("://")) {
+                domain = StringUtils.substringAfter(domain, "://");
+            }
+            List<CmsContent> list = contentService.lambdaQuery().in(CmsContent::getContentId, contentIds).list();
+            List<String> urls = list.stream().map(content -> contentService
+                    .getContentLink(content, 1, pp.getCode(), false)).toList();
+
+            String apiUrl = StringUtils.messageFormat(API, domain, secret);
+            String body = StringUtils.join(urls, "\n");
+            String response = HttpUtils.post(URI.create(apiUrl), body, Map.of("Content-Type", "text/plain"));
+            BaiduPushResult r = JacksonUtils.from(response, BaiduPushResult.class);
+            r.setPublishPipeCode(pp.getCode());
+            results.add(r);
+        });
+        return results;
+    }
+
+    @Getter
+    @Setter
+    public static class BaiduPushResult {
+
+        private String publishPipeCode;
+
+        private Integer remain;
+
+        private Integer success;
+
+        private List<String> not_same_site;
+
+        private List<String> not_valid;
+    }
+}
diff --git a/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages.properties b/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages.properties
index ae2b566f..9feef96a 100644
--- a/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages.properties
+++ b/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages.properties
@@ -5,4 +5,4 @@ SCHEDULED_TASK.SiteMapJobHandler=站点地图定时更新任务
 DICT.CMSSitemapPageType=发布通道页面类型
 DICT.CMSSitemapPageType.pc=PC端
 DICT.CMSSitemapPageType.mobile=移动端
-DICT.CMSSitemapPageType.pc_mobile=自适应
\ No newline at end of file
+DICT.CMSSitemapPageType.pc,mobile=自适应
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_en.properties b/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_en.properties
index a5035f48..001c6a33 100644
--- a/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_en.properties
@@ -5,4 +5,4 @@ SCHEDULED_TASK.SiteMapJobHandler=Sitemap Update Task
 DICT.CMSPublishPipePageType=发布通道页面类型
 DICT.CMSPublishPipePageType.pc=PC端
 DICT.CMSPublishPipePageType.mobile=移动端
-DICT.CMSPublishPipePageType.pc_mobile=自适应
\ No newline at end of file
+DICT.CMSPublishPipePageType.pc,mobile=自适应
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_zh_TW.properties
index 4bce087d..5ff2ff79 100644
--- a/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-cms/chestnut-cms-seo/src/main/resources/i18n/messages_zh_TW.properties
@@ -5,4 +5,4 @@ SCHEDULED_TASK.SiteMapJobHandler=站點地圖定時更新任務
 DICT.CMSSitemapPageType=發布通道頁面類型
 DICT.CMSSitemapPageType.pc=PC端
 DICT.CMSSitemapPageType.mobile=移動端
-DICT.CMSSitemapPageType.pc_mobile=自適應
+DICT.CMSSitemapPageType.pc,mobile=自適應
diff --git a/chestnut-cms/chestnut-cms-stat/pom.xml b/chestnut-cms/chestnut-cms-stat/pom.xml
index 583a9383..af16f274 100644
--- a/chestnut-cms/chestnut-cms-stat/pom.xml
+++ b/chestnut-cms/chestnut-cms-stat/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-stat</artifactId>
diff --git a/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/domain/CmsSiteVisitLog.java b/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/domain/CmsSiteVisitLog.java
index 192cf1d3..f0dfbae1 100644
--- a/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/domain/CmsSiteVisitLog.java
+++ b/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/domain/CmsSiteVisitLog.java
@@ -31,7 +31,7 @@ public class CmsSiteVisitLog implements Serializable {
 	
 	public final static String TABLE_NAME = "cms_site_visit_log";
 
-	@TableId(value = "log_id", type = IdType.AUTO)
+	@TableId(value = "log_id", type = IdType.INPUT)
 	private Long logId;
 
 	/**
diff --git a/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/handler/PageViewStatEventHandler.java b/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/handler/PageViewStatEventHandler.java
index 1460acdc..a0f67d5b 100644
--- a/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/handler/PageViewStatEventHandler.java
+++ b/chestnut-cms/chestnut-cms-stat/src/main/java/com/chestnut/cms/stat/handler/PageViewStatEventHandler.java
@@ -38,6 +38,8 @@ public class PageViewStatEventHandler implements IStatEventHandler {
 
     public static final String TYPE = "pv";
 
+    static final String CACHE_PREFIX = "cms:stat:pv:";
+
     private final AsyncTaskManager asyncTaskManager;
 
     private final CmsSiteVisitLogMapper siteVisitLogMapper;
@@ -55,7 +57,7 @@ public class PageViewStatEventHandler implements IStatEventHandler {
     public void handle(StatEvent event) {
         CmsSiteVisitLog log = parseSiteVisitLog(event);
         // 更新Redis数据
-        this.redisCache.incrCounter("cms:pv:" + log.getUri());
+        this.redisCache.incrLongCounter(CACHE_PREFIX + log.getUri());
         // 更新内容浏览量
         if (IdUtils.validate(log.getContentId())) {
             contentDynamicDataService.increaseViewCount(log.getContentId());
diff --git a/chestnut-cms/chestnut-cms-vote/pom.xml b/chestnut-cms/chestnut-cms-vote/pom.xml
index be2ac284..a8d844d0 100644
--- a/chestnut-cms/chestnut-cms-vote/pom.xml
+++ b/chestnut-cms/chestnut-cms-vote/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-vote</artifactId>
diff --git a/chestnut-cms/chestnut-cms-word/pom.xml b/chestnut-cms/chestnut-cms-word/pom.xml
index 6f52669c..daeea65b 100644
--- a/chestnut-cms/chestnut-cms-word/pom.xml
+++ b/chestnut-cms/chestnut-cms-word/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut-cms</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 
 	<artifactId>chestnut-cms-word</artifactId>
diff --git a/chestnut-cms/chestnut-cms-word/src/main/java/com/chestnut/cms/word/template/tag/CmsTagWordGroupTag.java b/chestnut-cms/chestnut-cms-word/src/main/java/com/chestnut/cms/word/template/tag/CmsTagWordGroupTag.java
new file mode 100644
index 00000000..16722ba6
--- /dev/null
+++ b/chestnut-cms/chestnut-cms-word/src/main/java/com/chestnut/cms/word/template/tag/CmsTagWordGroupTag.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.cms.word.template.tag;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chestnut.common.staticize.enums.TagAttrDataType;
+import com.chestnut.common.staticize.tag.AbstractListTag;
+import com.chestnut.common.staticize.tag.TagAttr;
+import com.chestnut.common.staticize.tag.TagAttrOption;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.word.domain.TagWordGroup;
+import com.chestnut.word.service.ITagWordGroupService;
+import freemarker.core.Environment;
+import freemarker.template.TemplateException;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+@RequiredArgsConstructor
+public class CmsTagWordGroupTag extends AbstractListTag {
+
+	public final static String TAG_NAME = "cms_tag_word_group";
+	public final static String NAME = "{FREEMARKER.TAG.NAME." + TAG_NAME + "}";
+	public final static String DESC = "{FREEMARKER.TAG.DESC." + TAG_NAME + "}";
+
+	private static final String TAG_ATTR_CODE = "code";
+
+	private static final String TAG_ATTR_LEVEL = "level";
+
+	private final ITagWordGroupService tagWordGroupService;
+	
+	@Override
+	public List<TagAttr> getTagAttrs() {
+		List<TagAttr> tagAttrs = super.getTagAttrs();
+		tagAttrs.add(new TagAttr(TAG_ATTR_CODE, true, TagAttrDataType.STRING, "TAG词分组编码") );
+		tagAttrs.add(new TagAttr(TAG_ATTR_LEVEL, false, TagAttrDataType.STRING, "数据获取范围，值为`Root`时忽略属性code",
+				TagWordGroupTagLevel.toTagAttrOptions(), TagWordGroupTagLevel.Current.name()));
+		return tagAttrs;
+	}
+
+	@Override
+	public TagPageData prepareData(Environment env, Map<String, String> attrs, boolean page, int size, int pageIndex) throws TemplateException {
+		String group = MapUtils.getString(attrs, TAG_ATTR_CODE);
+		Optional<TagWordGroup> opt = tagWordGroupService.lambdaQuery().eq(TagWordGroup::getCode, group).oneOpt();
+		if (opt.isEmpty()) {
+			throw new TemplateException("Tag word group not found: " + group, env);
+		}
+		String level = MapUtils.getString(attrs, TAG_ATTR_LEVEL);
+
+		TagWordGroup parent = opt.get();
+		LambdaQueryWrapper<TagWordGroup> q = new LambdaQueryWrapper<>();
+		if (TagWordGroupTagLevel.isCurrent(level)) {
+			q.eq(TagWordGroup::getParentId, parent.getParentId());
+		} else if (TagWordGroupTagLevel.isChild(level)) {
+			q.eq(TagWordGroup::getParentId, parent.getGroupId());
+		}
+
+		String condition = MapUtils.getString(attrs, TagAttr.AttrName_Condition);
+		q.apply(StringUtils.isNotEmpty(condition), condition);
+		q.orderByAsc(TagWordGroup::getSortFlag);
+
+		 Page<TagWordGroup> pageResult = this.tagWordGroupService.page(new Page<>(pageIndex, size, page), q);
+		return TagPageData.of(pageResult.getRecords(), pageResult.getTotal());
+	}
+
+	@Override
+	public String getTagName() {
+		return TAG_NAME;
+	}
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public String getDescription() {
+		return DESC;
+	}
+
+	private enum TagWordGroupTagLevel {
+		Root("所有分组"), Current("同级分组"), Child("子分组");
+
+		private final String desc;
+
+		TagWordGroupTagLevel(String desc) {
+			this.desc = desc;
+		}
+
+		static boolean isRoot(String level) {
+			return Root.name().equalsIgnoreCase(level);
+		}
+
+		static boolean isCurrent(String level) {
+			return Current.name().equalsIgnoreCase(level);
+		}
+
+		static boolean isChild(String level) {
+			return Child.name().equalsIgnoreCase(level);
+		}
+
+		static List<TagAttrOption> toTagAttrOptions() {
+			return List.of(
+					new TagAttrOption(Root.name(), Root.desc),
+					new TagAttrOption(Current.name(), Current.desc),
+					new TagAttrOption(Child.name(), Child.desc)
+			);
+		}
+	}
+}
diff --git a/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages.properties b/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages.properties
index 944b3f7c..03d5fd8e 100644
--- a/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages.properties
+++ b/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages.properties
@@ -4,4 +4,6 @@ FREEMARKER.FUNC.DESC.replaceSensitiveWord=替换敏感词，例如：${replaceSe
 
 # freemarker模板标签
 FREEMARKER.TAG.NAME.cms_tag_word=TAG词列表标签
-FREEMARKER.TAG.DESC.cms_tag_word=根据TAG词分组编码获取TAG词列表，内嵌<#list DataList as tag>${tag.word}</#list>遍历数据
\ No newline at end of file
+FREEMARKER.TAG.DESC.cms_tag_word=根据TAG词分组编码获取TAG词列表，内嵌<#list DataList as tag>${tag.word}</#list>遍历数据
+FREEMARKER.TAG.NAME.cms_tag_word_group=TAG词分组列表标签
+FREEMARKER.TAG.DESC.cms_tag_word_group=根据TAG词分组编码获取TAG词分组列表，内嵌<#list DataList as group>${group.name}</#list>遍历数据
\ No newline at end of file
diff --git a/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_en.properties b/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_en.properties
index 432c1648..15b62f14 100644
--- a/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_en.properties
@@ -2,5 +2,7 @@
 FREEMARKER.FUNC.DESC.replaceHotWord=Replace hot word in content argument, eg: ${replaceHotWord(content, 'default', '[a href='\{0\}' target='\{2\}']\{1\}[/a]')}
 FREEMARKER.FUNC.DESC.replaceSensitiveWord=Replace sensitive word in content argument, eg: ${replaceSensitiveWord(content, 'xxx')}
 
-FREEMARKER.TAG.NAME.cms_link=TAG Word List Tag
-FREEMARKER.TAG.DESC.cms_link=Fetch tag-word list, use <#list> in tag like "<#list DataList as tag>${tag.word}</#list>" to walk through the list of tag-words.
\ No newline at end of file
+FREEMARKER.TAG.NAME.cms_tag_word=TAG Word List Tag
+FREEMARKER.TAG.DESC.cms_tag_word=Fetch tag-word list, use <#list> in tag like "<#list DataList as tag>${tag.word}</#list>" to walk through the list of tag-words.
+FREEMARKER.TAG.NAME.cms_tag_word_group=TAG Word Group List Tag
+FREEMARKER.TAG.DESC.cms_tag_word_group=Fetch tag-word-group list, use <#list> in tag like "<#list DataList as group>${group.name}</#list>" to walk through the list of tag-word-groups.
diff --git a/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_zh_TW.properties
index 3e8ba29a..d65abe35 100644
--- a/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-cms/chestnut-cms-word/src/main/resources/i18n/messages_zh_TW.properties
@@ -5,3 +5,5 @@ FREEMARKER.FUNC.DESC.replaceSensitiveWord=替換敏感詞，例如：${replaceSe
 # freemarker模板標籤
 FREEMARKER.TAG.NAME.cms_tag_word=TAG詞列表標籤
 FREEMARKER.TAG.DESC.cms_tag_word=根據TAG詞分組編碼獲取TAG詞列表，內嵌<#list DataList as tag>${tag.word}</#list>遍曆數據
+FREEMARKER.TAG.NAME.cms_tag_word_group=TAG詞分組列表標籤
+FREEMARKER.TAG.DESC.cms_tag_word_group=根據TAG詞分組編碼獲取TAG詞分組列表，內嵌<#list DataList as group>${group.name}</#list>遍曆數據
diff --git a/chestnut-cms/pom.xml b/chestnut-cms/pom.xml
index 450a83f3..f8403947 100644
--- a/chestnut-cms/pom.xml
+++ b/chestnut-cms/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-core/pom.xml b/chestnut-common/chestnut-common-core/pom.xml
index 2d1d44f2..a0d71294 100644
--- a/chestnut-common/chestnut-common-core/pom.xml
+++ b/chestnut-common/chestnut-common-core/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/DateUtils.java b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/DateUtils.java
index 24aac3ef..3efc9e10 100644
--- a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/DateUtils.java
+++ b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/DateUtils.java
@@ -15,21 +15,16 @@
  */
 package com.chestnut.common.utils;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.commons.lang3.time.DateFormatUtils;
-
 /**
  * 时间工具类
  *
@@ -44,6 +39,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
 	public static String YYYY_MM_DD = "yyyy-MM-dd";
 
+	public static String YYYYMMDDHH = "yyyyMMddHH";
+
 	public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
 
 	public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
@@ -56,6 +53,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	
 	public static DateTimeFormatter FORMAT_YYYY_MM_DD = DateTimeFormatter.ofPattern(YYYY_MM_DD);
 
+	public static DateTimeFormatter FORMAT_YYYYMMDDHH = DateTimeFormatter.ofPattern(YYYYMMDDHH);
+
 	/**
 	 * 获取当前Date型日期
 	 * 
diff --git a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HtmlUtils.java b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HtmlUtils.java
index 2d98a05a..d5a73907 100644
--- a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HtmlUtils.java
+++ b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HtmlUtils.java
@@ -58,6 +58,10 @@ public class HtmlUtils {
 	 * @return 清除标签后的文本
 	 */
 	public static String clean(String content) {
-		return Jsoup.clean(content, Safelist.simpleText());
+		return Jsoup.clean(content, Safelist.none());
+	}
+
+	public static String clean(String content, Safelist safelist) {
+		return Jsoup.clean(content, safelist);
 	}
 }
\ No newline at end of file
diff --git a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HttpUtils.java b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HttpUtils.java
index c6f78e8f..9dec9011 100644
--- a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HttpUtils.java
+++ b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/HttpUtils.java
@@ -15,6 +15,8 @@
  */
 package com.chestnut.common.utils;
 
+import org.apache.commons.lang3.RandomUtils;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -26,11 +28,10 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.time.Duration;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.apache.commons.lang3.RandomUtils;
-
 public class HttpUtils {
 
 	public final static String[] USER_AGENTS = new String[] {
@@ -68,18 +69,7 @@ public class HttpUtils {
 		}
 	}
 
-	/**
-	 * 发起一个简单的POST请求，同步返回字符串结果
-	 * <p>
-	 * Timeout: 30s
-	 * Content-Type: application/json
-	 * </p>
-	 *
-	 * @param uri
-	 * @param body
-	 * @return
-	 */
-	public static String postJSON(URI uri, String body) {
+	public static String post(URI uri, String body, Map<String, String> headers) {
 		try {
 			if (Objects.isNull(body)) {
 				body = StringUtils.EMPTY;
@@ -88,17 +78,34 @@ public class HttpUtils {
 					.connectTimeout(Duration.ofSeconds(30))
 					.followRedirects(Redirect.ALWAYS)
 					.build();
-			HttpRequest httpRequest = HttpRequest.newBuilder(uri)
-					.header("Content-Type", "application/json")
-					.header("User-Agent", USER_AGENTS[0])
-					.POST(BodyPublishers.ofString(body, StandardCharsets.UTF_8))
-					.build();
+			HttpRequest.Builder builder = HttpRequest.newBuilder(uri)
+					.POST(BodyPublishers.ofString(body, StandardCharsets.UTF_8));
+			headers.forEach(builder::header);
+			if (!headers.containsKey("Content-Type")) {
+				builder.header("Content-Type", "application/json");
+			}
+			HttpRequest httpRequest = builder.build();
 			return httpClient.send(httpRequest, BodyHandlers.ofString()).body();
 		} catch (IOException | InterruptedException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
+	/**
+	 * 发起一个简单的POST请求，同步返回字符串结果
+	 * <p>
+	 * Timeout: 30s
+	 * Content-Type: application/json
+	 * </p>
+	 *
+	 * @param uri
+	 * @param jsonBody
+	 * @return
+	 */
+	public static String postJSON(URI uri, String jsonBody){
+		return post(uri, jsonBody, Map.of("User-Agent", USER_AGENTS[0]));
+	}
+
 	public static byte[] syncDownload(String uri) {
 		HttpClient httpClient = HttpClient.newBuilder()
 				.connectTimeout(Duration.ofSeconds(30))
diff --git a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/ReflectASMUtils.java b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/ReflectASMUtils.java
index 81eefc28..b0768c5b 100644
--- a/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/ReflectASMUtils.java
+++ b/chestnut-common/chestnut-common-core/src/main/java/com/chestnut/common/utils/ReflectASMUtils.java
@@ -93,15 +93,12 @@ public class ReflectASMUtils {
 		String[] methodNames = methodAccess.getMethodNames();
 		for (String methodName : methodNames) {
 			if (methodName.length() > 3 && methodName.startsWith("get")) {
-				try {
-					int index = methodAccess.getIndex(methodName, 0);
-					if (index > -1) {
-						String fieldName = StringUtils.lowerFirst(methodName.substring(3));
-						Object v = methodAccess.invoke(object, index);
-						map.put(fieldName, v);
-					}
-				} catch (Exception e) {
-					log.warn("The method `{}.{}` not public or not exists.", object.getClass().getName(), methodName, e);
+				int index = methodAccess.getIndex(methodName);
+				if (methodAccess.getParameterTypes()[index].length == 0) {
+					// 仅处理参数数量为0的get方法
+					String fieldName = StringUtils.lowerFirst(methodName.substring(3));
+					Object v = methodAccess.invoke(object, index);
+					map.put(fieldName, v);
 				}
 			}
 		}
diff --git a/chestnut-common/chestnut-common-datasource/pom.xml b/chestnut-common/chestnut-common-datasource/pom.xml
index 0a8127d1..3d75a747 100644
--- a/chestnut-common/chestnut-common-datasource/pom.xml
+++ b/chestnut-common/chestnut-common-datasource/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-extend/pom.xml b/chestnut-common/chestnut-common-extend/pom.xml
index e5eaa17c..a2babca9 100644
--- a/chestnut-common/chestnut-common-extend/pom.xml
+++ b/chestnut-common/chestnut-common-extend/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-log/pom.xml b/chestnut-common/chestnut-common-log/pom.xml
index a4398463..604dec9c 100644
--- a/chestnut-common/chestnut-common-log/pom.xml
+++ b/chestnut-common/chestnut-common-log/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-redis/pom.xml b/chestnut-common/chestnut-common-redis/pom.xml
index 9f539830..7c17633b 100644
--- a/chestnut-common/chestnut-common-redis/pom.xml
+++ b/chestnut-common/chestnut-common-redis/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-redis/src/main/java/com/chestnut/common/redis/RedisCache.java b/chestnut-common/chestnut-common-redis/src/main/java/com/chestnut/common/redis/RedisCache.java
index 8bace2cb..f1506998 100644
--- a/chestnut-common/chestnut-common-redis/src/main/java/com/chestnut/common/redis/RedisCache.java
+++ b/chestnut-common/chestnut-common-redis/src/main/java/com/chestnut/common/redis/RedisCache.java
@@ -135,6 +135,10 @@ public class RedisCache {
 		return Boolean.TRUE.equals(redisTemplate.hasKey(key));
 	}
 
+	public boolean hasMapKey(String cacheKey, String hashKey) {
+		return Boolean.TRUE.equals(redisTemplate.opsForHash().hasKey(cacheKey, hashKey));
+	}
+
 	/**
 	 * 获得缓存的基本对象。
 	 *
@@ -297,6 +301,10 @@ public class RedisCache {
 		return redisTemplate.opsForHash().entries(key);
 	}
 
+	public void incrMapValue(String cacheKey, String hKey, long delta) {
+		redisTemplate.opsForHash().increment(cacheKey, hKey, delta);
+	}
+
 	/**
 	 * 往Hash中存入数据
 	 *
@@ -420,7 +428,7 @@ public class RedisCache {
 	 * @param delta score delta
 	 * @return score
 	 */
-	public long zsetIncr(String key, String value, int delta) {
+	public long zsetIncr(String key, String value, double delta) {
 		return Objects.requireNonNull(this.redisTemplate.opsForZSet().incrementScore(key, value, delta)).longValue();
 	}
 
@@ -436,6 +444,10 @@ public class RedisCache {
 		return Objects.requireNonNullElse(score, -1d);
 	}
 
+	public boolean isValueInZset(String key, Object value) {
+		return Objects.nonNull(this.redisTemplate.opsForZSet().score(key, value));
+	}
+
 	/**
 	 * 删除zset
 	 *
@@ -504,11 +516,28 @@ public class RedisCache {
         return Boolean.TRUE.equals(this.redisTemplate.opsForValue().getBit(cacheKey, offset));
     }
 
-	public void incrCounter(String cacheKey) {
+	public void incrLongCounter(String cacheKey) {
 		this.redisTemplate.opsForValue().increment(cacheKey);
 	}
 
-	public <T> T getCounterValue(String cacheKey) {
-		return (T) this.redisTemplate.opsForValue().get(cacheKey);
+	public void incrLongCounter(String cacheKey, long delta) {
+		this.redisTemplate.opsForValue().increment(cacheKey, delta);
+	}
+
+	public Long getLongCounterValue(String cacheKey) {
+		ValueOperations<String, Integer> valueOperations = this.redisTemplate.opsForValue();
+		Integer v = valueOperations.get(cacheKey);
+		return Objects.isNull(v) ? null : v.longValue();
+	}
+
+	public Long getLongCounterValue(String cacheKey, Supplier<Long> supplier) {
+		ValueOperations<String, Integer> valueOperations = this.redisTemplate.opsForValue();
+		Integer obj = valueOperations.get(cacheKey);
+		if (Objects.isNull(obj)) {
+			Long initV = supplier.get();
+			incrLongCounter(cacheKey, initV);
+			return initV;
+		}
+		return obj.longValue();
 	}
 }
diff --git a/chestnut-common/chestnut-common-security/pom.xml b/chestnut-common/chestnut-common-security/pom.xml
index 41c4fbfc..37d07033 100644
--- a/chestnut-common/chestnut-common-security/pom.xml
+++ b/chestnut-common/chestnut-common-security/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-staticize/pom.xml b/chestnut-common/chestnut-common-staticize/pom.xml
index 5f86c330..5f0b5adc 100644
--- a/chestnut-common/chestnut-common-staticize/pom.xml
+++ b/chestnut-common/chestnut-common-staticize/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/AbstractFunc.java b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/AbstractFunc.java
index b5b473b1..361869e5 100644
--- a/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/AbstractFunc.java
+++ b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/AbstractFunc.java
@@ -15,16 +15,15 @@
  */
 package com.chestnut.common.staticize.func;
 
-import java.util.List;
-
 import freemarker.template.TemplateMethodModelEx;
 import freemarker.template.TemplateModelException;
 
+import java.util.List;
+
 public abstract class AbstractFunc implements IFunction, TemplateMethodModelEx {
 	
 	@Override
-	@SuppressWarnings("rawtypes")
-	public Object exec(List args) throws TemplateModelException {
+    public Object exec(List args) throws TemplateModelException {
 		return exec0(args.toArray());
 	}
 	
diff --git a/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/MaxFunction.java b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/MaxFunction.java
new file mode 100644
index 00000000..21fd3187
--- /dev/null
+++ b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/MaxFunction.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.common.staticize.func.impl;
+
+import com.chestnut.common.staticize.func.AbstractFunc;
+import com.chestnut.common.utils.StringUtils;
+import freemarker.template.SimpleNumber;
+import freemarker.template.TemplateModelException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Freemarker模板自定义函数：最大值
+ */
+@Component
+@RequiredArgsConstructor
+public class MaxFunction extends AbstractFunc  {
+
+	static final String FUNC_NAME = "max";
+
+	private static final String DESC = "{FREEMARKER.FUNC.DESC." + FUNC_NAME + "}";
+
+	@Override
+	public String getFuncName() {
+		return FUNC_NAME;
+	}
+
+	@Override
+	public String getDesc() {
+		return DESC;
+	}
+
+	@Override
+	public Object exec0(Object... args) throws TemplateModelException {
+		if (StringUtils.isEmpty(args)) {
+			return StringUtils.EMPTY;
+		}
+		SimpleNumber max = (SimpleNumber) args[0];
+		for (int i = 1; i < args.length; i++) {
+			SimpleNumber simpleNumber = (SimpleNumber) args[i];
+			if (simpleNumber.getAsNumber().doubleValue() > max.getAsNumber().doubleValue()) {
+				max = simpleNumber;
+			}
+		}
+		return max;
+	}
+
+	@Override
+	public List<FuncArg> getFuncArgs() {
+		return List.of();
+	}
+}
diff --git a/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/MinFunction.java b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/MinFunction.java
new file mode 100644
index 00000000..479032d7
--- /dev/null
+++ b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/MinFunction.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.common.staticize.func.impl;
+
+import com.chestnut.common.staticize.func.AbstractFunc;
+import com.chestnut.common.utils.StringUtils;
+import freemarker.template.SimpleNumber;
+import freemarker.template.TemplateModelException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Freemarker模板自定义函数：最小值
+ */
+@Component
+@RequiredArgsConstructor
+public class MinFunction extends AbstractFunc  {
+
+	static final String FUNC_NAME = "min";
+
+	private static final String DESC = "{FREEMARKER.FUNC.DESC." + FUNC_NAME + "}";
+
+	@Override
+	public String getFuncName() {
+		return FUNC_NAME;
+	}
+
+	@Override
+	public String getDesc() {
+		return DESC;
+	}
+
+	@Override
+	public Object exec0(Object... args) throws TemplateModelException {
+		if (StringUtils.isEmpty(args)) {
+			return StringUtils.EMPTY;
+		}
+		SimpleNumber min = (SimpleNumber) args[0];
+		for (int i = 1; i < args.length; i++) {
+			SimpleNumber simpleNumber = (SimpleNumber) args[i];
+			if (simpleNumber.getAsNumber().doubleValue() < min.getAsNumber().doubleValue()) {
+				min = simpleNumber;
+			}
+		}
+		return min;
+	}
+
+	@Override
+	public List<FuncArg> getFuncArgs() {
+		return List.of();
+	}
+}
diff --git a/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/URLParametersFunction.java b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/URLParametersFunction.java
index 5a03a7af..3618cb07 100644
--- a/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/URLParametersFunction.java
+++ b/chestnut-common/chestnut-common-staticize/src/main/java/com/chestnut/common/staticize/func/impl/URLParametersFunction.java
@@ -65,6 +65,6 @@ public class URLParametersFunction extends AbstractFunc  {
 
 	@Override
 	public List<FuncArg> getFuncArgs() {
-		return List.of();
+		return List.of(new FuncArg("URL", FuncArgType.String, true, null));
 	}
 }
diff --git a/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages.properties b/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages.properties
index 59fc44bb..4b7f2e74 100644
--- a/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages.properties
+++ b/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages.properties
@@ -6,3 +6,5 @@ FREEMARKER.TAG.NAME.page_bar=分页条标签
 FREEMARKER.TAG.DESC.page_bar=生成固定格式的分页条html代码，样式由模板样式决定
 
 FREEMARKER.FUNC.DESC.urlParameters=URL参数解析函数，返回参数列表数组[{"name":"参数名","value":"参数值"},...]
+FREEMARKER.FUNC.DESC.min=Get the smallest number among multiple numbers
+FREEMARKER.FUNC.DESC.max=Get the largest number among multiple numbers
\ No newline at end of file
diff --git a/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_en.properties b/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_en.properties
index e1c6a896..77a33bf6 100644
--- a/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_en.properties
@@ -5,4 +5,6 @@ FREEMARKER.TAG_ATTR.CONDITION=Extend sql condition, eg: title like 'a%'
 FREEMARKER.TAG.NAME.page_bar=Pagination bar tag
 FREEMARKER.TAG.DESC.page_bar=Generate pagination bar html code, the style is determined by the template style.
 
-FREEMARKER.FUNC.DESC.urlParameters=URL parameter parse function, return parameter list like `[{"name":"参数名","value":"参数值"},...]`.
\ No newline at end of file
+FREEMARKER.FUNC.DESC.urlParameters=URL parameter parse function, return parameter list like `[{"name":"参数名","value":"参数值"},...]`.
+FREEMARKER.FUNC.DESC.min=獲取多個數字中最小的數字
+FREEMARKER.FUNC.DESC.max=獲取多個數字中最大的數字
\ No newline at end of file
diff --git a/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_zh_TW.properties
index 26ad773d..07e3639d 100644
--- a/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-common/chestnut-common-staticize/src/main/resources/i18n/messages_zh_TW.properties
@@ -6,3 +6,5 @@ FREEMARKER.TAG.NAME.page_bar=分頁條標籤
 FREEMARKER.TAG.DESC.page_bar=生成固定格式的分頁條html代碼，樣式由模板樣式決定
 
 FREEMARKER.FUNC.DESC.urlParameters=URL參數解析函數，返回參數列表數組[{"name":"參數名","value":"參數值"},...]
+FREEMARKER.FUNC.DESC.min=獲取多個數字中最小的數字
+FREEMARKER.FUNC.DESC.max=獲取多個數字中最大的數字
diff --git a/chestnut-common/chestnut-common-storage/pom.xml b/chestnut-common/chestnut-common-storage/pom.xml
index ebf164a7..be7b392e 100644
--- a/chestnut-common/chestnut-common-storage/pom.xml
+++ b/chestnut-common/chestnut-common-storage/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>chestnut-common</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-common/pom.xml b/chestnut-common/pom.xml
index f37e66ea..8c6d0a09 100644
--- a/chestnut-common/pom.xml
+++ b/chestnut-common/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-comment/pom.xml b/chestnut-modules/chestnut-comment/pom.xml
index 2d96d652..3ddcc6ad 100644
--- a/chestnut-modules/chestnut-comment/pom.xml
+++ b/chestnut-modules/chestnut-comment/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>chestnut-modules</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-generator/pom.xml b/chestnut-modules/chestnut-generator/pom.xml
index bd30669c..bb29e32d 100644
--- a/chestnut-modules/chestnut-generator/pom.xml
+++ b/chestnut-modules/chestnut-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>chestnut-modules</artifactId>
         <groupId>com.chestnut</groupId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-member/pom.xml b/chestnut-modules/chestnut-member/pom.xml
index fd583947..b32b31ef 100644
--- a/chestnut-modules/chestnut-member/pom.xml
+++ b/chestnut-modules/chestnut-member/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>chestnut-modules</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-meta/pom.xml b/chestnut-modules/chestnut-meta/pom.xml
index 32fc6c3d..250713ce 100644
--- a/chestnut-modules/chestnut-meta/pom.xml
+++ b/chestnut-modules/chestnut-meta/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
         <artifactId>chestnut-modules</artifactId>
         <groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/core/IMetaControlType.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/core/IMetaControlType.java
index 72aac6f6..00db750f 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/core/IMetaControlType.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/core/IMetaControlType.java
@@ -18,7 +18,7 @@ package com.chestnut.xmodel.core;
 import com.chestnut.xmodel.dto.XModelFieldDataDTO;
 
 /**
- * 元数据模型字段类型
+ * 元数据模型字段控件类型
  *
  * @author 兮玥
  * @email 190785909@qq.com
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelFieldDataDTO.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelFieldDataDTO.java
index d389c40d..73f4b69a 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelFieldDataDTO.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelFieldDataDTO.java
@@ -39,8 +39,8 @@ public class XModelFieldDataDTO {
     
     private Object value;
 
-	private String valueSrc;
-    
+	private Object valueObj;
+
 	public static XModelFieldDataDTO newInstance(XModelField field, String value) {
 		XModelFieldDataDTO dto = new XModelFieldDataDTO();
 		dto.setLabel(field.getName());
diff --git a/chestnut-modules/chestnut-monitor/pom.xml b/chestnut-modules/chestnut-monitor/pom.xml
index d1cd362e..cb65fc56 100644
--- a/chestnut-modules/chestnut-monitor/pom.xml
+++ b/chestnut-modules/chestnut-monitor/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.chestnut</groupId>
         <artifactId>chestnut-modules</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <artifactId>chestnut-monitor</artifactId>
diff --git a/chestnut-modules/chestnut-search/pom.xml b/chestnut-modules/chestnut-search/pom.xml
index 5ea849f6..d62189a1 100644
--- a/chestnut-modules/chestnut-search/pom.xml
+++ b/chestnut-modules/chestnut-search/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>chestnut-modules</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchWordController.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchWordController.java
new file mode 100644
index 00000000..1eeeb55c
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchWordController.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chestnut.common.domain.R;
+import com.chestnut.common.log.annotation.Log;
+import com.chestnut.common.log.enums.BusinessType;
+import com.chestnut.common.security.anno.Priv;
+import com.chestnut.common.security.web.BaseRestController;
+import com.chestnut.common.security.web.PageRequest;
+import com.chestnut.common.utils.DateUtils;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.domain.SearchWordHourStat;
+import com.chestnut.search.domain.dto.SearchWordToppingDTO;
+import com.chestnut.search.service.ISearchWordHourStatService;
+import com.chestnut.search.service.ISearchWordService;
+import com.chestnut.system.security.AdminUserType;
+import com.chestnut.system.security.StpAdminUtil;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Priv(type = AdminUserType.TYPE)
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/search/word")
+public class SearchWordController extends BaseRestController {
+
+	private final ISearchWordService searchWordStatService;
+
+	private final ISearchWordHourStatService searchWordHourStatService;
+	
+	@GetMapping
+	public R<?> getPageList(@RequestParam(value = "query", required = false) String query) {
+		PageRequest pr = this.getPageRequest();
+		Page<SearchWord> page = this.searchWordStatService.lambdaQuery()
+				.like(StringUtils.isNotEmpty(query), SearchWord::getWord, query)
+				.orderByDesc(SearchWord::getTopFlag, SearchWord::getSearchTotal)
+				.page(new Page<>(pr.getPageNumber(), pr.getPageSize(), true));
+		return this.bindDataTable(page);
+	}
+
+	@GetMapping("/trend")
+	public R<?> getTrendStatData(
+			@RequestParam @Min(1) Long wordId,
+			@RequestParam LocalDateTime beginTime,
+			@RequestParam LocalDateTime endTime
+	) {
+		List<SearchWordHourStat> list = this.searchWordHourStatService.lambdaQuery()
+				.eq(SearchWordHourStat::getWordId, wordId)
+				.ge(Objects.nonNull(beginTime), SearchWordHourStat::getHour, DateUtils.FORMAT_YYYYMMDDHH.format(beginTime))
+				.le(Objects.nonNull(endTime), SearchWordHourStat::getHour, DateUtils.FORMAT_YYYYMMDDHH.format(endTime))
+				.orderByAsc(SearchWordHourStat::getHour)
+				.list();
+		Map<String, SearchWordHourStat> collect = list.stream()
+				.collect(Collectors.toMap(SearchWordHourStat::getHour, s -> s));
+
+
+		List<String> xAxisDatas = new ArrayList<>();
+		Map<String, List<Integer>> lineDatas = new HashMap<>();
+		List<Integer> searchCountDatas = new ArrayList<>();
+
+		while (!beginTime.isAfter(endTime)) {
+			String hourStr = DateUtils.FORMAT_YYYYMMDDHH.format(beginTime);
+			xAxisDatas.add(hourStr);
+
+			SearchWordHourStat stat = collect.get(hourStr);
+			searchCountDatas.add(Objects.isNull(stat) ? 0 : stat.getSearchCount());
+
+			beginTime = beginTime.plusHours(1);
+		}
+		lineDatas.put("SearchCount", searchCountDatas);
+
+		return R.ok(Map.of("xAxisDatas", xAxisDatas, "lineDatas", lineDatas));
+	}
+
+	@Log(title = "新增搜索词", businessType = BusinessType.INSERT)
+	@PostMapping
+	public R<?> addWord(@RequestBody SearchWord wordStat) {
+		wordStat.createBy(StpAdminUtil.getLoginUser().getUsername());
+		this.searchWordStatService.addWord(wordStat);
+		return R.ok();
+	}
+
+	@Log(title = "编辑搜索词", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public R<?> editWord(@RequestBody SearchWord wordStat) {
+		wordStat.updateBy(StpAdminUtil.getLoginUser().getUsername());
+		this.searchWordStatService.editWord(wordStat);
+		return R.ok();
+	}
+
+	@Log(title = "编辑搜索词", businessType = BusinessType.UPDATE)
+	@PutMapping("/set_top")
+	public R<?> setTop(@RequestBody SearchWordToppingDTO dto) {
+		dto.setOperator(StpAdminUtil.getLoginUser());
+		this.searchWordStatService.setTop(dto);
+		return R.ok();
+	}
+
+	@Log(title = "编辑搜索词", businessType = BusinessType.UPDATE)
+	@PutMapping("/cancel_top")
+	public R<?> cancelTop(@RequestBody @NotEmpty List<Long> wordIds) {
+		this.searchWordStatService.cancelTop(wordIds, StpAdminUtil.getLoginUser().getUsername());
+		return R.ok();
+	}
+
+	@Log(title = "删除搜索词", businessType = BusinessType.DELETE)
+	@DeleteMapping
+	public R<?> deleteWords(@RequestBody @NotEmpty List<Long> wordIds) {
+		this.searchWordStatService.deleteWords(wordIds);
+		return R.ok();
+	}
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/SearchWord.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/SearchWord.java
new file mode 100644
index 00000000..63720efd
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/SearchWord.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.chestnut.common.db.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * 搜索词统计
+ */
+@Getter
+@Setter
+@TableName(SearchWord.TABLE_NAME)
+public class SearchWord extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	public static final String TABLE_NAME = "search_word";
+
+	@TableId(value = "word_id", type = IdType.AUTO)
+	private Long wordId;
+
+	/**
+	 * 搜索词
+	 */
+	private String word;
+
+	/**
+	 * 置顶标识
+	 */
+	private Long topFlag;
+
+	/**
+	 * 置顶结束时间
+	 */
+	private LocalDateTime topDate;
+
+	/**
+	 * 历史总搜索次数
+	 */
+	private Long searchTotal;
+
+	/**
+	 * 来源标识，例如：cms:siteId
+	 */
+	private String source;
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/SearchWordHourStat.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/SearchWordHourStat.java
new file mode 100644
index 00000000..4a1d6d20
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/SearchWordHourStat.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 搜索词小时统计数据
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Getter
+@Setter
+@TableName(SearchWordHourStat.TABLE_NAME)
+public class SearchWordHourStat implements Serializable {
+	
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	public final static String TABLE_NAME = "search_word_hour_stat";
+
+	@TableId(value = "stat_id", type = IdType.AUTO)
+	private Long statId;
+	
+	/**
+	 * 统计周期，格式：yyyyMMddHH
+	 */
+	private String hour;
+	
+	/**
+	 * 搜索词ID
+	 */
+	private Long wordId;
+
+	/**
+	 * 搜索词（冗余）
+	 */
+	private String word;
+	
+	/**
+	 * 检索次数
+	 */
+	private Integer searchCount;
+}
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingDTO.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingDTO.java
new file mode 100644
index 00000000..28839ffb
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingDTO.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.domain.dto;
+
+import com.chestnut.common.security.domain.BaseDTO;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+public class SearchWordToppingDTO extends BaseDTO {
+
+	/**
+     * 搜索词IDs
+     */
+    @NotEmpty
+    private List<Long> wordIds;
+    
+    /**
+     * 指定结束时间
+     */
+    private LocalDateTime topEndTime;
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/job/SearchWordStatJobHandler.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/job/SearchWordStatJobHandler.java
new file mode 100644
index 00000000..ea4be454
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/job/SearchWordStatJobHandler.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.job;
+
+import com.chestnut.common.redis.RedisCache;
+import com.chestnut.common.utils.DateUtils;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.domain.SearchWordHourStat;
+import com.chestnut.search.service.ISearchWordHourStatService;
+import com.chestnut.search.service.ISearchWordService;
+import com.chestnut.system.schedule.IScheduledHandler;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 搜索词统计任务
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@RequiredArgsConstructor
+@Component(IScheduledHandler.BEAN_PREFIX + SearchWordStatJobHandler.JOB_NAME)
+public class SearchWordStatJobHandler extends IJobHandler implements IScheduledHandler {
+
+	static final String JOB_NAME = "SearchWordStatJob";
+
+	private final ISearchWordService searchWordService;
+
+	private final ISearchWordHourStatService searchWordHourStatService;
+
+	private final RedisCache redisCache;
+
+	@Override
+	public String getId() {
+		return JOB_NAME;
+	}
+
+	@Override
+	public String getName() {
+		return "{SCHEDULED_TASK." + JOB_NAME + "}";
+	}
+
+	@Override
+	public void exec() throws Exception {
+		logger.info("Job start: {}", JOB_NAME);
+		long s = System.currentTimeMillis();
+		// 更新累计搜索数据
+		searchWordService.syncSearchWordStatToDB();
+		// 数据更新
+		String hour = LocalDateTime.now().format(DateUtils.FORMAT_YYYYMMDDHH);
+		this.saveToDb(hour, false);
+		// 尝试更新上一个小时数据并删除cache
+		String yesterday = LocalDateTime.now().minusHours(1).format(DateUtils.FORMAT_YYYYMMDDHH);
+		this.saveToDb(yesterday, true);
+		logger.info("Job '{}' completed, cost: {}ms", JOB_NAME, System.currentTimeMillis() - s);
+	}
+
+	private void saveToDb(String hour, boolean deleteCache) {
+		String cacheKey = ISearchWordHourStatService.CACHE_PREFIX + hour;
+
+		Map<Long, SearchWordHourStat> stats = this.searchWordHourStatService.lambdaQuery()
+				.eq(SearchWordHourStat::getHour, hour)
+				.list()
+				.stream()
+				.collect(Collectors.toMap(SearchWordHourStat::getWordId, stat -> stat));
+		// TODO 大量数据需要优化
+		Map<Long, String> searchWords = this.searchWordService.lambdaQuery()
+				.select(List.of(SearchWord::getWordId, SearchWord::getWord))
+				.list()
+				.stream()
+				.collect(Collectors.toMap(SearchWord::getWordId, SearchWord::getWord));
+		Set<Long> insertIds = new HashSet<>();
+		Map<String, Integer> cacheMap = this.redisCache.getCacheMap(cacheKey);
+		cacheMap.forEach((wordId, count) -> {
+			Long wordIdLongV = Long.valueOf(wordId);
+			if (searchWords.containsKey(wordIdLongV)) {
+				SearchWordHourStat stat = stats.get(wordIdLongV);
+				if (Objects.isNull(stat)) {
+					stat = new SearchWordHourStat();
+					stat.setHour(hour);
+					stat.setWordId(wordIdLongV);
+					stat.setWord(searchWords.get(wordIdLongV));
+
+					stats.put(wordIdLongV, stat);
+					insertIds.add(wordIdLongV);
+				}
+				stat.setSearchCount(Math.max(count, 0));
+			}
+		});
+		// 更新数据库
+		List<SearchWordHourStat> inserts = stats.values().stream()
+				.filter(stat -> insertIds.contains(stat.getWordId())).toList();
+		this.searchWordHourStatService.saveBatch(inserts);
+		List<SearchWordHourStat> updates = stats.values().stream()
+				.filter(stat -> !insertIds.contains(stat.getWordId())).toList();
+		this.searchWordHourStatService.updateBatchById(updates);
+		// 清理过期缓存
+		if (deleteCache) {
+			this.redisCache.deleteObject(cacheKey);
+		}
+	}
+
+	@Override
+	@XxlJob(JOB_NAME)
+	public void execute() throws Exception {
+		this.exec();
+	}
+}
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/mapper/SearchWordHourStatMapper.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/mapper/SearchWordHourStatMapper.java
new file mode 100644
index 00000000..8b8c7a7f
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/mapper/SearchWordHourStatMapper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chestnut.search.domain.SearchWordHourStat;
+
+/**
+ * <p>
+ * 搜索词小时统计Mapper 接口
+ * </p>
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+public interface SearchWordHourStatMapper extends BaseMapper<SearchWordHourStat> {
+
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/mapper/SearchWordMapper.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/mapper/SearchWordMapper.java
new file mode 100644
index 00000000..7d165c3b
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/mapper/SearchWordMapper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chestnut.search.domain.SearchWord;
+
+/**
+ * <p>
+ * 搜索词统计Mapper 接口
+ * </p>
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+public interface SearchWordMapper extends BaseMapper<SearchWord> {
+
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordHourStatService.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordHourStatService.java
new file mode 100644
index 00000000..67e294f4
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordHourStatService.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.domain.SearchWordHourStat;
+
+import java.time.LocalDateTime;
+
+public interface ISearchWordHourStatService extends IService<SearchWordHourStat> {
+
+	String CACHE_PREFIX = "search:word:hour:";
+
+	/**
+	 * 处理搜索日志
+	 */
+	void handleSearchLog(SearchWord wordStat, LocalDateTime evtTime);
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordService.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordService.java
new file mode 100644
index 00000000..504732cf
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordService.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.domain.dto.SearchWordToppingDTO;
+
+import java.util.List;
+
+public interface ISearchWordService extends IService<SearchWord> {
+
+	/**
+	 * 搜索词计数
+	 */
+	void increaseSearchCount(SearchWord searchWord);
+
+	/**
+	 * 创建搜索词数据
+	 */
+	void addWord(SearchWord word);
+
+	/**
+	 * 编辑搜索词数据
+	 */
+	void editWord(SearchWord word);
+
+	/**
+	 * 删除搜索词数据
+	 */
+	void deleteWords(List<Long> wordIds);
+
+	/**
+	 * 搜索词置顶
+	 */
+	void setTop(SearchWordToppingDTO dto);
+
+	/**
+	 * 搜索词取消置顶
+	 */
+	void cancelTop(List<Long> wordIds, String operator);
+
+	/**
+	 * 同步缓存搜索词计数数据到DB
+	 */
+    void syncSearchWordStatToDB();
+
+	SearchWord getSearchWord(String word, String source);
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java
index 28058e06..5297a075 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java
@@ -15,20 +15,22 @@
  */
 package com.chestnut.search.service.impl;
 
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chestnut.common.async.AsyncTaskManager;
 import com.chestnut.common.utils.IP2RegionUtils;
 import com.chestnut.common.utils.ServletUtils;
+import com.chestnut.search.domain.SearchLog;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.domain.dto.SearchLogDTO;
+import com.chestnut.search.mapper.SearchLogMapper;
+import com.chestnut.search.service.ISearchLogService;
+import com.chestnut.search.service.ISearchWordHourStatService;
+import com.chestnut.search.service.ISearchWordService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chestnut.search.domain.SearchLog;
-import com.chestnut.search.domain.dto.SearchLogDTO;
-import com.chestnut.search.mapper.SearchLogMapper;
-import com.chestnut.search.service.ISearchLogService;
+import java.time.LocalDateTime;
 
 @RequiredArgsConstructor
 @Service
@@ -36,6 +38,10 @@ public class SearchLogServiceImpl extends ServiceImpl<SearchLogMapper, SearchLog
 
 	private final AsyncTaskManager asyncTaskManager;
 
+	private final ISearchWordService searchWordStatService;
+
+	private final ISearchWordHourStatService searchWordHourStatService;
+
 	@Override
 	public void addSearchLog(SearchLogDTO dto) {
 		asyncTaskManager.execute(() -> {
@@ -49,6 +55,10 @@ public class SearchLogServiceImpl extends ServiceImpl<SearchLogMapper, SearchLog
 			sLog.setSource(dto.getSource());
 			sLog.setClientType(ServletUtils.getDeviceType(dto.getUserAgent()));
 			this.save(sLog);
+
+			SearchWord searchWord = searchWordStatService.getSearchWord(sLog.getWord(), sLog.getSource());
+			searchWordStatService.increaseSearchCount(searchWord);
+			searchWordHourStatService.handleSearchLog(searchWord, sLog.getLogTime());
 		});
 	}
 
@@ -69,6 +79,10 @@ public class SearchLogServiceImpl extends ServiceImpl<SearchLogMapper, SearchLog
 			sLog.setClientType(ServletUtils.getDeviceType(userAgent));
 			sLog.setSource(source);
 			this.save(sLog);
+
+			SearchWord searchWord = searchWordStatService.getSearchWord(sLog.getWord(), sLog.getSource());
+			searchWordStatService.increaseSearchCount(searchWord);
+			searchWordHourStatService.handleSearchLog(searchWord, sLog.getLogTime());
 		});
 	}
 }
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordHourStatServiceImpl.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordHourStatServiceImpl.java
new file mode 100644
index 00000000..31a06ed3
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordHourStatServiceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chestnut.common.async.AsyncTaskManager;
+import com.chestnut.common.redis.RedisCache;
+import com.chestnut.common.utils.DateUtils;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.domain.SearchWordHourStat;
+import com.chestnut.search.mapper.SearchWordHourStatMapper;
+import com.chestnut.search.service.ISearchWordHourStatService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+public class SearchWordHourStatServiceImpl extends ServiceImpl<SearchWordHourStatMapper, SearchWordHourStat>
+		implements ISearchWordHourStatService {
+
+	private final RedisCache redisCache;
+
+	private final AsyncTaskManager asyncTaskManager;
+
+	public void handleSearchLog(SearchWord wordStat, LocalDateTime evtTime) {
+		this.asyncTaskManager.execute(() -> {
+			// redis 小时检索数+1
+			String cacheKey = CACHE_PREFIX + evtTime.format(DateUtils.FORMAT_YYYYMMDDHH);
+			redisCache.incrMapValue(cacheKey, wordStat.getWordId().toString(), 1);
+		});
+	}
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordServiceImpl.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordServiceImpl.java
new file mode 100644
index 00000000..5987435c
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordServiceImpl.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chestnut.common.async.AsyncTaskManager;
+import com.chestnut.common.exception.CommonErrorCode;
+import com.chestnut.common.redis.RedisCache;
+import com.chestnut.common.utils.Assert;
+import com.chestnut.common.utils.IdUtils;
+import com.chestnut.common.utils.StringUtils;
+import com.chestnut.search.domain.SearchWord;
+import com.chestnut.search.domain.SearchWordHourStat;
+import com.chestnut.search.domain.dto.SearchWordToppingDTO;
+import com.chestnut.search.mapper.SearchWordMapper;
+import com.chestnut.search.service.ISearchWordHourStatService;
+import com.chestnut.search.service.ISearchWordService;
+import com.chestnut.system.SysConstants;
+import lombok.RequiredArgsConstructor;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Service;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
+@RequiredArgsConstructor
+@Service
+public class SearchWordServiceImpl extends ServiceImpl<SearchWordMapper, SearchWord>
+		implements ISearchWordService {
+
+	private static final String CACHE_KEY = "search:word";
+
+	private final AsyncTaskManager asyncTaskManager;
+
+	private final RedisCache redisCache;
+
+	private final RedissonClient redissonClient;
+
+	private final ISearchWordHourStatService searchWordHourStatService;
+
+	@Override
+	public void increaseSearchCount(SearchWord searchWord) {
+		if (!redisCache.isValueInZset(CACHE_KEY, searchWord.getWordId().toString())) {
+			redisCache.zsetIncr(CACHE_KEY, searchWord.getWordId().toString(),
+					searchWord.getSearchTotal() + 1);
+		} else {
+			redisCache.zsetIncr(CACHE_KEY, searchWord.getWordId().toString(), 1);
+		}
+	}
+
+	@Override
+	public void addWord(SearchWord word) {
+		Long count = this.lambdaQuery().eq(SearchWord::getWord, word.getWord()).count();
+		Assert.isTrue(count == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("word"));
+
+		word.setWordId(IdUtils.getSnowflakeId());
+		word.setTopFlag(0L);
+		this.save(word);
+	}
+
+	@Override
+	public void editWord(SearchWord word) {
+		Long count = this.lambdaQuery().eq(SearchWord::getWord, word.getWord())
+				.ne(SearchWord::getWord, word.getWord()).count();
+		Assert.isTrue(count == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("word"));
+
+		SearchWord dbWord = this.getById(word.getWordId());
+		dbWord.setWord(word.getWord());
+		dbWord.setSearchTotal(word.getSearchTotal());
+		dbWord.setTopFlag(word.getTopFlag());
+		dbWord.setTopDate(word.getTopDate());
+		dbWord.updateBy(word.getUpdateBy());
+		this.updateById(dbWord);
+	}
+
+	@Override
+	public void deleteWords(List<Long> wordIds) {
+		// 删除搜索词数据
+		this.removeBatchByIds(wordIds);
+		// 删除小时统计数据
+		asyncTaskManager.execute(() -> {
+			searchWordHourStatService.remove(new LambdaQueryWrapper<SearchWordHourStat>()
+					.in(SearchWordHourStat::getWordId, wordIds));
+		});
+	}
+
+	@Override
+	public void setTop(SearchWordToppingDTO dto) {
+		List<SearchWord> wordStats = this.listByIds(dto.getWordIds());
+		for (SearchWord wordStat : wordStats) {
+			wordStat.setTopFlag(Instant.now().toEpochMilli());
+			wordStat.setTopDate(dto.getTopEndTime());
+			wordStat.updateBy(dto.getOperator().getUsername());
+		}
+		this.updateBatchById(wordStats);
+	}
+
+	@Override
+	public void cancelTop(List<Long> wordIds, String operator) {
+		this.lambdaUpdate().set(SearchWord::getTopFlag, 0L)
+				.set(SearchWord::getTopDate, null)
+				.set(SearchWord::getUpdateBy, operator)
+				.set(SearchWord::getUpdateTime, LocalDateTime.now())
+				.in(SearchWord::getWordId, wordIds)
+				.update();
+	}
+
+	@Override
+	public void syncSearchWordStatToDB() {
+		RLock lock = redissonClient.getLock("SyncSearchWordStat");
+		lock.lock();
+		try {
+			Set<String> cacheMap = redisCache.getZset(CACHE_KEY, 0, -1);
+			cacheMap.forEach(wordId -> {
+				SearchWord searchWord = this.getById(wordId);
+				if (Objects.nonNull(searchWord)) {
+					long searchTotal = redisCache.getZsetScore(CACHE_KEY, wordId).longValue();
+					this.lambdaUpdate().set(SearchWord::getSearchTotal, searchTotal)
+							.eq(SearchWord::getWordId, wordId).update();
+				}
+			});
+			redisCache.deleteObject(CACHE_KEY);
+		} finally {
+			lock.unlock();
+		}
+	}
+
+	@Override
+	public SearchWord getSearchWord(String word, String source) {
+		RLock lock = redissonClient.getLock("CreateSearchWord");
+		lock.lock();
+		try {
+			Optional<SearchWord> opt = this.lambdaQuery()
+					.eq(SearchWord::getWord, word)
+					.eq(StringUtils.isNotEmpty(source), SearchWord::getSource, source)
+					.isNull(StringUtils.isEmpty(source), SearchWord::getSource)
+					.oneOpt();
+			if (opt.isPresent()) {
+				return opt.get();
+			}
+			SearchWord searchWord = new SearchWord();
+			searchWord.setWordId(IdUtils.getSnowflakeId());
+			searchWord.setWord(word);
+			searchWord.setSource(source);
+			searchWord.setTopFlag(0L);
+			searchWord.setSearchTotal(0L);
+			searchWord.createBy(SysConstants.SYS_OPERATOR);
+			this.save(searchWord);
+			return searchWord;
+		} finally {
+			lock.unlock();
+		}
+	}
+}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/resources/i18n/messages.properties b/chestnut-modules/chestnut-search/src/main/resources/i18n/messages.properties
index ca0cb746..90cb550a 100644
--- a/chestnut-modules/chestnut-search/src/main/resources/i18n/messages.properties
+++ b/chestnut-modules/chestnut-search/src/main/resources/i18n/messages.properties
@@ -10,4 +10,6 @@ DICT.SearchDictWordType.WORD=扩展词
 DICT.SearchDictWordType.STOP=停止词
 DICT.WordAnalyzeType=索引分词方式
 DICT.WordAnalyzeType.ik_smart=最少切分
-DICT.WordAnalyzeType.ik_max_word=最细粒度划分
\ No newline at end of file
+DICT.WordAnalyzeType.ik_max_word=最细粒度划分
+
+SCHEDULED_TASK.SearchWordStatJob=检索词小时统计数据更新任务
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_en.properties b/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_en.properties
index 1158d2b8..483136c8 100644
--- a/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_en.properties
+++ b/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_en.properties
@@ -10,4 +10,6 @@ DICT.SearchDictWordType.WORD=ExtWord
 DICT.SearchDictWordType.STOP=StopWord
 DICT.WordAnalyzeType=Word Analyze Type
 DICT.WordAnalyzeType.ik_smart=IKSmart
-DICT.WordAnalyzeType.ik_max_word=IKMaxWord
\ No newline at end of file
+DICT.WordAnalyzeType.ik_max_word=IKMaxWord
+
+SCHEDULED_TASK.SearchWordStatJob=Search word hour stat update job
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_zh_TW.properties
index 79bd9a8a..93e19db5 100644
--- a/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-modules/chestnut-search/src/main/resources/i18n/messages_zh_TW.properties
@@ -11,3 +11,5 @@ DICT.SearchDictWordType.STOP=停止詞
 DICT.WordAnalyzeType=索引分詞方式
 DICT.WordAnalyzeType.ik_smart=最少切分
 DICT.WordAnalyzeType.ik_max_word=最細粒度劃分
+
+SCHEDULED_TASK.SearchWordStatJob=檢索詞小時統計數據更新任務
diff --git a/chestnut-modules/chestnut-stat/pom.xml b/chestnut-modules/chestnut-stat/pom.xml
index d885596c..25b0cd44 100644
--- a/chestnut-modules/chestnut-stat/pom.xml
+++ b/chestnut-modules/chestnut-stat/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
         <artifactId>chestnut-modules</artifactId>
         <groupId>com.chestnut</groupId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-system/pom.xml b/chestnut-modules/chestnut-system/pom.xml
index 71351cec..e68e261f 100644
--- a/chestnut-modules/chestnut-system/pom.xml
+++ b/chestnut-modules/chestnut-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>chestnut-modules</artifactId>
         <groupId>com.chestnut</groupId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java
index 951cc460..a456e4d7 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java
@@ -28,6 +28,7 @@ import com.chestnut.common.utils.Assert;
 import com.chestnut.common.utils.StringUtils;
 import com.chestnut.system.domain.SysMenu;
 import com.chestnut.system.enums.MenuType;
+import com.chestnut.system.fixed.dict.YesOrNo;
 import com.chestnut.system.permission.SysMenuPriv;
 import com.chestnut.system.security.AdminUserType;
 import com.chestnut.system.security.StpAdminUtil;
@@ -102,7 +103,9 @@ public class SysMenuController extends BaseRestController {
 	@Priv(type = AdminUserType.TYPE)
 	@GetMapping("/userTreeselect")
 	public R<?> userTreeselect() {
-		List<SysMenu> menus = this.menuService.lambdaQuery().ne(SysMenu::getMenuType, MenuType.Button.value())
+		List<SysMenu> menus = this.menuService.lambdaQuery()
+				.ne(SysMenu::getMenuType, MenuType.Button.value())
+				.eq(SysMenu::getVisible, YesOrNo.YES)
 				.orderByAsc(SysMenu::getOrderNum).list();
 
 		List<String> menuPerms = StpAdminUtil.getLoginUser().getPermissions();
diff --git a/chestnut-modules/chestnut-vote/pom.xml b/chestnut-modules/chestnut-vote/pom.xml
index 570c5d45..3b20e651 100644
--- a/chestnut-modules/chestnut-vote/pom.xml
+++ b/chestnut-modules/chestnut-vote/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>chestnut-modules</artifactId>
 		<groupId>com.chestnut</groupId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-word/pom.xml b/chestnut-modules/chestnut-word/pom.xml
index 79393475..c38c22d4 100644
--- a/chestnut-modules/chestnut-word/pom.xml
+++ b/chestnut-modules/chestnut-word/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
         <artifactId>chestnut-modules</artifactId>
         <groupId>com.chestnut</groupId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/controller/TagWordController.java b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/controller/TagWordController.java
index a9fc3b11..3f028cc5 100644
--- a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/controller/TagWordController.java
+++ b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/controller/TagWordController.java
@@ -24,6 +24,7 @@ import com.chestnut.common.utils.StringUtils;
 import com.chestnut.system.security.AdminUserType;
 import com.chestnut.system.security.StpAdminUtil;
 import com.chestnut.word.domain.TagWord;
+import com.chestnut.word.domain.dto.BatchAddTagDTO;
 import com.chestnut.word.permission.WordPriv;
 import com.chestnut.word.service.ITagWordService;
 import jakarta.validation.constraints.Min;
@@ -68,6 +69,13 @@ public class TagWordController extends BaseRestController {
 		return R.ok();
 	}
 
+	@PostMapping("/batchAdd")
+	public R<?> batchAdd(@RequestBody @Validated BatchAddTagDTO dto) {
+		dto.setOperator(StpAdminUtil.getLoginUser());
+		this.tagWordService.batchAddTagWord(dto);
+		return R.ok();
+	}
+
 	@PutMapping
 	public R<?> edit(@RequestBody @Validated TagWord tagWord) {
 		tagWord.updateBy(StpAdminUtil.getLoginUser().getUsername());
diff --git a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/domain/dto/BatchAddTagDTO.java b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/domain/dto/BatchAddTagDTO.java
new file mode 100644
index 00000000..6b1ff8a4
--- /dev/null
+++ b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/domain/dto/BatchAddTagDTO.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022-2024 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.word.domain.dto;
+
+import com.chestnut.common.security.domain.BaseDTO;
+import com.chestnut.system.validator.LongId;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * BatchAddTagVO
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Getter
+@Setter
+public class BatchAddTagDTO extends BaseDTO {
+
+    @NotNull
+    @LongId
+    private Long groupId;
+
+    @NotEmpty
+    private List<String> words;
+}
diff --git a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/exception/WordErrorCode.java b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/exception/WordErrorCode.java
index 5941dc9d..32e0d4a2 100644
--- a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/exception/WordErrorCode.java
+++ b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/exception/WordErrorCode.java
@@ -26,7 +26,7 @@ public enum WordErrorCode implements ErrorCode {
 	CONFLIECT_ERROR_PRONE_WORD,
 	
 	/**
-	 * 热词分組名称/编码冲突
+	 * 热词分組编码冲突
 	 */
 	CONFLIECT_HOT_WORD_GROUP,
 
diff --git a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/ITagWordService.java b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/ITagWordService.java
index b79eaab8..e19387cc 100644
--- a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/ITagWordService.java
+++ b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/ITagWordService.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.chestnut.word.domain.TagWord;
+import com.chestnut.word.domain.dto.BatchAddTagDTO;
 
 public interface ITagWordService extends IService<TagWord> {
 
@@ -31,6 +32,13 @@ public interface ITagWordService extends IService<TagWord> {
 	void addTagWord(TagWord tagWord);
 
 	/**
+	 * 批量添加TAG词
+	 *
+	 * @param dto
+	 */
+    void batchAddTagWord(BatchAddTagDTO dto);
+
+    /**
 	 * 编辑TAG词
 	 * 
 	 * @param tagWord
diff --git a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/HotWordGroupServiceImpl.java b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/HotWordGroupServiceImpl.java
index 958685e8..c1d8d722 100644
--- a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/HotWordGroupServiceImpl.java
+++ b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/HotWordGroupServiceImpl.java
@@ -21,6 +21,7 @@ import com.chestnut.common.exception.CommonErrorCode;
 import com.chestnut.common.utils.Assert;
 import com.chestnut.common.utils.IdUtils;
 import com.chestnut.common.utils.SortUtils;
+import com.chestnut.common.utils.StringUtils;
 import com.chestnut.system.security.StpAdminUtil;
 import com.chestnut.word.domain.HotWord;
 import com.chestnut.word.domain.HotWordGroup;
@@ -42,7 +43,7 @@ public class HotWordGroupServiceImpl extends ServiceImpl<HotWordGroupMapper, Hot
 
 	@Override
 	public HotWordGroup addHotWordGroup(HotWordGroup group) {
-		this.checkUnique(group.getGroupId(), group.getName(), group.getCode());
+		this.checkUnique(group.getOwner(), group.getGroupId(), group.getCode());
 
 		group.setGroupId(IdUtils.getSnowflakeId());
 		group.setWordTotal(0L);
@@ -57,7 +58,7 @@ public class HotWordGroupServiceImpl extends ServiceImpl<HotWordGroupMapper, Hot
 		HotWordGroup db = this.getById(group.getGroupId());
 		Assert.notNull(db, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("groupId", group.getGroupId()));
 
-		this.checkUnique(group.getGroupId(), group.getName(), group.getCode());
+		this.checkUnique(group.getOwner(), group.getGroupId(), group.getCode());
 
 		db.setName(group.getName());
 		db.setCode(group.getCode());
@@ -74,10 +75,10 @@ public class HotWordGroupServiceImpl extends ServiceImpl<HotWordGroupMapper, Hot
 		}
 	}
 
-	private void checkUnique(Long groupId, String name, String code) {
-		Long count = this.lambdaQuery().ne(groupId != null && groupId > 0, HotWordGroup::getGroupId, groupId)
-				.and(wrapper -> wrapper.eq(HotWordGroup::getName, name).or().eq(HotWordGroup::getCode, code))
-				.count();
+	private void checkUnique(String owner, Long groupId, String code) {
+		Long count = this.lambdaQuery().eq(StringUtils.isNotEmpty(owner), HotWordGroup::getOwner, owner)
+				.ne(IdUtils.validate(groupId), HotWordGroup::getGroupId, groupId)
+				.eq(HotWordGroup::getCode, code).count();
 		Assert.isTrue(count == 0, WordErrorCode.CONFLIECT_HOT_WORD_GROUP::exception);
 	}
 }
diff --git a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordGroupServiceImpl.java b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordGroupServiceImpl.java
index f0afa5d6..0fbae909 100644
--- a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordGroupServiceImpl.java
+++ b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordGroupServiceImpl.java
@@ -22,6 +22,7 @@ import com.chestnut.common.exception.CommonErrorCode;
 import com.chestnut.common.utils.Assert;
 import com.chestnut.common.utils.IdUtils;
 import com.chestnut.common.utils.SortUtils;
+import com.chestnut.common.utils.StringUtils;
 import com.chestnut.word.domain.TagWord;
 import com.chestnut.word.domain.TagWordGroup;
 import com.chestnut.word.mapper.TagWordGroupMapper;
@@ -44,7 +45,7 @@ public class TagWordGroupServiceImpl extends ServiceImpl<TagWordGroupMapper, Tag
 
 	@Override
 	public TagWordGroup addTagWordGroup(TagWordGroup group) {
-		checkUnique(group.getParentId(), null, group.getName(), group.getCode());
+		checkUnique(group.getOwner(), null, group.getCode());
 
 		group.setGroupId(IdUtils.getSnowflakeId());
 		group.setWordTotal(0L);
@@ -58,7 +59,7 @@ public class TagWordGroupServiceImpl extends ServiceImpl<TagWordGroupMapper, Tag
 		TagWordGroup dbGroup = this.getById(group.getGroupId());
 		Assert.notNull(dbGroup, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("groupId", group.getGroupId()));
 
-		checkUnique(group.getParentId(), dbGroup.getGroupId(), group.getName(), group.getCode());
+		checkUnique(group.getOwner(), dbGroup.getGroupId(), group.getCode());
 
 		dbGroup.setName(group.getName());
 		dbGroup.setRemark(group.getRemark());
@@ -66,12 +67,12 @@ public class TagWordGroupServiceImpl extends ServiceImpl<TagWordGroupMapper, Tag
 		this.updateById(group);
 	}
 
-	private void checkUnique(Long parentId, Long groupId, String name, String code) {
-		Long count = this.lambdaQuery().eq(TagWordGroup::getParentId, parentId)
-				.ne(groupId != null && groupId > 0, TagWordGroup::getGroupId, groupId)
-				.and(wrapper -> wrapper.eq(TagWordGroup::getName, name).or().eq(TagWordGroup::getCode, code))
+	private void checkUnique(String owner, Long groupId, String code) {
+		Long count = this.lambdaQuery().eq(StringUtils.isNotEmpty(owner), TagWordGroup::getOwner, owner)
+				.ne(IdUtils.validate(groupId), TagWordGroup::getGroupId, groupId)
+				.eq(TagWordGroup::getCode, code)
 				.count();
-		Assert.isTrue(count == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("name/code"));
+		Assert.isTrue(count == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("code"));
 	}
 
 	@Override
diff --git a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordServiceImpl.java b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordServiceImpl.java
index 23e62e67..d5bc8960 100644
--- a/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordServiceImpl.java
+++ b/chestnut-modules/chestnut-word/src/main/java/com/chestnut/word/service/impl/TagWordServiceImpl.java
@@ -22,6 +22,7 @@ import com.chestnut.common.utils.IdUtils;
 import com.chestnut.common.utils.SortUtils;
 import com.chestnut.word.domain.TagWord;
 import com.chestnut.word.domain.TagWordGroup;
+import com.chestnut.word.domain.dto.BatchAddTagDTO;
 import com.chestnut.word.mapper.TagWordGroupMapper;
 import com.chestnut.word.mapper.TagWordMapper;
 import com.chestnut.word.service.ITagWordService;
@@ -34,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 @RequiredArgsConstructor
@@ -57,7 +59,9 @@ public class TagWordServiceImpl extends ServiceImpl<TagWordMapper, TagWord> impl
 
 			tagWord.setWordId(IdUtils.getSnowflakeId());
 			tagWord.setOwner(tagWordGroup.getOwner());
-			tagWord.setSortFlag(SortUtils.getDefaultSortValue());
+			if (Objects.isNull(tagWord.getSortFlag())) {
+				tagWord.setSortFlag(SortUtils.getDefaultSortValue());
+			}
 			this.save(tagWord);
 
 			tagWordGroup.setWordTotal(tagWordGroup.getWordTotal() + 1);
@@ -67,6 +71,39 @@ public class TagWordServiceImpl extends ServiceImpl<TagWordMapper, TagWord> impl
 		}
 	}
 
+	@Override
+	public void batchAddTagWord(BatchAddTagDTO dto) {
+		RLock lock = redissonClient.getLock("TagWord");
+		lock.lock();
+		try {
+			TagWordGroup tagWordGroup = tagWordGroupMapper.selectById(dto.getGroupId());
+			Assert.notNull(tagWordGroup, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("groupId", dto.getGroupId()));
+
+			for (String word : dto.getWords()) {
+				boolean checkUnique = checkUnique(dto.getGroupId(), null, word);
+				Assert.isTrue(checkUnique, () -> CommonErrorCode.DATA_CONFLICT.exception("word"));
+			}
+
+			List<TagWord> list = dto.getWords().stream().map(word -> {
+				TagWord tagWord = new TagWord();
+				tagWord.setWordId(IdUtils.getSnowflakeId());
+				tagWord.setGroupId(dto.getGroupId());
+				tagWord.setOwner(tagWordGroup.getOwner());
+				tagWord.setWord(word);
+				tagWord.setSortFlag(SortUtils.getDefaultSortValue());
+				tagWord.createBy(dto.getOperator().getUsername());
+				return tagWord;
+			}).toList();
+
+			this.saveBatch(list);
+
+			tagWordGroup.setWordTotal(tagWordGroup.getWordTotal() + list.size());
+			tagWordGroupMapper.updateById(tagWordGroup);
+		} finally {
+			lock.unlock();
+		}
+	}
+
 	@Override
 	public void editTagWord(TagWord tagWord) {
 		TagWord dbTagWord = this.getById(tagWord.getWordId());
diff --git a/chestnut-modules/chestnut-word/src/main/resources/i18n/messages.properties b/chestnut-modules/chestnut-word/src/main/resources/i18n/messages.properties
new file mode 100644
index 00000000..40d32940
--- /dev/null
+++ b/chestnut-modules/chestnut-word/src/main/resources/i18n/messages.properties
@@ -0,0 +1,6 @@
+#错误消息
+ERRCODE.WORD.CONFLIECT_ERROR_PRONE_WORD=易错词“{0}”已存在
+ERRCODE.WORD.CONFLIECT_HOT_WORD_GROUP=热词分組编码冲突
+ERRCODE.WORD.CONFLIECT_HOT_WORD=热词“{0}”已存在
+ERRCODE.WORD.CONFLIECT_SENSITIVE_WORD=敏感词“{0}”已存在
+ERRCODE.WORD.CONFLIECT_TAG_WORD=TAG词“{0}”已存在
diff --git a/chestnut-modules/chestnut-word/src/main/resources/i18n/messages_en.properties b/chestnut-modules/chestnut-word/src/main/resources/i18n/messages_en.properties
new file mode 100644
index 00000000..c2d8b700
--- /dev/null
+++ b/chestnut-modules/chestnut-word/src/main/resources/i18n/messages_en.properties
@@ -0,0 +1,6 @@
+#错误消息
+ERRCODE.WORD.CONFLIECT_ERROR_PRONE_WORD=Conflict error prone word “{0}”.
+ERRCODE.WORD.CONFLIECT_HOT_WORD_GROUP=Conflict hot word group code.
+ERRCODE.WORD.CONFLIECT_HOT_WORD=Conflict hot word "{0}".
+ERRCODE.WORD.CONFLIECT_SENSITIVE_WORD=Conflict sensitive word "{0}".
+ERRCODE.WORD.CONFLIECT_TAG_WORD=Conflict tag word "{0}".
diff --git a/chestnut-modules/chestnut-word/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-modules/chestnut-word/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 00000000..a0c7b0c6
--- /dev/null
+++ b/chestnut-modules/chestnut-word/src/main/resources/i18n/messages_zh_TW.properties
@@ -0,0 +1,6 @@
+#错误消息
+ERRCODE.WORD.CONFLIECT_ERROR_PRONE_WORD=易錯詞“{0}”已存在
+ERRCODE.WORD.CONFLIECT_HOT_WORD_GROUP=熱詞分組編碼衝突
+ERRCODE.WORD.CONFLIECT_HOT_WORD=熱詞“{0}”已存在
+ERRCODE.WORD.CONFLIECT_SENSITIVE_WORD=敏感詞“{0}”已存在
+ERRCODE.WORD.CONFLIECT_TAG_WORD=TAG詞“{0}”已存在
diff --git a/chestnut-modules/pom.xml b/chestnut-modules/pom.xml
index 38161dbf..cb33d41b 100644
--- a/chestnut-modules/pom.xml
+++ b/chestnut-modules/pom.xml
@@ -5,7 +5,7 @@
     <parent>
 		<groupId>com.chestnut</groupId>
 		<artifactId>chestnut</artifactId>
-		<version>1.4.1</version>
+		<version>1.4.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/chestnut-ui/package.json b/chestnut-ui/package.json
index eeb14180..8834d08c 100644
--- a/chestnut-ui/package.json
+++ b/chestnut-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ChestnutCMS",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "ChestnutCMS[栗子内容管理系统]",
   "author": "",
   "license": "Apache-2.0",
diff --git a/chestnut-ui/src/api/search/searchlog.js b/chestnut-ui/src/api/search/searchlog.js
index 2abedaa0..5756554a 100644
--- a/chestnut-ui/src/api/search/searchlog.js
+++ b/chestnut-ui/src/api/search/searchlog.js
@@ -8,6 +8,7 @@ export function getSearchLogs(params) {
     params: params
   })
 }
+
 // 删除搜索日志
 export function deleteSearchLogs(searchLogIds) {
   return request({
@@ -15,4 +16,12 @@ export function deleteSearchLogs(searchLogIds) {
     method: 'delete',
     data: searchLogIds
   })
+}
+
+export function getSiteSearchLogs(params) {
+  return request({
+    url: '/cms/search/log',
+    method: 'get',
+    params: params
+  })
 }
\ No newline at end of file
diff --git a/chestnut-ui/src/api/search/wordstat.js b/chestnut-ui/src/api/search/wordstat.js
new file mode 100644
index 00000000..e2fef915
--- /dev/null
+++ b/chestnut-ui/src/api/search/wordstat.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+export function getSearchWordList(params) {
+  return request({
+    url: '/search/word',
+    method: 'get',
+    params: params
+  })
+}
+
+export function addSearchWord(data) {
+  return request({
+    url: '/search/word',
+    method: 'post',
+    data: data
+  })
+}
+
+export function editSearchWord(data) {
+  return request({
+    url: '/search/word',
+    method: 'put',
+    data: data
+  })
+}
+
+export function deleteSearchWords(wordIds) {
+  return request({
+    url: '/search/word',
+    method: 'delete',
+    data: wordIds
+  })
+}
+
+export function setTop(data) {
+  return request({
+    url: '/search/word/set_top',
+    method: 'put',
+    data: data
+  })
+}
+
+export function cancelTop(data) {
+  return request({
+    url: '/search/word/cancel_top',
+    method: 'put',
+    data: data
+  })
+}
+
+export function getTrendDatas(params) {
+  return request({
+    url: '/search/word/trend',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSiteSearchWordList(params) {
+  return request({
+    url: '/cms/search/word',
+    method: 'get',
+    params: params
+  })
+}
+
+export function addSiteSearchWord(data) {
+  return request({
+    url: '/cms/search/word',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/chestnut-ui/src/api/seo/baidupush.js b/chestnut-ui/src/api/seo/baidupush.js
new file mode 100644
index 00000000..9b55745f
--- /dev/null
+++ b/chestnut-ui/src/api/seo/baidupush.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function pushToBaidu(contentIds) {
+  return request({
+    url: '/cms/seo/baidu_push',
+    method: 'post',
+    data: contentIds
+  })
+}
\ No newline at end of file
diff --git a/chestnut-ui/src/api/word/tagWord.js b/chestnut-ui/src/api/word/tagWord.js
index e004a10e..c0e6906c 100644
--- a/chestnut-ui/src/api/word/tagWord.js
+++ b/chestnut-ui/src/api/word/tagWord.js
@@ -7,6 +7,7 @@ export function getTagWordList(params) {
     params: params
   })
 }
+
 export function addTagWord(data) {
   return request({
     url: '/word/tagword',
@@ -15,6 +16,14 @@ export function addTagWord(data) {
   })
 }
 
+export function batchAddTagWords(data) {
+  return request({
+    url: '/word/tagword/batchAdd',
+    method: 'post',
+    data: data
+  })
+}
+
 export function editTagWord(data) {
   return request({
     url: '/word/tagword',
diff --git a/chestnut-ui/src/assets/styles/chestnut.scss b/chestnut-ui/src/assets/styles/chestnut.scss
index 9efa56dd..90e724f3 100644
--- a/chestnut-ui/src/assets/styles/chestnut.scss
+++ b/chestnut-ui/src/assets/styles/chestnut.scss
@@ -117,7 +117,7 @@
 /** 表格布局 **/
 .pagination-container {
 	position: relative;
-	height: 25px;
+	height: 30px;
 	margin-bottom: 10px;
 	margin-top: 15px;
 	padding: 10px 20px !important;
diff --git a/chestnut-ui/src/i18n/lang/en.js b/chestnut-ui/src/i18n/lang/en.js
index 74f98646..534cef08 100644
--- a/chestnut-ui/src/i18n/lang/en.js
+++ b/chestnut-ui/src/i18n/lang/en.js
@@ -32,6 +32,7 @@ export default {
     BeginTime: 'Begin Time',
     EndTime: 'End Time',
     Add: 'Add',
+    BatchAdd: 'Batch Add',
     Edit: 'Edit',
     Save: 'Save',
     Delete: 'Delete',
@@ -959,7 +960,9 @@ export default {
         CustomFormCardTitle: "Custom Form Configuration",
         EnableCustomFormCaptcha: "Enable Captcha On Submit",
         CommentCardTitle: " Comment Configuration",
-        EnableCommentAudit: "Enable Comment Audit"
+        EnableCommentAudit: "Enable Comment Audit",
+        SEO: "SEO Configuration",
+        BaiduPushAccessSecret: "Baidu Push API Secret"
       },
       Property: {
         QueryPlaceholder: "Input name/code",
@@ -1134,7 +1137,8 @@ export default {
       FavoriteCount: "Favorities",
       LikeCount: "Likes",
       CommentCount: "Comments",
-      RelaContent: "Related contents"
+      RelaContent: "Related contents",
+      PushToBaidu: "Push To Baidu"
     },
     Image: {
       Title: "Title",
@@ -1459,7 +1463,8 @@ export default {
       Placeholder: {
         InputGroupName: "Input group name...",
         SelectParentGroup: "Select parent group...",
-        InputTAG: "Input tag word..."
+        InputTAG: "Input tag word...",
+        BatchAdd: "Input tag words, one per line"
       }
     },
     HotWord: {
@@ -1678,13 +1683,31 @@ export default {
       WordAnalyzeResult: "Result"
     },
     Log: {
-      Word: "Word",
+      TabName: "Search Log",
+      Word: "Search Query",
       Location: "Location",
       Source: "Source",
       ClientType: "Client Type",
-      LogTime: "Time",
-      AddExtWord: "Add Ext Word",
-      AddStopWord: "Add Stop Word",
+      LogTime: "Time"
+    },
+    WordStat: {
+      TabName: "Query Statistics",
+      Word: "Search Query",
+      Total: "Total",
+      Topping: "Topping",
+      CancelTop: "Cancel Top",
+      TopEndTime: "Topping End Time",
+      Source: "Source",
+      Trend: "Trend",
+      AddExtWord: "Add Extend Dict",
+      AddStopWord: "Add Stop Dict",
+      ConfirmAddToDict: "Confirm add to dict?",
+      AddTitle: "Add Search Query",
+      EditTitle: "Edit Search Query",
+      TrendDialogTitle: "Trend Chart",
+      Placeholder: {
+        Word: "Input search query..."
+      }
     }
   },
   MessagePusher: {
diff --git a/chestnut-ui/src/i18n/lang/zh-CN.js b/chestnut-ui/src/i18n/lang/zh-CN.js
index ac1f227e..c6d4dd2b 100644
--- a/chestnut-ui/src/i18n/lang/zh-CN.js
+++ b/chestnut-ui/src/i18n/lang/zh-CN.js
@@ -32,6 +32,7 @@ export default {
     BeginTime: '开始时间',
     EndTime: '结束时间',
     Add: '新增',
+    BatchAdd: '批量新增',
     Edit: '修改',
     Save: '保存',
     Delete: '删除',
@@ -959,7 +960,9 @@ export default {
         CustomFormCardTitle: "自定义表单配置",
         EnableCustomFormCaptcha: "是否开启验证码",
         CommentCardTitle: " 评论配置",
-        EnableCommentAudit: "是否需要审核"
+        EnableCommentAudit: "是否需要审核",
+        SEO: "搜索引擎优化配置",
+        BaiduPushAccessSecret: "百度收录API秘钥"
       },
       Property: {
         QueryPlaceholder: "输入名称/编码查询",
@@ -1134,7 +1137,8 @@ export default {
       FavoriteCount: "收藏数",
       LikeCount: "点赞数",
       CommentCount: "评论数",
-      RelaContent: "相关内容"
+      RelaContent: "相关内容",
+      PushToBaidu: "推送到百度"
     },
     Image: {
       Title: "标题",
@@ -1459,7 +1463,8 @@ export default {
       Placeholder: {
         InputGroupName: "输入分组名称",
         SelectParentGroup: "选择上级分组",
-        InputTAG: "输入TAG词查询"
+        InputTAG: "输入TAG词查询",
+        BatchAdd: "输入多个TAG词，每行一个"
       }
     },
     HotWord: {
@@ -1678,13 +1683,34 @@ export default {
       WordAnalyzeResult: "测试结果"
     },
     Log: {
+      TabName: "搜索日志",
       Word: "搜索词",
       Location: "地域",
       Source: "来源",
       ClientType: "客户端",
       LogTime: "搜索时间",
+      Placeholder: {
+        Word: "输入搜索词查询"
+      }
+    },
+    WordStat: {
+      TabName: "搜索词",
+      Word: "搜索词",
+      Total: "累计检索次数",
+      Topping: "置顶",
+      CancelTop: "取消置顶",
+      TopEndTime: "置顶结束时间",
+      Source: "来源",
+      Trend: "趋势",
       AddExtWord: "添加到扩展词",
       AddStopWord: "添加到停用词",
+      ConfirmAddToDict: "确认添加到词库吗？",
+      AddTitle: "添加搜索词",
+      EditTitle: "编辑搜索词",
+      TrendDialogTitle: "搜索趋势",
+      Placeholder: {
+        Word: "输入搜索词查询"
+      }
     }
   },
   MessagePusher: {
diff --git a/chestnut-ui/src/i18n/lang/zh-TW.js b/chestnut-ui/src/i18n/lang/zh-TW.js
index 05f326b8..d0f1f26f 100644
--- a/chestnut-ui/src/i18n/lang/zh-TW.js
+++ b/chestnut-ui/src/i18n/lang/zh-TW.js
@@ -32,6 +32,7 @@ export default {
     BeginTime: '開始時間',
     EndTime: '結束時間',
     Add: '新增',
+    BatchAdd: '批量新增',
     Edit: '修改',
     Save: '保存',
     Delete: '刪除',
@@ -959,7 +960,9 @@ export default {
         CustomFormCardTitle: "自定義表單配置",
         EnableCustomFormCaptcha: "是否開啟驗證碼",
         CommentCardTitle: " 評論配置",
-        EnableCommentAudit: "是否需要審核"
+        EnableCommentAudit: "是否需要審核",
+        SEO: "搜索引擎優化配置",
+        BaiduPushAccessSecret: "百度收錄API秘鑰"
       },
       Property: {
         QueryPlaceholder: "輸入名稱/編碼查詢",
@@ -1134,7 +1137,8 @@ export default {
       FavoriteCount: "收藏數",
       LikeCount: "點贊數",
       CommentCount: "評論數",
-      RelaContent: "相關內容"
+      RelaContent: "相關內容",
+      PushToBaidu: "推送到百度"
     },
     Image: {
       Title: "標題",
@@ -1459,7 +1463,8 @@ export default {
       Placeholder: {
         InputGroupName: "輸入分組名稱",
         SelectParentGroup: "選擇上級分組",
-        InputTAG: "輸入TAG詞查詢"
+        InputTAG: "輸入TAG詞查詢",
+        BatchAdd: "輸入多個TAG词，每行一個"
       }
     },
     HotWord: {
@@ -1678,13 +1683,31 @@ export default {
       WordAnalyzeResult: "測試結果"
     },
     Log: {
+      TabName: "搜索日誌",
       Word: "搜索詞",
       Location: "地域",
       Source: "來源",
       ClientType: "客戶端",
       LogTime: "搜索時間",
+    },
+    WordStat: {
+      TabName: "搜索詞",
+      Word: "搜索詞",
+      Total: "累計檢索次數",
+      Topping: "置頂",
+      CancelTop: "取消置頂",
+      TopEndTime: "置頂結束時間",
+      Source: "來源",
+      Trend: "趨勢",
       AddExtWord: "添加到擴展詞",
       AddStopWord: "添加到停用詞",
+      ConfirmAddToDict: "確認添加到詞庫嗎？",
+      AddTitle: "添加搜索詞",
+      EditTitle: "編輯搜索詞",
+      TrendDialogTitle: "搜索趨勢",
+      Placeholder: {
+        Word: "輸入搜索詞查詢"
+      }
     }
   },
   MessagePusher: {
diff --git a/chestnut-ui/src/views/cms/components/ContentSelector/index.vue b/chestnut-ui/src/views/cms/components/ContentSelector/index.vue
new file mode 100644
index 00000000..70f2c366
--- /dev/null
+++ b/chestnut-ui/src/views/cms/components/ContentSelector/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <div :style="{'width':width}">
+    <el-input v-model="selectedContent.title" disabled>
+      <el-button 
+        slot="append"
+        type="primary"
+        @click="handleSelectContent()"
+      >{{ $t('Common.Select') }}</el-button>
+      <el-divider slot="append" direction="vertical"></el-divider>
+      <el-button 
+        slot="append"
+        type="primary"
+        @click="handleRemove()"
+      >{{ $t('Common.Clean') }}</el-button>
+    </el-input>
+    <!-- 内容选择组件 -->
+    <cms-content-selector
+      :open="openContentSelector"
+      @ok="handleContentSelectorOk"
+      @close="handleContentSelectorClose"></cms-content-selector>
+  </div>
+</template>
+<script>
+import CMSContentSelector from "@/views/cms/contentcore/contentSelector";
+
+export default {
+  name: "XModelContentSelector",
+  components: {
+    'cms-content-selector': CMSContentSelector,
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  props: {
+    value: {
+      type: String,
+      default: "",
+      required: true,
+    },
+    selected: {
+      type: [ String, Object ],
+      default: {},
+      required: true,
+    },
+    width: {
+      type: String,
+      default: "100%",
+      required: false,
+    }
+  },
+  watch: {  
+    selected(newVal) {  
+      if (typeof newVal === String) {
+        this.selectedContent = newVal == '' ? {} : JSON.parse(newVal)
+      }
+      this.selectedContent = newVal;  
+    },
+    selectedContent(newVal) {
+      this.$emit("change", this.selectedContent.contentId);
+    }
+  },
+  data () {
+    return {
+      selectedContent: {},
+      openContentSelector: false,
+    };
+  },
+  methods: {
+    handleSelectContent () {
+      this.openContentSelector = true;
+    },
+    handleContentSelectorClose() {
+      this.openContentSelector = false;
+    },
+    handleContentSelectorOk(contents) {
+      if (contents && contents.length > 0) {
+        this.selectedContent = { contentId: contents[0].contentId, title: contents[0].title };
+      }
+      this.openContentSelector = false;
+    },
+    handleRemove () {
+      this.selectedContent = {};
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/chestnut-ui/src/views/cms/components/EXModelEditor/index.vue b/chestnut-ui/src/views/cms/components/EXModelEditor/index.vue
index 55759e50..75c86e88 100644
--- a/chestnut-ui/src/views/cms/components/EXModelEditor/index.vue
+++ b/chestnut-ui/src/views/cms/components/EXModelEditor/index.vue
@@ -49,16 +49,26 @@
       </el-date-picker>
       <cms-logo-view v-if="field.controlType==='CMSImage'" 
         v-model="field.value" 
-        :src="field.valueSrc" 
+        :src="field.valueObj" 
         :width="210" 
         :height="150">
       </cms-logo-view>
-      <ueditor v-if="field.controlType==='UEditor'" :editorId="'ex-'+field.fieldName" :height="200" :configs="ueConfigs" v-model="field.value"></ueditor>
+      <ueditor v-if="field.controlType==='UEditor'" 
+        :editorId="'ex-'+field.fieldName" 
+        :height="200" 
+        :configs="ueConfigs" 
+        v-model="field.value">
+      </ueditor>
+      <cms-content-selector v-if="field.controlType==='CMSContentSelect'" 
+        v-model="field.value" 
+        :selected="field.valueObj">
+      </cms-content-selector>
     </el-form-item>
   </div>
 </template>
 <script>
 import CMSLogoView from '@/views/cms/components/LogoView';
+import CMSContentSelector from '@/views/cms/components/ContentSelector';
 import UEditor from '@/views/cms/components/UEditorPlus'
 import { getXModelFieldData } from "@/api/contentcore/exmodel";
 
@@ -66,6 +76,7 @@ export default {
   name: "CMSEXModelEditor",
   components: {
     "cms-logo-view": CMSLogoView,
+    "cms-content-selector": CMSContentSelector,
     'ueditor': UEditor,
   },
   props: {
@@ -141,13 +152,16 @@ export default {
       getXModelFieldData(this.modelId, this.dataType, this.dataId).then(response => {
         response.data.forEach(item => {
           let field = {};
-          Object.keys(item).forEach(key => field[key] = key === 'value' ? '' : item[key])
+          Object.keys(item).forEach(key => field[key] = (key === 'value' || key === 'valueObj') ? '' : item[key])
           this.fieldList.push(field);
         })
         this.$nextTick(() => {
           response.data.forEach(item => {
             let field = this.fieldList.find(f => item.fieldName == f.fieldName);
-            field && (field.value = item.value);
+            if (field) {
+              field.value = item.value
+              field.valueObj = item.valueObj
+            }
           })
         })
       });
diff --git a/chestnut-ui/src/views/cms/components/TagEditor/index.vue b/chestnut-ui/src/views/cms/components/TagEditor/index.vue
index 6d344188..15de857d 100644
--- a/chestnut-ui/src/views/cms/components/TagEditor/index.vue
+++ b/chestnut-ui/src/views/cms/components/TagEditor/index.vue
@@ -35,7 +35,7 @@
   </div>
 </template>
 <script>
-import TagSelector from '@/views/word/tagSelector';
+import TagSelector from '@/views/cms/word/tagSelector';
 
 export default {
   name: "CMSTagEditor",
diff --git a/chestnut-ui/src/views/cms/contentcore/contentEditor.vue b/chestnut-ui/src/views/cms/contentcore/contentEditor.vue
index 2b3fa6ed..0a5f26b8 100644
--- a/chestnut-ui/src/views/cms/contentcore/contentEditor.vue
+++ b/chestnut-ui/src/views/cms/contentcore/contentEditor.vue
@@ -10,6 +10,7 @@
           <el-button plain type="warning" v-if="isLock" size="mini" icon="el-icon-unlock" @click="handleChangeLockState">{{ $t('CMS.Content.Unlock') }}</el-button>
           <el-button plain type="primary" v-else size="mini" icon="el-icon-lock" @click="handleChangeLockState">{{ $t('CMS.Content.Lock') }}</el-button>
           <el-button plain type="primary" size="mini" icon="el-icon-share" @click="handleRelaContent">{{ $t('CMS.Content.RelaContent') }}</el-button>
+          <el-button plain type="primary" size="mini" icon="el-icon-files" @click="handlePushToBaidu">{{ $t('CMS.Content.PushToBaidu') }}</el-button>
           <el-button v-if="openEditorW" plain type="warning" size="mini" icon="el-icon-close" @click="handleClose">{{ $t('Common.Close') }}</el-button>
           <el-button v-else plain type="warning" size="mini" icon="el-icon-back" @click="handleGoBack">{{ $t('CMS.Content.BackToList') }}</el-button>
         </div>
@@ -237,6 +238,7 @@
 </template>
 <script>
 import { getInitContentEditorData, addContent, saveContent, toPublishContent, publishContent, lockContent, unLockContent, moveContent } from "@/api/contentcore/content";
+import { pushToBaidu } from "@/api/seo/baidupush";
 import Sticky from '@/components/Sticky'
 // import CKEditor5 from '@/components/CKEditor5';
 import UEditor from '@/views/cms/components/UEditorPlus'
@@ -642,6 +644,15 @@ export default {
     },
     handleRelaContentClose() {
       this.openRelaContentDialog = false;
+    },
+    handlePushToBaidu() {
+      pushToBaidu([ this.form.contentId ]).then(response => {
+        let msg = "[pc] 成功 1 条，剩余 9 条.<br/>【】 成功";
+        response.data.forEach(item => {
+          msg += "【" + item.publishPipeCode + "】成功 " + item.success + " 条，剩余 " + item.remain + " 条。<br/>"
+        })
+        this.$modal.alert(msg)
+      })
     }
   }
 };
diff --git a/chestnut-ui/src/views/cms/contentcore/resourceDialog.vue b/chestnut-ui/src/views/cms/contentcore/resourceDialog.vue
index 986b16f2..2f953437 100644
--- a/chestnut-ui/src/views/cms/contentcore/resourceDialog.vue
+++ b/chestnut-ui/src/views/cms/contentcore/resourceDialog.vue
@@ -174,7 +174,7 @@ export default {
       // 上传参数
       upload: {
         isUploading: false, // 上传按钮loading
-        accept: ".jpg,.png,.mp3,.mp4,.flv,.pdf", // 文件类型限制
+        // accept: ".jpg,.png,.mp3,.mp4,.flv,.pdf", // 文件类型限制
         acceptSize: 20 * 1024 * 1024,
         limit: this.uploadLimit, // 文件数限制
         headers: { Authorization: "Bearer " + getToken(), CurrentSite: this.$cache.local.get("CurrentSite") },
diff --git a/chestnut-ui/src/views/cms/contentcore/siteDefaultTemplate.vue b/chestnut-ui/src/views/cms/contentcore/siteDefaultTemplate.vue
index 732f6ce2..cd5fdf1e 100644
--- a/chestnut-ui/src/views/cms/contentcore/siteDefaultTemplate.vue
+++ b/chestnut-ui/src/views/cms/contentcore/siteDefaultTemplate.vue
@@ -81,93 +81,15 @@
             </el-form-item>
             <el-divider content-position="left">{{ $t('CMS.Site.DefaultTemplate.DynamicPageConfig') }}</el-divider>
             <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.SearchResult')"
-              prop="searchTemplate">
-              <el-input v-model="pp.props.searchTemplate">
+              v-for="dpt in dynamicPageTypes"
+              :key="dpt.type"
+              :label="dpt.name"
+              :prop="dpt.publishPipeKey">
+              <el-input v-model="pp.props[dpt.publishPipeKey]">
                 <el-button 
                   slot="append"
                   type="primary"
-                  @click="handleSelectTemplate('searchTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.AccountCentre')"
-              prop="accountCentreTemplate">
-              <el-input v-model="pp.props.accountCentreTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('accountCentreTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.MemberLogin')"
-              prop="memberLoginTemplate">
-              <el-input v-model="pp.props.memberLoginTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('memberLoginTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.MemberRegister')"
-              prop="memberRegisterTemplate">
-              <el-input v-model="pp.props.memberRegisterTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('memberRegisterTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.MemberForgetPwd')"
-              prop="memberForgetPasswordTemplate">
-              <el-input v-model="pp.props.memberForgetPasswordTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('memberForgetPasswordTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.MemberSetting')"
-              prop="memberSettingTemplate">
-              <el-input v-model="pp.props.memberSettingTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('memberSettingTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.MemberBindEmail')"
-              prop="memberBindEmailTemplate">
-              <el-input v-model="pp.props.memberBindEmailTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('memberBindEmailTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.MemberResetPwd')"
-              prop="memberPasswordTemplate">
-              <el-input v-model="pp.props.memberPasswordTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('memberPasswordTemplate')">{{ $t("Common.Select") }}</el-button>
-              </el-input>
-            </el-form-item>
-            <el-form-item 
-              :label="$t('CMS.Site.DefaultTemplate.MemberContribute')"
-              prop="memberContributeTemplate">
-              <el-input v-model="pp.props.memberContributeTemplate">
-                <el-button 
-                  slot="append"
-                  type="primary"
-                  @click="handleSelectTemplate('memberContributeTemplate')">{{ $t("Common.Select") }}</el-button>
+                  @click="handleSelectTemplate(dpt.publishPipeKey)">{{ $t("Common.Select") }}</el-button>
               </el-input>
             </el-form-item>
           </el-tab-pane>
@@ -189,7 +111,7 @@
   </div>
 </template>
 <script>
-import { getDefaultTemplates, saveDefaultTemplates, applyDefaultTemplate } from "@/api/contentcore/site";
+import { getDefaultTemplates, saveDefaultTemplates, applyDefaultTemplate, getDynamicPageTypes } from "@/api/contentcore/site";
 import { getContentTypes } from "@/api/contentcore/catalog";
 import CMSTemplateSelector from '@/views/cms/contentcore/templateSelector';
 import CMSCatalogSelector from "@/views/cms/contentcore/catalogSelector";
@@ -222,6 +144,7 @@ export default {
       loading: false,
       siteId: this.site,
       contentTypes: [],
+      dynamicPageTypes: [],
       openCatalogSelector: false,
       publishPipeActiveName: "",
       openTemplateSelector: false,
@@ -232,6 +155,7 @@ export default {
   },
   created() {
     this.loadContentTypes();
+    this.loadDynamicPageTypes();
     this.loadDefaultTemplates();
   },
   methods: {
@@ -240,6 +164,11 @@ export default {
         this.contentTypes = response.data;
       });
     },
+    loadDynamicPageTypes() {
+      getDynamicPageTypes().then(response => {
+        this.dynamicPageTypes = response.data;
+      });
+    },
     loadDefaultTemplates () {
       this.loading = true;
       const params = { siteId: this.siteId };
diff --git a/chestnut-ui/src/views/cms/contentcore/siteExtend.vue b/chestnut-ui/src/views/cms/contentcore/siteExtend.vue
index 15c0f577..efe19150 100644
--- a/chestnut-ui/src/views/cms/contentcore/siteExtend.vue
+++ b/chestnut-ui/src/views/cms/contentcore/siteExtend.vue
@@ -253,6 +253,16 @@
           </el-checkbox-group>
         </el-form-item>
       </el-card>
+      <el-card shadow="hover">
+        <div slot="header" class="clearfix">
+          <span>{{ $t('CMS.Site.Extend.SEO') }}</span>
+        </div>
+        <el-form-item 
+          :label="$t('CMS.Site.Extend.BaiduPushAccessSecret')"
+          prop="BaiduPushAccessSecret">
+          <el-input v-model="form_extend.BaiduPushAccessSecret"></el-input>
+        </el-form-item>
+      </el-card>
       <el-card shadow="hover">
         <div slot="header" class="clearfix">
           <span>{{ $t('CMS.Site.Extend.StatConfCardTitle') }}</span>
diff --git a/chestnut-ui/src/views/cms/link/link.vue b/chestnut-ui/src/views/cms/link/link.vue
index 97944098..9f323e5d 100644
--- a/chestnut-ui/src/views/cms/link/link.vue
+++ b/chestnut-ui/src/views/cms/link/link.vue
@@ -266,7 +266,7 @@ export default {
     },
     handleDelete (row) {
       const rows = row.linkId ? [{ linkId: row.linkId }] : this.selectedRows
-      this.$modal.confirm('是否确认删除选中的友链?').then(function() {
+      this.$modal.confirm(this.$t('Common.ConfirmDelete')).then(function() {
         return deleteLink(rows);
       }).then((response) => {
         this.$modal.msgSuccess(response.msg);
diff --git a/chestnut-ui/src/views/cms/word/tagSelector.vue b/chestnut-ui/src/views/cms/word/tagSelector.vue
index ba49c76e..065cac4a 100644
--- a/chestnut-ui/src/views/cms/word/tagSelector.vue
+++ b/chestnut-ui/src/views/cms/word/tagSelector.vue
@@ -131,14 +131,16 @@ export default {
   }
 };
 </script>
-<style>
+<style rel="stylesheet/scss" lang="scss">
 .tag-selector-dialog .el-dialog__body {
   padding-top: 10px;
   padding-bottom: 10px;
 }
-</style>
-<style scoped>
-.el-tag {
+.tag-selector-dialog .el-divider {
+  margin: 15px 0;
+}
+.tag-selector-dialog .el-tag {
+  margin-bottom: 5px;
   margin-right: 5px;
 }
 </style>
\ No newline at end of file
diff --git a/chestnut-ui/src/views/cms/word/tagWord.vue b/chestnut-ui/src/views/cms/word/tagWord.vue
index fa419a69..c0d33970 100644
--- a/chestnut-ui/src/views/cms/word/tagWord.vue
+++ b/chestnut-ui/src/views/cms/word/tagWord.vue
@@ -18,6 +18,13 @@
               plain
               :disabled="selectedGroupId==''"
               @click="handleAdd">{{ $t("Common.Add") }}</el-button>
+            <el-button 
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              plain
+              :disabled="selectedGroupId==''"
+              @click="handleBatchAdd">{{ $t("Common.BatchAdd") }}</el-button>
             <el-button 
               type="danger"
               icon="el-icon-delete"
@@ -118,6 +125,28 @@
         <el-button @click="closeDialog(false)">{{ $t("Common.Cancel") }}</el-button>
       </div>
     </el-dialog>
+    <!-- 批量添加TAG词弹窗 -->
+    <el-dialog :title="$t('Common.BatchAdd')"
+               :visible.sync="batchAddOpen"
+               :close-on-click-modal="false"
+               width="500px"
+               append-to-body>
+      <el-form ref="formBatch"
+               :model="formBatch"
+               :rules="rulesBatch"
+               label-width="80px">
+        <el-form-item 
+          :label="$t('WordMgr.TAG.TAGWord')"
+          prop="words">
+          <el-input type="textarea" :rows="5" v-model="formBatch.words" :placeholder="$t('WordMgr.TAG.Placeholder.BatchAdd')" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button type="primary" @click="submitBatchAddForm">{{ $t("Common.Confirm") }}</el-button>
+        <el-button @click="handleBatchAddClose(false)">{{ $t("Common.Cancel") }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <style scoped>
@@ -126,7 +155,7 @@
 }
 </style>
 <script>
-import { getTagWordList, addTagWord, editTagWord, deleteTagWord } from "@/api/word/tagWord";
+import { getTagWordList, addTagWord, batchAddTagWords, editTagWord, deleteTagWord } from "@/api/word/tagWord";
 import CMSTagWordGroupTree from '@/views/cms/word/tagWordGroupTree';
 import CMSLogoView from '@/views/cms/components/LogoView';
 
@@ -149,6 +178,13 @@ export default {
         pageSize: 20,
         pageNo: 1
       },
+      batchAddOpen: false,
+      formBatch: {},
+      rulesBatch: {
+        words: [
+          { required: true, message: this.$t("Common.RuleTips.NotEmpty"), trigger: "blur" }
+        ],
+      },
       diagTitle: "",
       open: false,
       form: {},
@@ -203,6 +239,27 @@ export default {
       this.reset();
       loadList && this.loadWordList();
     },
+    handleBatchAdd () {
+      this.formBatch = {}
+      this.batchAddOpen = true;
+    },
+    handleBatchAddClose(loadList) {
+      this.batchAddOpen = false;
+      this.formBatch = {}
+      loadList && this.loadWordList()
+    },
+    submitBatchAddForm () {
+      this.$refs["formBatch"].validate(valid => {
+        if (valid) {
+          batchAddTagWords({ groupId: this.selectedGroupId, words: this.formBatch.words.split("\n") }).then(response => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess(response.msg);
+              this.handleBatchAddClose(true)
+            }
+          }); 
+        }
+      });
+    },
     handleAdd () {
       this.reset();
       this.diagTitle = this.$t("WordMgr.TAG.AddTAGTitle");
diff --git a/chestnut-ui/src/views/cms/word/tagWordGroupTree.vue b/chestnut-ui/src/views/cms/word/tagWordGroupTree.vue
index 24bdca11..55a0a630 100644
--- a/chestnut-ui/src/views/cms/word/tagWordGroupTree.vue
+++ b/chestnut-ui/src/views/cms/word/tagWordGroupTree.vue
@@ -90,7 +90,7 @@ export default {
     showAdd: {
       type: Boolean,
       default: true,
-      required: true
+      required: false
     }
   },
   computed: {
diff --git a/chestnut-ui/src/views/search/searchLog.vue b/chestnut-ui/src/views/search/searchLog.vue
index 26f2e2eb..6f2bdbc5 100644
--- a/chestnut-ui/src/views/search/searchLog.vue
+++ b/chestnut-ui/src/views/search/searchLog.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <div>
     <el-row :gutter="24" class="mb12">
-      <el-col :span="12">
+      <el-col :span="1.5">
         <el-button type="danger"
                     icon="el-icon-delete"
                     size="mini"
@@ -9,83 +9,68 @@
                     :disabled="selectedIds.length==0"
                     @click="handleDelete">{{ $t("Common.Delete") }}</el-button>
       </el-col>
-      <el-col :span="12" style="text-align:right">
-        <el-form 
-          :model="queryParams"
-          ref="queryForm"
-          :inline="true"
-          size="mini"
-          class="el-form-search">
-          <el-form-item prop="query">
-            <el-input v-model="queryParams.query">
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button 
-                type="primary"
-                icon="el-icon-search"
-                @click="handleQuery">{{ $t("Common.Search") }}</el-button>
-              <el-button 
-                icon="el-icon-refresh"
-                @click="resetQuery">{{ $t("Common.Reset") }}</el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-form>
-      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="loadLogList"></right-toolbar>
     </el-row>
-    <el-row>
-      <el-table v-loading="loading"
-                :data="logList"
-                @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="50" align="center" />
-        <el-table-column type="index" :label="$t('Common.RowNo')" align="center" width="100" />
-        <el-table-column :label="$t('Search.Log.Word')" align="left" prop="word" show-overflow-tooltip />
-        <el-table-column :label="$t('Search.Log.ClientType')" align="left" width="140" prop="clientType" />
-        <el-table-column :label="$t('Search.Log.Location')" align="left" width="140" prop="location" show-overflow-tooltip />
-        <el-table-column label="IP" align="left" width="100" prop="ip" />
-        <el-table-column label="Referer" align="left" prop="referer" show-overflow-tooltip />
-        <el-table-column :label="$t('Search.Log.Source')" align="left" prop="source" width="200" show-overflow-tooltip />
-        <el-table-column :label="$t('Search.Log.LogTime')" align="center" width="160">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.logTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Common.Operation')" align="center" width="220" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button 
-              size="small"
-              type="text"
-              icon="el-icon-plus"
-              @click="handleToDictWord('WORD', scope.row)">{{ $t('Search.Log.AddExtWord') }}</el-button>
-            <el-button 
-              size="small"
-              type="text"
-              icon="el-icon-plus"
-              @click="handleToDictWord('STOP', scope.row)">{{ $t('Search.Log.AddStopWord') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="loadLogList"
-      />
+    <el-row v-show="showSearch">
+      <el-form :model="queryParams" ref="queryForm" size="mini" class="el-form-search mb12" :inline="true">
+        <el-form-item prop="query">
+          <el-input
+            v-model="queryParams.query"
+            :placeholder="$t('Search.WordStat.Placeholder.Word')"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('Common.Search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('Common.Reset') }}</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
     </el-row>
+
+    <el-table 
+      v-loading="loading"
+      :data="logList"
+      :height="tableHeight"
+      :max-height="tableMaxHeight"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column :label="$t('Search.Log.Word')" align="left" prop="word" show-overflow-tooltip />
+      <el-table-column :label="$t('Search.Log.ClientType')" align="left" width="140" prop="clientType" />
+      <el-table-column :label="$t('Search.Log.Location')" align="left" width="140" prop="location" show-overflow-tooltip />
+      <el-table-column label="IP" align="left" width="130" prop="ip" />
+      <el-table-column label="Referer" align="left" prop="referer" show-overflow-tooltip />
+      <el-table-column :label="$t('Search.Log.Source')" align="left" prop="source" width="200" show-overflow-tooltip />
+      <el-table-column :label="$t('Search.Log.LogTime')" align="center" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.logTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="loadLogList"
+    />
   </div>
 </template>
 <style scoped>
 </style>
 <script>
-import { getSearchLogs, deleteSearchLogs } from "@/api/search/searchlog";
-import { addDictWord } from "@/api/search/dictword";
+import { getSiteSearchLogs, deleteSearchLogs } from "@/api/search/searchlog";
 export default {
   name: "SearchWord",
   data () {
     return {
       loading: false,
+      showSearch: true,
+      tableHeight: 600,
+      tableMaxHeight: 600,
       selectedIds: [],
       logList: [],
       total: 0,
@@ -97,12 +82,18 @@ export default {
     };
   },
   created () {
+    this.changeTableHeight();
     this.loadLogList();
   },
   methods: {
+    changeTableHeight () {
+      let height = document.body.offsetHeight // 网页可视区域高度
+      this.tableHeight = height - 330;
+      this.tableMaxHeight = this.tableHeight;
+    },
     loadLogList () {
       this.loading = true;
-      getSearchLogs(this.queryParams).then(response => {
+      getSiteSearchLogs(this.queryParams).then(response => {
         this.logList = response.data.rows;
         this.total = parseInt(response.data.total);
         this.loading = false;
@@ -130,12 +121,6 @@ export default {
         this.$modal.msgSuccess(response.msg);
         this.resetQuery ();
       }).catch(() => {});
-    },
-    handleToDictWord (wordType, row) {
-      const form = { wordType: wordType, words: [ row.word ] }
-      addDictWord(form).then(response => {
-        this.$modal.msgSuccess(response.msg);
-      });
     }
   }
 };
diff --git a/chestnut-ui/src/views/search/wordStat.vue b/chestnut-ui/src/views/search/wordStat.vue
new file mode 100644
index 00000000..2c7c995d
--- /dev/null
+++ b/chestnut-ui/src/views/search/wordStat.vue
@@ -0,0 +1,389 @@
+<template>
+  <div class="">
+    <el-row :gutter="10" class="mb12">
+      <el-col :span="1.5">
+        <el-button 
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          plain
+          @click="handleAdd">{{ $t("Common.Add") }}</el-button>
+      </el-col>
+          <el-col :span="1.5">
+            <el-button 
+              plain
+              type="success"
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleEdit">{{ $t("Common.Edit") }}</el-button>
+          </el-col>
+      <el-col :span="1.5">
+        <el-button 
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          plain
+          :disabled="multiple"
+          @click="handleDelete">{{ $t("Common.Delete") }}</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="loadWordStatList"></right-toolbar>
+    </el-row>
+    <el-row v-show="showSearch">
+      <el-form :model="queryParams" ref="queryForm" size="mini" class="el-form-search mb12" :inline="true">
+        <el-form-item prop="query">
+          <el-input
+            v-model="queryParams.query"
+            :placeholder="$t('Search.WordStat.Placeholder.Word')"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('Common.Search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('Common.Reset') }}</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-table ref="tableWordList" :height="tableHeight" :max-height="tableMaxHeight" v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="$t('Search.WordStat.Word')" align="left" prop="word" />
+      <el-table-column :label="$t('Search.WordStat.Total')" align="center" prop="searchTotal" width="200" />
+      <el-table-column :label="$t('Search.WordStat.Topping')" align="center" width="100">
+          <template slot-scope="scope">
+            <svg-icon icon-class="top" style="color: #11A983;" v-if="scope.row.topFlag > 0" />
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('Search.WordStat.TopEndTime')" align="center" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.topDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('Common.Operation')" align="right" width="360" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="small" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">{{ $t('Common.Edit') }}</el-button>
+          <el-button size="small" type="text" icon="el-icon-top" @click="handleSetTop(scope.row)" v-if="scope.row.topFlag==0">{{ $t('Search.WordStat.Topping') }}</el-button>
+          <el-button size="small" type="text" icon="el-icon-bottom" @click="handleCancelTop(scope.row)" v-if="scope.row.topFlag>0">{{ $t('Search.WordStat.CancelTop') }}</el-button>
+          <el-button size="small" type="text" icon="el-icon-s-data" @click="handleCharts(scope.row)">{{ $t('Search.WordStat.Trend') }}</el-button>
+          <span class="btn-cell-wrap">
+            <el-dropdown size="small" @command="(command) => handleCommand(command, scope.row)">
+              <el-button size="small" type="text" icon="el-icon-more"></el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="handleAddExtWord" icon="el-icon-plus"
+                  v-hasPermi="['system:user:resetPwd']">{{ $t('Search.WordStat.AddExtWord') }}</el-dropdown-item>
+                <el-dropdown-item command="handleAddStopWord" icon="el-icon-plus"
+                  v-hasPermi="['system:user:edit']">{{ $t('Search.WordStat.AddStopWord') }}</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination 
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="loadWordStatList" />
+
+    <!-- 搜索词表单弹窗 -->
+    <el-dialog 
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="500px"
+      append-to-body>
+      <el-form ref="form" :model="form" label-width="100px">
+        <el-form-item :label="$t('Search.WordStat.Word')" prop="word">
+          <el-input v-model="form.word" />
+        </el-form-item>
+        <el-form-item :label="$t('Search.WordStat.Total')" prop="searchTotal">
+          <el-input-number v-model="form.searchTotal" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button type="primary" @click="submitForm">{{ $t("Common.Confirm") }}</el-button>
+        <el-button @click="cancel">{{ $t("Common.Cancel") }}</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 置顶时间设置弹窗 -->  
+    <el-dialog 
+      :title="$t('Search.WordStat.Topping')"
+      width="400px"
+      :visible.sync="topDialogVisible"
+      :close-on-click-modal="false"
+      append-to-body>
+      <el-form ref="top_form" label-width="100px" :model="topForm">
+        <el-form-item :label="$t('Search.WordStat.TopEndTime')" prop="topEndTime">
+          <el-date-picker 
+            v-model="topForm.topEndTime" 
+            :picker-options="topEndTimePickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetime">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleTopDialogOk">{{ $t("Common.Confirm") }}</el-button>
+        <el-button @click="this.topDialogVisible=false">{{ $t("Common.Cancel") }}</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 搜索趋势图表 -->
+    <el-dialog 
+      :title="$t('Search.WordStat.TrendDialogTitle')"
+      :visible.sync="openTrend"
+      :close-on-click-modal="false"
+      width="1000px"
+      append-to-body>
+      <el-row :gutter="10" class="mb12">
+        <el-col :span="1.5">
+          <el-date-picker
+            v-model="chartDateRange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            size="small"
+            range-separator="-"
+            :clearable="false"
+            :start-placeholder="$t('Common.BeginDate')"
+            :end-placeholder="$t('Common.EndDate')"
+            style="width:335px"
+          ></el-date-picker>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button 
+            type="primary"
+            icon="el-icon-search"
+            size="small"
+            @click="loadLineChartDatas">{{ $t("Common.Search") }}</el-button>
+        </el-col>
+      </el-row>
+      <line-chart :chart-data="lineChartData" />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleChartsClose">{{ $t("Common.Close") }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<style scoped>
+</style>
+<script>
+import { getSiteSearchWordList, addSiteSearchWord, editSearchWord, deleteSearchWords, setTop, cancelTop, getTrendDatas } from "@/api/search/wordstat";
+import { addDictWord } from "@/api/search/dictword";
+import LineChart from '@/views/dashboard/LineChart'
+
+export default {
+  name: "SearchWordStat",
+  components: {
+    LineChart
+  },
+  data () {
+    return {
+      loading: false,
+      showSearch: true,
+      tableHeight: 600,
+      tableMaxHeight: 600,
+      total: 0,
+      dataList: [],
+      selectedRows: [],
+      single: true,
+      multiple: true,
+      title: "",
+      open: false,
+      form: {},
+      topDialogVisible: false,
+      openTrend: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50,
+        beginTime: undefined,
+        endTime: undefined
+      },
+      topForm: {
+        topEndTime: undefined
+      },
+      topEndTimePickerOptions: {
+        disabledDate(time) {
+            return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 
+         }
+      },
+      dateRange: [],
+      chartDateRange: [],
+      chartWordId: undefined,
+      lineChartData: {
+        xAxisDatas:[],
+        datas: []
+      }
+    };
+  },
+  created() {
+    this.changeTableHeight();
+    this.loadWordStatList();
+  },
+  methods: {
+    changeTableHeight () {
+      let height = document.body.offsetHeight // 网页可视区域高度
+      this.tableHeight = height - 330;
+      this.tableMaxHeight = this.tableHeight;
+    },
+    loadWordStatList () {
+      this.loading = true;
+      this.queryParams.beginTime = this.dateRange[0];
+      this.queryParams.endTime = this.dateRange[1];
+      getSiteSearchWordList(this.queryParams).then(response => {
+        this.dataList = response.data.rows;
+        this.total = parseInt(response.data.total);
+        this.loading = false;
+      });
+    },
+    handleQuery () {
+      this.queryParams.pageNum = 1;
+      this.loadWordStatList();
+    },
+    resetQuery () {
+      this.queryParams.pageNum = 1;
+      this.dateRange = []
+      this.handleQuery();
+    },
+    handleCharts (row) {
+      var endDate = this.parseTime(new Date());
+      var startDate = this.parseTime(new Date(new Date().getTime() - 3600 * 24 * 7 * 1000));
+      this.chartDateRange = [ startDate, endDate ];
+      this.chartWordId = row.wordId;
+      this.openTrend = true;
+      this.loadLineChartDatas();
+    },
+    loadLineChartDatas() {
+      const params = { wordId: this.chartWordId, beginTime: this.chartDateRange[0], endTime: this.chartDateRange[1] }
+      getTrendDatas(params).then(response => {
+          this.lineChartData.xAxisDatas = response.data.xAxisDatas;
+          this.lineChartData.datas = response.data.lineDatas;
+        }
+      );
+    },
+    handleChartsClose () {
+      this.openTrend = false;
+      this.resetQuery();
+    },
+    handleSelectionChange (selection) {
+      this.selectedRows = selection.map(item => item);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    handleAdd () {
+      this.reset();
+      this.title = this.$t('Search.WordStat.AddTitle');
+      this.open = true;
+    },
+    handleEdit (row) {
+      const data = row.wordId ? row : this.selectedRows[0];
+      this.reset();
+      this.title = this.$t('Search.WordStat.EditTitle');
+      this.form = data;
+      this.open = true;
+    },
+    /** 提交按钮 */
+    submitForm () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.wordId) {
+            editSearchWord(this.form).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.open = false;
+              this.loadWordStatList();
+            }); 
+          } else {
+            addSiteSearchWord(this.form).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.open = false;
+              this.loadWordStatList();
+            }); 
+          }
+        }
+      });
+    },
+    reset () {
+      this.form = {};
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    handleDelete (row) {
+      const wordIds = row.wordId ? [ row.wordId ] : this.selectedRows.map(item => item.wordId)
+      this.$modal.confirm(this.$t('Common.ConfirmDelete')).then(function() {
+        return deleteSearchWords(wordIds);
+      }).then((response) => {
+        this.$modal.msgSuccess(response.msg);
+        this.loadWordStatList();
+      }).catch(() => {});
+    },
+    toggleAllCheckedRows() {
+      this.selectedRows.forEach(row => {
+          this.$refs.tableWordList.toggleRowSelection(row, false);
+      });
+      this.selectedRows = [];
+    },
+    handleSetTop(row) {
+      if (row.wordId) {
+        this.toggleAllCheckedRows();
+        this.selectedRows.push(row);
+      }
+      this.topDialogVisible = true;
+    },
+    handleTopDialogOk() {
+      const wordIds = this.selectedRows.map(item => item.wordId);
+      if (wordIds.length == 0) {
+        this.$modal.msgWarning(this.$t('Common.SelectFirst'));
+        return;
+      }
+      this.$refs["top_form"].validate(valid => {
+        if (valid) {
+          setTop({ wordIds: wordIds, topEndTime: this.topForm.topEndTime }).then(response => {
+            this.$modal.msgSuccess(this.$t('Common.OpSuccess'));
+            this.topDialogVisible = false;
+            this.topForm.topEndTime = undefined;
+            this.loadWordStatList();
+          });
+        }
+      });
+    },
+    handleCancelTop (row) {
+      const wordIds = row.wordId ? [ row.wordId ] : this.selectedRows.map(item => item.wordId)
+      cancelTop(wordIds).then(response => {
+        this.$modal.msgSuccess(this.$t('Common.OpSuccess'));
+        this.loadWordStatList();
+      })
+    },
+    handleCommand(command, row) {
+      if (command === "handleAddExtWord") {
+        this.handleAddExtWord(row);
+      } else if (command === "handleAddStopWord") {
+          this.handleAddStopWord(row);
+      }
+    },
+    handleAddExtWord (row) {
+      const form = { wordType: "WORD", words: [ row.word ] }
+      this.$modal.confirm(this.$t('Search.WordStat.ConfirmAddToDict')).then(function() {
+        return addDictWord(form);
+      }).then((response) => {
+        this.$modal.msgSuccess(response.msg);
+      }).catch(() => {});
+    },
+    handleAddStopWord (row) {
+      const form = { wordType: "STOP", words: [ row.word ] }
+      this.$modal.confirm(this.$t('Search.WordStat.ConfirmAddToDict')).then(function() {
+        return addDictWord(form);
+      }).then((response) => {
+        this.$modal.msgSuccess(response.msg);
+      }).catch(() => {});
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/chestnut-ui/src/views/search/wordTab.vue b/chestnut-ui/src/views/search/wordTab.vue
new file mode 100644
index 00000000..a9ee3bcb
--- /dev/null
+++ b/chestnut-ui/src/views/search/wordTab.vue
@@ -0,0 +1,37 @@
+<template>
+  <div class="app-container">
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane :label="$t('Search.WordStat.TabName')" name="wordStat">
+        <word-stat v-if="this.activeName=='wordStat'"></word-stat>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('Search.Log.TabName')" name="searchLog">
+        <search-log v-if="this.activeName=='searchLog'"></search-log>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<style scoped>
+</style>
+<script>
+import WordStat from '@/views/search/wordStat';
+import SearchLog from '@/views/search/searchLog';
+
+export default {
+  name: "SearchWordTab",
+  components: {
+    'word-stat': WordStat,
+    'search-log': SearchLog
+  },
+  data () {
+    return {
+      // 遮罩层
+      loading: false,
+      activeName: 'wordStat',
+    };
+  },
+  methods: {
+    handleTabClick (tab, event) {
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/chestnut-ui/src/views/word/tagSelector.vue b/chestnut-ui/src/views/word/tagSelector.vue
index 290522f0..f018d34b 100644
--- a/chestnut-ui/src/views/word/tagSelector.vue
+++ b/chestnut-ui/src/views/word/tagSelector.vue
@@ -131,14 +131,16 @@ export default {
   }
 };
 </script>
-<style>
+<style rel="stylesheet/scss" lang="scss">
 .tag-selector-dialog .el-dialog__body {
   padding-top: 10px;
   padding-bottom: 10px;
 }
-</style>
-<style scoped>
-.el-tag {
+.tag-selector-dialog .el-divider {
+  margin: 15px 0;
+}
+.tag-selector-dialog .el-tag {
+  margin-bottom: 5px;
   margin-right: 5px;
 }
 </style>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3b211fee..9815af3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 
 	<groupId>com.chestnut</groupId>
 	<artifactId>chestnut</artifactId>
-	<version>1.4.1</version>
+	<version>1.4.2</version>
 	<packaging>pom</packaging>
 
 	<name>ChestnutCMS</name>
 	<description>栗子内容管理系统</description>
 
 	<properties>
-		<chestnut.version>1.4.1</chestnut.version>
+		<chestnut.version>1.4.2</chestnut.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
@@ -524,6 +524,7 @@
 				<artifactId>chestnut-cms-dynamic</artifactId>
 				<version>${chestnut.version}</version>
 			</dependency>
+
 			<!-- CMS Modules End -->
 		</dependencies>
 	</dependencyManagement>