fix(ci): 构建容器名唯一化 + npm 走国内镜像源（避免并发互踩 exit 137）

- 删自写 svcitem/config/OpenApiAuthEnforceConfiguration（yh-app-auth starter 版
  RequireAppSignFilter 承接，order+11 行为等价；/oapi/site/list 面无签名即 401）
- yh.app-auth.server.enforce-patterns=[/oapi/*] + trust-registry=true（中央密钥链组合：
  trusted-apps 100018 先、Redis sign:app:* 链后，Notice/flow-center 同款）
- data-redis 自 test scope 提升编译期（yh-app-auth 侧 optional 不传递，生产 classpath
  此前并无该依赖）；management.health.redis.enabled=false 防 Redis 抖动拉 DOWN 健康
- 测试 yml 同步 enforce-patterns：删自写副本后 SiteOapiIT 的 /oapi/** 401 断言由
  starter 过滤器承接；trust-registry 不进测试配置（IT 密封性，签名用例 100018 走
  trusted-apps 命中）

门禁：mvn test -Dskip.tests=false 413/413 绿（含 SiteOapiIT 6/6，本机 MySQL8+Redis）

.gitea/workflows/build.yml

@@ -25,7 +25,10 @@ jobs:
       options: --network infra-infra-net
     steps:
       - name: 安装 git / curl（alpine）
-        run: apk add --no-cache git curl
+        run: |
+          # 统一走 aliyun 源：dl-cdn 时段性被拦会卡满 60s×2（2026-10-20 事故）
+          sed -i 's#dl-cdn.alpinelinux.org#mirrors.aliyun.com#g' /etc/apk/repositories
+          apk add --no-cache git curl
 
       # 内网 Gitea 无法访问 GitHub 拉 actions/checkout，手动 clone 本仓库
       - name: 拉取源码（内网无 GitHub，手动 clone 本仓库）
@@ -55,18 +58,24 @@ jobs:
       - name: 构建 jar（maven 容器，复用宿主 m2 缓存）
         run: |
           set -e
-          docker rm -f mavenbuild 2>/dev/null || true
-          docker run -d --name mavenbuild \
+          # 构建容器名必须全局唯一：runner 挂的是宿主 docker.sock，容器名在整个 daemon 上共享
+          # 命名空间。固定名会在多仓/多条 workflow 并发时互相 docker rm -f 掉对方正在构建的
+          # 容器，表现为无编译报错的 exit 137（SIGKILL，2026-10-21 实测复现）。
+          # GITHUB_RUN_ID 实例级唯一，再拼时间戳兜底。
+          BUILD_CONTAINER="mavenbuild-${GITHUB_RUN_ID:-0}-$(date +%s)"
+          echo "BUILD_CONTAINER=${BUILD_CONTAINER}"
+          docker rm -f "$BUILD_CONTAINER" 2>/dev/null || true
+          docker run -d --name "$BUILD_CONTAINER" \
             --network infra-infra-net \
             -v /opt/docker/projman-m2:/root/.m2 \
             -w /build maven:3.6.3-jdk-8 sleep 3600
-          docker cp "${PWD}/." mavenbuild:/build/
-          docker exec mavenbuild sh -c "printf '%s' '<settings><profiles><profile><id>nexus-repo</id><repositories><repository><id>nexus-internal</id><url>http://nexus:8081/repository/maven-public/</url><releases><enabled>true</enabled></releases><snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots></repository></repositories></profile></profiles><activeProfiles><activeProfile>nexus-repo</activeProfile></activeProfiles></settings>' > /root/.m2/settings.xml"
-          docker exec mavenbuild sh -c 'cd /build && mvn -B -DskipTests clean package'
-          docker exec mavenbuild sh -c 'cd /build/target && cp *.jar app.jar'
+          docker cp "${PWD}/." "$BUILD_CONTAINER":/build/
+          docker exec "$BUILD_CONTAINER" sh -c "printf '%s' '<settings><profiles><profile><id>nexus-repo</id><repositories><repository><id>nexus-internal</id><url>http://nexus:8081/repository/maven-public/</url><releases><enabled>true</enabled></releases><snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots></repository></repositories></profile></profiles><activeProfiles><activeProfile>nexus-repo</activeProfile></activeProfiles></settings>' > /root/.m2/settings.xml"
+          docker exec "$BUILD_CONTAINER" sh -c 'cd /build && mvn -B -DskipTests clean package'
+          docker exec "$BUILD_CONTAINER" sh -c 'cd /build/target && cp *.jar app.jar'
           mkdir -p "${PWD}/target"
-          docker cp mavenbuild:/build/target/app.jar "${PWD}/target/app.jar"
-          docker rm -f mavenbuild
+          docker cp "$BUILD_CONTAINER":/build/target/app.jar "${PWD}/target/app.jar"
+          docker rm -f "$BUILD_CONTAINER"
 
       - name: 构建并推送镜像
         run: |

pom.xml

@@ -103,11 +103,14 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- 单测专用：验证方案 §12「缓存切 Redis 仅改配置」的演进承诺（生产仍为 Caffeine，零影响） -->
+        <!-- 入站验签走中央密钥链（注册表模式 yh.app-auth.trust-registry）必须编译期引入 data-redis：
+             yh-app-auth 的该依赖是 optional、不传递（Notice/flow-center/svc-hall 同款，2026-10-05 自
+             test scope 提升）。副作用是 RedisHealthIndicator 会被装配，故 yml 里关掉
+             management.health.redis.enabled，防 Redis 抖动把 /actuator/health 拉成 DOWN(503)。
+             RedisCacheEvolutionIT（缓存演进验证）继续复用本依赖。 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

src/main/java/com/yunhai/cms/controller/api/PersonController.java

@@ -0,0 +1,43 @@
+package com.yunhai.cms.controller.api;
+
+import com.yunhai.cms.model.dto.DeleteRequest;
+import com.yunhai.cms.model.dto.PersonSaveRequest;
+import com.yunhai.cms.model.vo.PersonVo;
+import com.yunhai.cms.service.impl.PersonService;
+import com.yunhai.platform.utils.model.BoaUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 名师风采人物管理（docs/20 D-7，people 区块数据源）。
+ */
+@RestController
+@RequestMapping("/api/person")
+@RequiredArgsConstructor
+public class PersonController {
+
+    private final PersonService personService;
+
+    @GetMapping("/list")
+    public List<PersonVo> list(BoaUser authUserWithDept, @RequestParam("siteId") Integer siteId) {
+        return personService.list(authUserWithDept, siteId);
+    }
+
+    @PostMapping("/save")
+    public PersonVo save(BoaUser authUserWithDept, @Valid @RequestBody PersonSaveRequest request) {
+        return personService.save(authUserWithDept, request);
+    }
+
+    @PostMapping("/delete")
+    public void delete(BoaUser authUserWithDept, @Valid @RequestBody DeleteRequest request) {
+        personService.delete(authUserWithDept, request);
+    }
+}

src/main/java/com/yunhai/cms/controller/oapi/site/SiteOapiController.java

@@ -2,6 +2,7 @@ package com.yunhai.cms.controller.oapi.site;
 
 import com.yunhai.cms.entity.CmsSite;
 import com.yunhai.cms.repository.CmsSiteRepository;
+import com.yunhai.cms.utils.ExtJsonUtils;
 import com.yunhai.platform.apistd.BizException;
 import com.yunhai.platform.utils.exception.ErrorCode;
 import lombok.Data;
@@ -11,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 站点目录开放接口（/oapi/site/list，appKey 签名访问；V2.0 Part C.3）。
@@ -51,14 +54,34 @@ public class SiteOapiController {
         vo.setSiteCode(site.getCode());
         vo.setName(site.getName());
         vo.setSchId(site.getSchId() == null ? null : site.getSchId().longValue());
+        // T1 主题联动（2026-10-03）：theme 空=default；themeParams=config_json.theme_params
+        // 原样键值（解析写法对齐 PortalSiteSnapshot.of），未配=空对象（消费方免判空两写）
+        vo.setTheme(site.getTheme() == null || site.getTheme().isEmpty()
+                ? "default" : site.getTheme());
+        Map<String, Object> config = ExtJsonUtils.parse(site.getConfigJson());
+        Object tp = config == null ? null : config.get("theme_params");
+        Map<String, String> params = new LinkedHashMap<>();
+        if (tp instanceof Map) {
+            for (Map.Entry<?, ?> e : ((Map<?, ?>) tp).entrySet()) {
+                if (e.getKey() != null && e.getValue() != null) {
+                    params.put(String.valueOf(e.getKey()), String.valueOf(e.getValue()));
+                }
+            }
+        }
+        vo.setThemeParams(params);
         return vo;
     }
 
-    /** 站点选项（siteCode 为办事大厅侧定位键；schId 用于权限与租户定界） */
+    /** 站点选项（siteCode 为办事大厅侧定位键；schId 用于权限与租户定界；
+     * theme/themeParams raw 透传——消费方（svc-hall hall 用户面）按皮肤声明自行过滤） */
     @Data
     public static class SiteOptionVo {
         private String siteCode;
         private String name;
         private Long schId;
+        /** CMS 皮肤包名（空已兜底为 default） */
+        private String theme;
+        /** CMS config_json.theme_params 原样键值（未配置=空对象） */
+        private Map<String, String> themeParams = new LinkedHashMap<>();
     }
 }

src/main/java/com/yunhai/cms/controller/portal/PortalController.java

@@ -19,6 +19,7 @@ import com.yunhai.cms.svcitem.model.vo.PortalServiceItem;
 import com.yunhai.cms.svcitem.model.vo.PortalServiceListData;
 import com.yunhai.cms.svcitem.service.SvcItemQuery;
 import com.yunhai.cms.utils.PortalUrlHelper;
+import com.yunhai.cms.utils.SvcHallLinks;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -491,18 +492,15 @@ public class PortalController {
         // "我要办理"三态（§5.3）：① ext_json.apply_url 手填外链（最高优先）
         // ② 未填且站点配了 svc_hall_base 且事项开通在线办理（onlineFlag=1 且绑流程，§3.7——
         //    与 svc-hall 侧 submit 校验"未开通在线办理"口径对齐，线下/纯指南事项不再渲染按钮）
+        //    ——深链带 from=指南页回跳地址，hall 据此显示"返回门户"按钮（T4 闭环）
         // ③ 其余 → 不注入（模板不渲染按钮）
         String applyUrl = item.getApplyUrl();
         boolean onlineHandlable = item.getOnlineFlag() != null && item.getOnlineFlag() == 1
                 && StringUtils.hasText(item.getFlowGuid());
         if ((applyUrl == null || applyUrl.trim().isEmpty()) && onlineHandlable
                 && site.getSvcHallBase() != null && !site.getSvcHallBase().trim().isEmpty()) {
-            String base = site.getSvcHallBase().trim();
-            while (base.endsWith("/")) {
-                base = base.substring(0, base.length() - 1);
-            }
-            applyUrl = base + "/#/apply?siteCode=" + urlEncodeValue(site.getCode())
-                    + "&itemCode=" + urlEncodeValue(item.getItemCode());
+            applyUrl = SvcHallLinks.build(site.getSvcHallBase(), site.getCode(),
+                    item.getItemCode(), url.serviceItem(itemId));
         }
         if (applyUrl != null && !applyUrl.trim().isEmpty()) {
             model.addAttribute("applyUrl", applyUrl);
@@ -687,14 +685,6 @@ public class PortalController {
         return trimmed.isEmpty() ? null : trimmed;
     }
 
-    private static String urlEncodeValue(String value) {
-        try {
-            return java.net.URLEncoder.encode(value == null ? "" : value, "UTF-8");
-        } catch (java.io.UnsupportedEncodingException e) {
-            return value;
-        }
-    }
-
 
     /**
      * 站点身份解析（W4）：优先按门户 path（siteSnapshotByPath）；

src/main/java/com/yunhai/cms/controller/portal/PortalPageRenderer.java

@@ -42,6 +42,8 @@ public class PortalPageRenderer {
 
     private final CmsArticleRepository articleRepository;
     private final ThemeRegistry themeRegistry;
+    /** docs/20 D-7：people 区块数据源 */
+    private final com.yunhai.cms.repository.CmsPersonRepository personRepository;
 
     /**
      * M0 可选模板整页回退（事项库详细设计 §四）：目标主题缺该页模板（如 service.html/guide.html
@@ -348,20 +350,42 @@ public class PortalPageRenderer {
                 return buildQuickLinksBlock(spec);
             case "notice_bar":
                 return buildNoticeBarBlock(spec);
+            // ===== docs/20 D-1~D-9 新组件（空数据返回 null = 整块不渲染，R-44）=====
+            case "stats_band":
+                return buildStatsBandBlock(spec);
+            case "featured_topics":
+                return buildFeaturedTopicsBlock(site, spec, url);
+            case "video_tour":
+                return buildVideoTourBlock(spec, url);
+            case "events":
+                return buildEventsBlock(site, spec, url);
+            case "people":
+                return buildPeopleBlock(site, spec, treeIds);
+            case "badges":
+                return buildBadgesBlock(spec);
             default:
                 return null; // 白名单外的脏数据跳过，不打挂渲染
         }
     }
 
-    /** 区块公共头：type/title，并合成为 category.name 供主题 fragment 复用（block.category.name 取标题） */
+    /** 区块公共头：type/title，并合成为 category.name 供主题 fragment 复用（block.category.name 取标题）。
+     *  F2（docs/20）：透传区块 id（编辑器实时预览 postMessage 重排的 DOM 锚点 data-plb-id）。
+     *  D-4（docs/20）：subtitle 全类型通用（中英双语栏目标题——主题 titleStyle 参数控制展示开关）。 */
     private Map<String, Object> baseBlock(Map<String, Object> spec, String type, String fallbackTitle) {
         Map<String, Object> block = new HashMap<>();
         block.put("type", type);
+        if (spec.get("id") != null) {
+            block.put("id", String.valueOf(spec.get("id")));
+        }
         String title = spec.get("title") == null ? "" : String.valueOf(spec.get("title")).trim();
         if (title.isEmpty()) {
             title = fallbackTitle;
         }
         block.put("title", title);
+        String subtitle = spec.get("subtitle") == null ? "" : String.valueOf(spec.get("subtitle")).trim();
+        if (!subtitle.isEmpty()) {
+            block.put("subtitle", subtitle);
+        }
         Map<String, Object> category = new HashMap<>();
         category.put("name", title);
         block.put("category", category);
@@ -450,7 +474,11 @@ public class PortalPageRenderer {
         if (subtitle.isEmpty()) {
             subtitle = str(config.get("gallery_subtitle"), "Online Exhibition Hall");
         }
-        block.put("subtitle", subtitle);
+        if (!subtitle.isEmpty()) {
+            block.put("subtitle", subtitle);
+        }
+        // D-8（docs/20）：campus_wall 布局开关（grid 规整网格 / masonry 瀑布流）
+        block.put("layout", "masonry".equals(str(spec.get("layout"), "")) ? "masonry" : "grid");
         block.put("items", activeBanners(site, "gallery", url));
         return block;
     }
@@ -471,8 +499,8 @@ public class PortalPageRenderer {
     }
 
     /**
-     * 快捷入口宫格（v2 手册 §2.8 类型 A）：数据是区块内联数组，不读任何外部表。
-     * 保存期已校验 url 白名单，装配期对脏数据（直改库/历史配置）再容错一次——不合法项静默丢弃，不打挂渲染。
+     * 快捷入口宫格（v2 手册 §2.8 类型 A；docs/20 D-2 升级图标宫格）：数据是区块内联数组，不读任何外部表。
+     * 保存期已校验 url/icon 白名单，装配期对脏数据（直改库/历史配置）再容错一次——不合法项静默丢弃，不打挂渲染。
      */
     private Map<String, Object> buildQuickLinksBlock(Map<String, Object> spec) {
         List<Map<String, Object>> links = new ArrayList<>();
@@ -491,6 +519,11 @@ public class PortalPageRenderer {
                 Map<String, Object> link = new HashMap<>();
                 link.put("name", name);
                 link.put("url", linkUrl);
+                // D-2：可选图标标识符（未选时骨架渲染首字徽章兜底）
+                String icon = str(item.get("icon"), "").trim();
+                if (!icon.isEmpty() && icon.matches("^[a-z0-9-]{1,30}$")) {
+                    link.put("icon", icon);
+                }
                 links.add(link);
             }
         }
@@ -512,8 +545,214 @@ public class PortalPageRenderer {
         return block;
     }
 
+    // ===== docs/20 D 新组件装配（空数据返回 null → buildLayoutBlocks 跳过 = 整块不渲染，R-44）=====
+
+    /** stats_band（D-1 数字计数带）：stats 内联数组透传（骨架共享 count-up 动画）；空/无有效项 → 不渲染 */
+    private Map<String, Object> buildStatsBandBlock(Map<String, Object> spec) {
+        List<Map<String, Object>> stats = new ArrayList<>();
+        Object raw = spec.get("stats");
+        if (raw instanceof List) {
+            for (Object o : (List<?>) raw) {
+                if (!(o instanceof Map)) {
+                    continue;
+                }
+                Map<?, ?> item = (Map<?, ?>) o;
+                String label = str(item.get("label"), "").trim();
+                String value = str(item.get("value"), "").trim();
+                if (label.isEmpty() || value.isEmpty()) {
+                    continue;
+                }
+                Map<String, Object> stat = new HashMap<>();
+                stat.put("label", label);
+                stat.put("value", value);
+                String unit = str(item.get("unit"), "").trim();
+                if (!unit.isEmpty()) {
+                    stat.put("unit", unit);
+                }
+                String icon = str(item.get("icon"), "").trim();
+                if (!icon.isEmpty() && icon.matches("^[a-z0-9-]{1,30}$")) {
+                    stat.put("icon", icon);
+                }
+                stats.add(stat);
+            }
+        }
+        if (stats.isEmpty()) {
+            return null;
+        }
+        Map<String, Object> block = baseBlock(spec, "stats_band", "数说学校");
+        block.put("stats", stats);
+        return block;
+    }
+
+    /** featured_topics（D-3 专题大卡）：数据 = banner 表 topic 展示位（描述/CTA 扩展列）；无在展数据 → 不渲染 */
+    private Map<String, Object> buildFeaturedTopicsBlock(PortalSiteSnapshot site, Map<String, Object> spec,
+                                                         PortalUrlHelper url) {
+        List<Map<String, Object>> items = new ArrayList<>();
+        for (PortalBanner b : site.getBanners()) {
+            if (!"topic".equals(b.getPosition()) || !isActiveNow(b)) {
+                continue;
+            }
+            Map<String, Object> item = new HashMap<>();
+            item.put("title", b.getTitle());
+            item.put("imageUrl", url.upload(b.getImageUrl()));
+            item.put("linkUrl", resolveBannerLink(b, url));
+            if (hasText(b.getDescription())) {
+                item.put("description", b.getDescription());
+            }
+            if (hasText(b.getCtaText())) {
+                item.put("ctaText", b.getCtaText());
+            }
+            if (hasText(b.getCtaUrl())) {
+                item.put("ctaUrl", b.getCtaUrl());
+            }
+            items.add(item);
+        }
+        if (items.isEmpty()) {
+            return null;
+        }
+        Map<String, Object> block = baseBlock(spec, "featured_topics", "专题推荐");
+        block.put("items", items);
+        return block;
+    }
+
+    /** video_tour（D-5 视频/VR 校园）：cover 资产补基准 + url + title；脏数据（缺 cover/url）→ 不渲染 */
+    private Map<String, Object> buildVideoTourBlock(Map<String, Object> spec, PortalUrlHelper url) {
+        String cover = str(spec.get("cover"), "").trim();
+        String videoUrl = str(spec.get("url"), "").trim();
+        if (!ASSET_URL_PATTERN.matcher(cover).matches() || !LAYOUT_LINK_URL.matcher(videoUrl).matches()) {
+            return null;
+        }
+        Map<String, Object> block = baseBlock(spec, "video_tour", "云端校园");
+        block.put("cover", url.upload(cover));
+        block.put("videoUrl", videoUrl);
+        return block;
+    }
+
+    /** events（D-6 学术日历/活动）：数据 = banner 表 event 展示位（event_date/location 扩展列）；无在展数据 → 不渲染 */
+    private Map<String, Object> buildEventsBlock(PortalSiteSnapshot site, Map<String, Object> spec,
+                                                 PortalUrlHelper url) {
+        List<PortalBanner> events = new ArrayList<>();
+        for (PortalBanner b : site.getBanners()) {
+            if ("event".equals(b.getPosition()) && isActiveNow(b)) {
+                events.add(b);
+            }
+        }
+        // 活动日历语义：按活动日期升序（无日期的排后按 sortNo），最多 6 条
+        events.sort(java.util.Comparator
+                .comparing((PortalBanner b) -> b.getEventDate() == null ? java.time.LocalDateTime.MAX : b.getEventDate())
+                .thenComparing(PortalBanner::getSortNo, java.util.Comparator.nullsLast(Integer::compareTo)));
+        if (events.size() > 6) {
+            events = events.subList(0, 6);
+        }
+        if (events.isEmpty()) {
+            return null;
+        }
+        List<Map<String, Object>> items = new ArrayList<>();
+        for (PortalBanner b : events) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("title", b.getTitle());
+            item.put("linkUrl", resolveBannerLink(b, url));
+            if (b.getEventDate() != null) {
+                item.put("eventDate", b.getEventDate());
+            }
+            if (hasText(b.getLocation())) {
+                item.put("location", b.getLocation());
+            }
+            items.add(item);
+        }
+        Map<String, Object> block = baseBlock(spec, "events", "学术活动");
+        block.put("items", items);
+        return block;
+    }
+
+    /** people（D-7 名师风采）：cms_person 启用数据（categoryId 可选过滤，须在本站栏目树内）；无数据 → 不渲染 */
+    private Map<String, Object> buildPeopleBlock(PortalSiteSnapshot site, Map<String, Object> spec,
+                                                 Set<Integer> treeIds) {
+        Integer categoryId = null;
+        Object rawCategory = spec.get("categoryId");
+        if (rawCategory instanceof Number && ((Number) rawCategory).intValue() > 0
+                && treeIds.contains(((Number) rawCategory).intValue())) {
+            categoryId = ((Number) rawCategory).intValue();
+        }
+        List<com.yunhai.cms.entity.CmsPerson> people = new ArrayList<>();
+        for (com.yunhai.cms.entity.CmsPerson p
+                : personRepository.findBySiteIdAndStatusOrderBySortNoAscIdAsc(site.getId(), 1)) {
+            if (categoryId != null && !categoryId.equals(p.getCategoryId())) {
+                continue;
+            }
+            people.add(p);
+            if (people.size() >= 12) {
+                break;
+            }
+        }
+        if (people.isEmpty()) {
+            return null;
+        }
+        List<Map<String, Object>> items = new ArrayList<>();
+        for (com.yunhai.cms.entity.CmsPerson p : people) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("name", p.getName());
+            if (hasText(p.getTitle())) {
+                item.put("title", p.getTitle());
+            }
+            if (hasText(p.getBio())) {
+                item.put("bio", p.getBio());
+            }
+            if (hasText(p.getAvatar())) {
+                item.put("avatar", p.getAvatar());
+            }
+            items.add(item);
+        }
+        Map<String, Object> block = baseBlock(spec, "people", "名师风采");
+        block.put("items", items);
+        return block;
+    }
+
+    /** badges（D-9 排名/学科评估徽章带）：badgeItems 内联数组透传；空 → 不渲染 */
+    private Map<String, Object> buildBadgesBlock(Map<String, Object> spec) {
+        List<Map<String, Object>> items = new ArrayList<>();
+        Object raw = spec.get("badgeItems");
+        if (raw instanceof List) {
+            for (Object o : (List<?>) raw) {
+                if (!(o instanceof Map)) {
+                    continue;
+                }
+                Map<?, ?> m = (Map<?, ?>) o;
+                String label = str(m.get("label"), "").trim();
+                String image = str(m.get("image"), "").trim();
+                if (label.isEmpty() || !ASSET_URL_PATTERN.matcher(image).matches()) {
+                    continue;
+                }
+                Map<String, Object> item = new HashMap<>();
+                item.put("label", label);
+                item.put("image", image);
+                String desc = str(m.get("desc"), "").trim();
+                if (!desc.isEmpty()) {
+                    item.put("desc", desc);
+                }
+                items.add(item);
+            }
+        }
+        if (items.isEmpty()) {
+            return null;
+        }
+        Map<String, Object> block = baseBlock(spec, "badges", "实力声誉");
+        block.put("items", items);
+        return block;
+    }
+
+    /** banner 时间窗过滤（activeBanners 同语义，供 topic/event 位复用；快照内 banner 已过滤启用态） */
+    private boolean isActiveNow(PortalBanner b) {
+        java.time.LocalDateTime now = java.time.LocalDateTime.now();
+        return (b.getStartTime() == null || !now.isBefore(b.getStartTime()))
+                && (b.getEndTime() == null || now.isBefore(b.getEndTime()));
+    }
+
     // ===== 布局装配工具 =====
 
+    /** 区块内图片资产 URL 形态（与 SiteService ASSET_PATTERN 同语义） */
+    private static final Pattern ASSET_URL_PATTERN = Pattern.compile("^(/.+|https?://\\S+)$");
+
     private static String str(Object v, String fallback) {
         return v == null ? fallback : String.valueOf(v);
     }

src/main/java/com/yunhai/cms/entity/CmsBanner.java

@@ -59,4 +59,27 @@ public class CmsBanner extends BaseEntity {
     /** 状态：0=停用 1=启用 */
     @Column(name = "status", nullable = false)
     private Integer status = 1;
+
+    // ===== docs/20 D-3/D-6：banner 表扩展（topic=专题大卡位 / event=学术活动位）=====
+    // 仅对应展示位消费；home/gallery 位忽略。可空列，ddl-auto=update 自动补列（SQL 脚本另附 resources/sql）。
+
+    /** 专题大卡描述文案（position=topic） */
+    @Column(name = "description", length = 500)
+    private String description;
+
+    /** 专题大卡 CTA 按钮文字（position=topic，如「进入专题」） */
+    @Column(name = "cta_text", length = 100)
+    private String ctaText;
+
+    /** 专题大卡 CTA 跳转地址（position=topic） */
+    @Column(name = "cta_url", length = 500)
+    private String ctaUrl;
+
+    /** 活动日期（position=event，学术日历大日期块） */
+    @Column(name = "event_date")
+    private LocalDateTime eventDate;
+
+    /** 活动地点（position=event） */
+    @Column(name = "location", length = 200)
+    private String location;
 }

src/main/java/com/yunhai/cms/entity/CmsPerson.java

@@ -0,0 +1,56 @@
+package com.yunhai.cms.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+
+/**
+ * 名师风采人物（docs/20 D-7：首页 people 区块数据源，新表）。
+ * 人物按站点隔离、可挂栏目分组（category_id 可空 = 未分组）；头像走附件上传通道。
+ * DDL：hibernate ddl-auto=update 自动建表；DBA 审阅脚本见 resources/sql/cms_person.sql（不自动执行）。
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "cms_person", indexes = {
+        @Index(name = "idx_person_site", columnList = "site_id, status, sort_no"),
+        @Index(name = "idx_person_category", columnList = "category_id")
+})
+public class CmsPerson extends BaseEntity {
+
+    /** 所属站点 */
+    @Column(name = "site_id", nullable = false)
+    private Integer siteId;
+
+    /** 姓名 */
+    @Column(name = "name", nullable = false, length = 100)
+    private String name;
+
+    /** 头衔/职称（如 教授、长江学者） */
+    @Column(name = "title", length = 100)
+    private String title;
+
+    /** 一句话简介 */
+    @Column(name = "bio", length = 500)
+    private String bio;
+
+    /** 头像 URL（附件上传，/cms/upload/** 或 http(s)） */
+    @Column(name = "avatar", length = 500)
+    private String avatar;
+
+    /** 所属栏目外键（可空 = 未分组；people 区块按此过滤） */
+    @Column(name = "category_id")
+    private Integer categoryId;
+
+    /** 同级排序（升序） */
+    @Column(name = "sort_no", nullable = false)
+    private Integer sortNo = 0;
+
+    /** 状态：0=停用 1=启用 */
+    @Column(name = "status", nullable = false)
+    private Integer status = 1;
+}

src/main/java/com/yunhai/cms/model/dto/BannerSaveRequest.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 
 /**
- * 轮播保存（校验 link_type/link_value，方案 §9.2）。
+ * 轮播保存（校验 link_type/link_value，方案 §9.2；docs/20 D-3/D-6 扩展 topic/event 位字段）。
  */
 @Data
 public class BannerSaveRequest {
@@ -49,4 +49,25 @@ public class BannerSaveRequest {
 
     /** 0=停用 1=启用 */
     private Integer status = 1;
+
+    // ===== docs/20 D-3/D-6：topic/event 展示位扩展（仅对应位消费，其余位忽略）=====
+
+    /** 专题大卡描述（position=topic） */
+    @Size(max = 500, message = "专题描述过长")
+    private String description;
+
+    /** 专题大卡 CTA 按钮文字（position=topic） */
+    @Size(max = 100, message = "按钮文字过长")
+    private String ctaText;
+
+    /** 专题大卡 CTA 跳转地址（position=topic） */
+    @Size(max = 500, message = "按钮地址过长")
+    private String ctaUrl;
+
+    /** 活动日期（position=event） */
+    private LocalDateTime eventDate;
+
+    /** 活动地点（position=event） */
+    @Size(max = 200, message = "活动地点过长")
+    private String location;
 }

src/main/java/com/yunhai/cms/model/dto/PersonSaveRequest.java

@@ -0,0 +1,42 @@
+package com.yunhai.cms.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * 名师风采人物保存（docs/20 D-7）。
+ */
+@Data
+public class PersonSaveRequest {
+
+    /** 修改时必填 */
+    private Integer id;
+
+    @NotNull(message = "siteId 不得为空")
+    private Integer siteId;
+
+    @NotBlank(message = "姓名不得为空")
+    @Size(max = 100, message = "姓名过长")
+    private String name;
+
+    @Size(max = 100, message = "头衔过长")
+    private String title;
+
+    @Size(max = 500, message = "简介过长")
+    private String bio;
+
+    /** 头像（/cms/upload/** 或 http(s)；可空 = 首字徽章兜底） */
+    @Size(max = 500)
+    private String avatar;
+
+    /** 所属栏目（可空 = 未分组；须属于本站点） */
+    private Integer categoryId;
+
+    private Integer sortNo = 0;
+
+    /** 0=停用 1=启用 */
+    private Integer status = 1;
+}

src/main/java/com/yunhai/cms/model/portal/PortalBanner.java

@@ -34,6 +34,22 @@ public class PortalBanner {
     /** 下线时间（渲染方过滤） */
     private LocalDateTime endTime;
 
+    // ===== docs/20 D-3/D-6：topic/event 展示位扩展字段 =====
+    /** 专题大卡描述（position=topic） */
+    private String description;
+
+    /** 专题大卡 CTA 按钮文字（position=topic） */
+    private String ctaText;
+
+    /** 专题大卡 CTA 跳转地址（position=topic） */
+    private String ctaUrl;
+
+    /** 活动日期（position=event，学术日历大日期块） */
+    private LocalDateTime eventDate;
+
+    /** 活动地点（position=event） */
+    private String location;
+
     public static PortalBanner of(CmsBanner b) {
         PortalBanner item = new PortalBanner();
         item.setId(b.getId());
@@ -45,6 +61,11 @@ public class PortalBanner {
         item.setSortNo(b.getSortNo());
         item.setStartTime(b.getStartTime());
         item.setEndTime(b.getEndTime());
+        item.setDescription(b.getDescription());
+        item.setCtaText(b.getCtaText());
+        item.setCtaUrl(b.getCtaUrl());
+        item.setEventDate(b.getEventDate());
+        item.setLocation(b.getLocation());
         return item;
     }
 }

src/main/java/com/yunhai/cms/model/vo/BannerVo.java

@@ -34,6 +34,13 @@ public class BannerVo {
 
     private Integer status;
 
+    // ===== docs/20 D-3/D-6：topic/event 展示位扩展字段 =====
+    private String description;
+    private String ctaText;
+    private String ctaUrl;
+    private java.time.LocalDateTime eventDate;
+    private String location;
+
     public static BannerVo of(CmsBanner b) {
         BannerVo vo = new BannerVo();
         vo.setId(b.getId());
@@ -47,6 +54,11 @@ public class BannerVo {
         vo.setStartTime(b.getStartTime());
         vo.setEndTime(b.getEndTime());
         vo.setStatus(b.getStatus());
+        vo.setDescription(b.getDescription());
+        vo.setCtaText(b.getCtaText());
+        vo.setCtaUrl(b.getCtaUrl());
+        vo.setEventDate(b.getEventDate());
+        vo.setLocation(b.getLocation());
         return vo;
     }
 }

src/main/java/com/yunhai/cms/model/vo/PersonVo.java

@@ -0,0 +1,39 @@
+package com.yunhai.cms.model.vo;
+
+import com.yunhai.cms.entity.CmsPerson;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/** 名师风采人物（docs/20 D-7） */
+@Data
+public class PersonVo {
+
+    private Integer id;
+    private Integer siteId;
+    private String name;
+    private String title;
+    private String bio;
+    private String avatar;
+    private Integer categoryId;
+    private Integer sortNo;
+    private Integer status;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+
+    public static PersonVo of(CmsPerson p) {
+        PersonVo vo = new PersonVo();
+        vo.setId(p.getId());
+        vo.setSiteId(p.getSiteId());
+        vo.setName(p.getName());
+        vo.setTitle(p.getTitle());
+        vo.setBio(p.getBio());
+        vo.setAvatar(p.getAvatar());
+        vo.setCategoryId(p.getCategoryId());
+        vo.setSortNo(p.getSortNo());
+        vo.setStatus(p.getStatus());
+        vo.setCreateTime(p.getCreateTime());
+        vo.setUpdateTime(p.getUpdateTime());
+        return vo;
+    }
+}

src/main/java/com/yunhai/cms/repository/CmsPersonRepository.java

@@ -0,0 +1,16 @@
+package com.yunhai.cms.repository;
+
+import com.yunhai.cms.entity.CmsPerson;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+/** 名师风采（docs/20 D-7） */
+public interface CmsPersonRepository extends JpaRepository<CmsPerson, Integer> {
+
+    /** 管理端：站点全量（含停用，按排序） */
+    List<CmsPerson> findBySiteIdOrderBySortNoAscIdAsc(Integer siteId);
+
+    /** 门户：启用人物（可选栏目过滤），按排序 */
+    List<CmsPerson> findBySiteIdAndStatusOrderBySortNoAscIdAsc(Integer siteId, Integer status);
+}

src/main/java/com/yunhai/cms/service/impl/AttachmentService.java

@@ -68,11 +68,11 @@ public class AttachmentService {
 
     /**
      * 上传 scene 白名单（B2 附件引用模型）：banner=轮播 / link=友链 / site=站点配置 /
-     * category=单页栏目贴图。svc_item/svc_item_asset 两个事项场景已随事项库迁出办事大厅
-     * （V2.0，见 docs/19 §九），CMS 侧下线。
+     * category=单页栏目贴图 / person=名师头像（docs/20 D-7）。svc_item/svc_item_asset 两个事项场景
+     * 已随事项库迁出办事大厅（V2.0，见 docs/19 §九），CMS 侧下线。
      */
     private static final List<String> ALLOWED_SCENES =
-            Arrays.asList("banner", "link", "site", "category");
+            Arrays.asList("banner", "link", "site", "category", "person");
 
     private final CmsAttachmentRepository attachmentRepository;
     private final SiteService siteService;

src/main/java/com/yunhai/cms/service/impl/BannerService.java

@@ -81,6 +81,12 @@ public class BannerService {
             throw new BizException(ErrorCode.PARAM_ERROR, "下线时间不能早于上线时间");
         }
         banner.setStatus(req.getStatus() == null ? 1 : req.getStatus());
+        // docs/20 D-3/D-6：topic/event 位扩展字段透传（其余位一并落库，渲染端按位消费）
+        banner.setDescription(req.getDescription());
+        banner.setCtaText(req.getCtaText());
+        banner.setCtaUrl(req.getCtaUrl());
+        banner.setEventDate(req.getEventDate());
+        banner.setLocation(req.getLocation());
         banner = bannerRepository.save(banner);
         // B2 附件引用：先解引用再回写新图（编辑换图时旧图回未使用）；幂等
         attachmentService.release("banner", banner.getId());

src/main/java/com/yunhai/cms/service/impl/CategoryService.java

@@ -80,8 +80,7 @@ public class CategoryService {
         if (StringUtils.hasText(req.getHomeStyle()) && !HOME_STYLE_VALUES.contains(req.getHomeStyle())) {
             throw new BizException(ErrorCode.PARAM_ERROR,
                     "首页展示形态非法：" + req.getHomeStyle() + "（仅支持 news_grid / media_focus）");
-        }
-        CmsCategory category;
+        }        CmsCategory category;
         if (req.getId() == null) {
             category = new CmsCategory();
             category.setSiteId(site.getId());
@@ -98,7 +97,9 @@ public class CategoryService {
         category.setType(type.getCode());
         category.setLinkUrl(req.getLinkUrl());
         category.setTemplate(req.getTemplate());
-        category.setHomeStyle(StringUtils.hasText(req.getHomeStyle()) ? req.getHomeStyle() : null);
+        // F3（docs/20 §四）：「首页展示形态」唯一入口收敛到首页布局编辑器，栏目管理不再编辑该字段——
+        // 入参缺省时保留已有值（存量数据不清除，无布局站点的回落渲染仍消费）；显式传值仍校验（API 兼容）
+        category.setHomeStyle(StringUtils.hasText(req.getHomeStyle()) ? req.getHomeStyle() : category.getHomeStyle());
         category.setContent(HtmlSanitizer.clean(req.getContent()));
         category.setSortNo(req.getSortNo() == null ? 0 : req.getSortNo());
         category.setSeoTitle(req.getSeoTitle());

src/main/java/com/yunhai/cms/service/impl/PersonService.java

@@ -0,0 +1,94 @@
+package com.yunhai.cms.service.impl;
+
+import com.yunhai.cms.entity.CmsCategory;
+import com.yunhai.cms.entity.CmsPerson;
+import com.yunhai.cms.event.SiteContentChangedEvent;
+import com.yunhai.cms.model.dto.DeleteRequest;
+import com.yunhai.cms.model.dto.PersonSaveRequest;
+import com.yunhai.cms.model.vo.PersonVo;
+import com.yunhai.cms.repository.CmsCategoryRepository;
+import com.yunhai.cms.repository.CmsPersonRepository;
+import com.yunhai.platform.apistd.BizException;
+import com.yunhai.platform.utils.exception.ErrorCode;
+import com.yunhai.platform.utils.model.BoaUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 名师风采人物管理（docs/20 D-7）：站点级 CRUD + people 区块数据源。
+ * 头像附件引用走 scene=person（B2 模型）；categoryId 须属于本站点（防跨站注入）。
+ */
+@Service
+@RequiredArgsConstructor
+public class PersonService {
+
+    private final CmsPersonRepository personRepository;
+    private final CmsCategoryRepository categoryRepository;
+    private final SiteService siteService;
+    private final AttachmentService attachmentService;
+    private final ApplicationEventPublisher eventPublisher;
+
+    public List<PersonVo> list(BoaUser user, Integer siteId) {
+        siteService.requireManageable(user, siteId);
+        return personRepository.findBySiteIdOrderBySortNoAscIdAsc(siteId).stream()
+                .map(PersonVo::of)
+                .collect(Collectors.toList());
+    }
+
+    @Transactional
+    public PersonVo save(BoaUser user, PersonSaveRequest req) {
+        siteService.requireManageable(user, req.getSiteId());
+        if (req.getCategoryId() != null) {
+            CmsCategory category = categoryRepository.findById(req.getCategoryId())
+                    .orElseThrow(() -> new BizException(ErrorCode.PARAM_ERROR, "所属栏目不存在"));
+            if (!category.getSiteId().equals(req.getSiteId())) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "所属栏目不属于本站点");
+            }
+        }
+        CmsPerson person;
+        if (req.getId() == null) {
+            person = new CmsPerson();
+            person.setSiteId(req.getSiteId());
+        } else {
+            person = personRepository.findById(req.getId())
+                    .orElseThrow(() -> new BizException(ErrorCode.PARAM_ERROR, "人物不存在"));
+            if (!person.getSiteId().equals(req.getSiteId())) {
+                throw new BizException(ErrorCode.FORBIDDEN, "无权修改该人物");
+            }
+        }
+        person.setName(req.getName());
+        person.setTitle(req.getTitle());
+        person.setBio(req.getBio());
+        person.setAvatar(req.getAvatar());
+        person.setCategoryId(req.getCategoryId());
+        person.setSortNo(req.getSortNo() == null ? 0 : req.getSortNo());
+        person.setStatus(req.getStatus() == null ? 1 : req.getStatus());
+        person = personRepository.save(person);
+        // B2 附件引用：先解引用再回写新头像（编辑换图时旧图回未使用）；幂等
+        attachmentService.release("person", person.getId());
+        if (StringUtils.hasText(req.getAvatar())) {
+            attachmentService.markUsed(req.getSiteId(), req.getAvatar(), "person", person.getId());
+        }
+        eventPublisher.publishEvent(new SiteContentChangedEvent(req.getSiteId(), "person"));
+        return PersonVo.of(person);
+    }
+
+    @Transactional
+    public void delete(BoaUser user, DeleteRequest req) {
+        CmsPerson person = personRepository.findById(req.getId())
+                .orElseThrow(() -> new BizException(ErrorCode.PARAM_ERROR, "人物不存在"));
+        siteService.requireManageable(user, req.getSiteId());
+        if (!person.getSiteId().equals(req.getSiteId())) {
+            throw new BizException(ErrorCode.FORBIDDEN, "无权删除该人物");
+        }
+        personRepository.delete(person);
+        attachmentService.release("person", person.getId());
+        eventPublisher.publishEvent(new SiteContentChangedEvent(req.getSiteId(), "person"));
+    }
+}

src/main/java/com/yunhai/cms/service/impl/PortalQueryService.java

@@ -75,12 +75,24 @@ public class PortalQueryService {
             return null;
         }
         PortalSiteSnapshot snapshot = PortalSiteSnapshot.of(site);
-        snapshot.setTheme(resolveTheme(snapshot.getTheme(), snapshot.getCode()));
+        String originalTheme = snapshot.getTheme();
+        snapshot.setTheme(resolveTheme(originalTheme, snapshot.getCode()));
         derivePublicBaseUrl(site, snapshot);
         // 微调参数注入（方案 §5.3）：按已解析主题 schema 过滤，回退主题与参数过滤天然一致
         com.yunhai.cms.theme.ThemeInfo themeInfo = themeRegistry.get(snapshot.getTheme());
         java.util.Map<String, String> themeParams =
                 themeInfo.filterValidValues(rawParamsMap(snapshot));
+        // docs/20 E（R-46）：站点用下架主题 → 强制对应 colorScheme 预设（保持原视觉近似）；
+        // 站点保存归一化后 theme 已是保留主题，改由 config.theme_params.colorScheme 站点级驱动
+        com.yunhai.cms.theme.ThemeRegistry.AliasInfo alias =
+                com.yunhai.cms.theme.ThemeRegistry.aliasOf(originalTheme);
+        String siteScheme = siteColorScheme(snapshot.getConfig());
+        if (alias != null && alias.colorScheme != null) {
+            themeParams.put("colorScheme", alias.colorScheme);
+        } else if (siteScheme != null && themeInfo.param("colorScheme") != null
+                && themeInfo.param("colorScheme").isValidValue(siteScheme)) {
+            themeParams.put("colorScheme", siteScheme);
+        }
         snapshot.setThemeParams(themeParams);
         snapshot.setThemeVarsCss(com.yunhai.cms.theme.ThemeVarsCss.build(themeInfo, themeParams));
 
@@ -280,15 +292,41 @@ public class PortalQueryService {
         }
     }
 
-    /** 皮肤包存在性检查：委托 ThemeRegistry（theme.json + 4 模板齐全校验，方案 §5.1 重构，缺省回退 default） */
+    /**
+     * 皮肤包存在性检查：委托 ThemeRegistry；docs/20 E 后下架主题按别名表映射到保留主题
+     * （R-46：门户不断渲染），未知主题回退 default。
+     */
     private String resolveTheme(String theme, String siteCode) {
         if (themeRegistry.contains(theme)) {
             return theme;
         }
+        com.yunhai.cms.theme.ThemeRegistry.AliasInfo alias =
+                com.yunhai.cms.theme.ThemeRegistry.aliasOf(theme);
+        if (alias != null) {
+            log.warn("皮肤包 {} 已下架（docs/20 E 清场），映射到 {}（colorScheme={}）site={}",
+                    theme, alias.target, alias.colorScheme, siteCode);
+            return alias.target;
+        }
         log.warn("皮肤包 {} 未注册（site={}），回退 default", theme, siteCode);
         return com.yunhai.cms.theme.ThemeRegistry.DEFAULT_THEME;
     }
 
+    /** 站点级 colorScheme（config_json.theme_params.colorScheme，仅归一化保存后的别名站点使用） */
+    private static String siteColorScheme(java.util.Map<String, Object> config) {
+        if (config == null) {
+            return null;
+        }
+        Object tp = config.get("theme_params");
+        if (tp instanceof Map) {
+            Object v = ((Map<?, ?>) tp).get("colorScheme");
+            if (v != null) {
+                String s = String.valueOf(v);
+                return s.isEmpty() ? null : s;
+            }
+        }
+        return null;
+    }
+
     /**
      * 参数原始值（工作项 T：参数微调上移为皮肤包级）：取当前主题的包级 {@code paramValues}
      * （{@code themes/.meta/{name}.json} 覆盖层）。站点 {@code config_json.theme_params} 已退役、不再读取

src/main/java/com/yunhai/cms/service/impl/SiteService.java

@@ -60,10 +60,12 @@ public class SiteService {
             java.util.Collections.unmodifiableSet(new java.util.HashSet<>(java.util.Arrays.asList("theme_params")));
     private static final int CONFIG_VALUE_MAX_LEN = 500;
 
-    /** home_layout（docs/16 §4.6 + v2 手册 §2.8）结构约束：类型白名单与规模上限（与前端 homeLayout.ts 同契约） */
+    /** home_layout（docs/16 §4.6 + v2 手册 §2.8 + docs/20 D 组件库扩展）结构约束：类型白名单与规模上限（与前端 homeLayout.ts 同契约） */
     private static final Set<String> HOME_LAYOUT_BLOCK_TYPES =
             java.util.Collections.unmodifiableSet(new java.util.HashSet<>(java.util.Arrays.asList(
-                    "article_list", "ticker", "gallery", "links", "quick_links", "notice_bar")));
+                    "article_list", "ticker", "gallery", "links", "quick_links", "notice_bar",
+                    // docs/20 D-1~D-9 新组件
+                    "stats_band", "featured_topics", "video_tour", "events", "people", "badges")));
     private static final int HOME_LAYOUT_MAX_BLOCKS = 30;
     private static final int HOME_LAYOUT_MAX_BLOCK_KEYS = 32;
     private static final int HOME_LAYOUT_MAX_TEXT = 100;
@@ -79,6 +81,18 @@ public class SiteService {
     /** notice_bar 提示级别白名单（缺省 info） */
     private static final Set<String> HOME_LAYOUT_NOTICE_LEVELS =
             java.util.Collections.unmodifiableSet(new java.util.HashSet<>(java.util.Arrays.asList("info", "warn")));
+    // ===== docs/20 D 组件库新增约束 =====
+    /** stats_band.stats 项数上限 */
+    private static final int HOME_LAYOUT_MAX_STATS = 8;
+    /** featured_topics.items 项数上限 */
+    private static final int HOME_LAYOUT_MAX_TOPICS = 6;
+    /** badges.items 项数上限 */
+    private static final int HOME_LAYOUT_MAX_BADGES = 8;
+    /** 区块内图标标识符（D-2 内置图标集 key） */
+    private static final Pattern HOME_LAYOUT_ICON_PATTERN = Pattern.compile("^[a-z0-9-]{1,30}$");
+    /** gallery 布局形态（D-8 campus_wall） */
+    private static final Set<String> HOME_LAYOUT_GALLERY_LAYOUTS =
+            java.util.Collections.unmodifiableSet(new java.util.HashSet<>(java.util.Arrays.asList("grid", "masonry")));
 
     /** custom_css 上限与黑名单（B3）：服务端强校验，前端仅提示；黑名单为防御下限（方案风险表） */
     private static final int CUSTOM_CSS_MAX_LEN = 10240;
@@ -177,13 +191,27 @@ public class SiteService {
         site.setSchId(req.getSchId());
         site.setSchName(req.getSchName());
         site.setName(req.getName());
-        String resolvedTheme = StringUtils.hasText(req.getTheme())
+        String requestedTheme = StringUtils.hasText(req.getTheme())
                 ? req.getTheme() : com.yunhai.cms.theme.ThemeRegistry.DEFAULT_THEME;
+        // docs/20 E：下架主题名按别名表归一化为保留主题（保存后 theme 字段收敛到 3 套注册包）
+        com.yunhai.cms.theme.ThemeRegistry.AliasInfo alias =
+                com.yunhai.cms.theme.ThemeRegistry.aliasOf(requestedTheme);
+        String resolvedTheme = requestedTheme;
         if (!themeRegistry.contains(resolvedTheme)) {
-            throw new BizException(ErrorCode.PARAM_ERROR, "皮肤包未注册：" + resolvedTheme);
+            if (alias != null) {
+                resolvedTheme = alias.target;
+            } else {
+                throw new BizException(ErrorCode.PARAM_ERROR, "皮肤包未注册：" + resolvedTheme);
+            }
         }
         site.setTheme(resolvedTheme);
-        validateConfigJson(req.getConfigJson(), site.getId());
+        String configJson = req.getConfigJson();
+        if (alias != null && alias.colorScheme != null) {
+            // 原配色写入站点级 theme_params.colorScheme（渲染端据此套用预设，保留原视觉近似）
+            configJson = withSiteColorScheme(configJson, alias.colorScheme);
+            req.setConfigJson(configJson);
+        }
+        validateConfigJson(configJson, site.getId());
         // 工作项 T：参数微调上移为皮肤包级，站点不再持有参数值——themeParams 入参直接忽略
         // （config_json 原样入库；theme_params 仍是 RESERVED 键以容忍存量/老前端提交，不报错）
         site.setConfigJson(req.getConfigJson());
@@ -195,6 +223,26 @@ public class SiteService {
         return SiteVo.of(site);
     }
 
+    /**
+     * docs/20 E：站点级 colorScheme 写入 config_json.theme_params（仅 colorScheme 键，
+     * 其余 theme_params 内容原样保留；theme_params 为 RESERVED 键不参与常规校验）。
+     */
+    private String withSiteColorScheme(String configJson, String colorScheme) {
+        java.util.Map<String, Object> config = ExtJsonUtils.parse(configJson);
+        Object tp = config.get("theme_params");
+        java.util.Map<String, Object> themeParams = new java.util.LinkedHashMap<>();
+        if (tp instanceof java.util.Map) {
+            ((java.util.Map<?, ?>) tp).forEach((k, v) -> themeParams.put(String.valueOf(k), v));
+        }
+        themeParams.put("colorScheme", colorScheme);
+        config.put("theme_params", themeParams);
+        try {
+            return CONFIG_MAPPER.writeValueAsString(config);
+        } catch (Exception e) {
+            throw new BizException(ErrorCode.PARAM_ERROR, "站点配置序列化失败");
+        }
+    }
+
     /**
      * W4 门户 path 计算（唯一入口，前后端各一份纯函数语义：front/src/utils/sitePath.ts 同构）：
      * 顶层（parentSiteId≤0）=code；子站=父站 path + '/' + code。
@@ -405,6 +453,20 @@ public class SiteService {
                 validateQuickLinksBlock(block);
             } else if ("notice_bar".equals(type.asText())) {
                 validateNoticeBarBlock(block);
+            } else if ("stats_band".equals(type.asText())) {
+                validateStatsBandBlock(block);
+            } else if ("featured_topics".equals(type.asText())) {
+                validateFeaturedTopicsBlock(block);
+            } else if ("video_tour".equals(type.asText())) {
+                validateVideoTourBlock(block);
+            } else if ("badges".equals(type.asText())) {
+                validateBadgesBlock(block);
+            } else if ("gallery".equals(type.asText())) {
+                JsonNode layout = block.get("layout");
+                if (layout != null && (!layout.isTextual()
+                        || !HOME_LAYOUT_GALLERY_LAYOUTS.contains(layout.asText()))) {
+                    throw new BizException(ErrorCode.PARAM_ERROR, "gallery layout 只能是 grid 或 masonry");
+                }
             }
             JsonNode size = block.get("size");
             if (size != null && (!size.isNumber() || size.intValue() < HOME_LAYOUT_SIZE_MIN
@@ -429,6 +491,14 @@ public class SiteService {
                     referencedIds.add(id.intValue());
                 }
             }
+            // people 区块（docs/20 D-7）：categoryId 单值，同走跨站注入防护
+            JsonNode categoryId = block.get("categoryId");
+            if (categoryId != null) {
+                if (!categoryId.isNumber() || categoryId.intValue() <= 0) {
+                    throw new BizException(ErrorCode.PARAM_ERROR, "首页布局 categoryId 必须为正整数");
+                }
+                referencedIds.add(categoryId.intValue());
+            }
         }
         if (!referencedIds.isEmpty()) {
             if (siteId == null) {
@@ -447,7 +517,7 @@ public class SiteService {
         }
     }
 
-    /** quick_links（v2 手册 §2.8 类型 A）：items 必填、1~12 项，每项 {name ≤20 字, url 合法} */
+    /** quick_links（v2 手册 §2.8 类型 A；docs/20 D-2 升级图标宫格）：items 必填、1~12 项，每项 {name ≤20 字, url 合法, icon 可选标识符} */
     private void validateQuickLinksBlock(JsonNode block) {
         JsonNode items = block.get("items");
         if (items == null) {
@@ -474,6 +544,12 @@ public class SiteService {
                         "quick_links 项 name 须为不超过 " + HOME_LAYOUT_MAX_LINK_NAME + " 字的文本");
             }
             requireLayoutLink(item.get("url"), "quick_links 项");
+            JsonNode icon = item.get("icon");
+            if (icon != null && (!icon.isTextual() || icon.asText().isEmpty()
+                    || !HOME_LAYOUT_ICON_PATTERN.matcher(icon.asText()).matches())) {
+                throw new BizException(ErrorCode.PARAM_ERROR,
+                        "quick_links 项 icon 须为内置图标标识符（小写字母/数字/短横线，如 zhaosheng）");
+            }
         }
     }
 
@@ -496,7 +572,7 @@ public class SiteService {
         }
     }
 
-    /** 区块内手填链接统一校验（quick_links 项 / notice_bar url） */
+    /** 区块内手填链接统一校验（quick_links 项 / notice_bar url / featured_topics ctaUrl / video_tour url） */
     private void requireLayoutLink(JsonNode url, String what) {
         if (url == null || !url.isTextual() || !HOME_LAYOUT_LINK_PATTERN.matcher(url.asText().trim()).matches()) {
             throw new BizException(ErrorCode.PARAM_ERROR,
@@ -504,6 +580,118 @@ public class SiteService {
         }
     }
 
+    /** 区块内图片资产校验（站点上传路径 / 开头或 http(s) 地址） */
+    private void requireLayoutAsset(JsonNode asset, String what) {
+        if (asset == null || !asset.isTextual() || !ASSET_PATTERN.matcher(asset.asText().trim()).matches()) {
+            throw new BizException(ErrorCode.PARAM_ERROR,
+                    what + " 须为站点上传路径（/ 开头）或 http(s) 地址");
+        }
+    }
+
+    /** stats_band（docs/20 D-1）：stats 数组 1~8 项，每项 {label ≤20, value ≤10, unit ≤10, icon 可选} */
+    private void validateStatsBandBlock(JsonNode block) {
+        JsonNode stats = block.get("stats");
+        if (stats == null || !stats.isArray() || stats.size() == 0) {
+            throw new BizException(ErrorCode.PARAM_ERROR, "stats_band 区块必须填写 stats（统计项数组）");
+        }
+        if (stats.size() > HOME_LAYOUT_MAX_STATS) {
+            throw new BizException(ErrorCode.PARAM_ERROR,
+                    "stats_band stats 不能超过 " + HOME_LAYOUT_MAX_STATS + " 项");
+        }
+        for (JsonNode item : stats) {
+            if (!item.isObject()) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "stats_band stats 每项必须是对象（{label, value, unit}）");
+            }
+            JsonNode label = item.get("label");
+            if (label == null || !label.isTextual() || label.asText().trim().isEmpty()
+                    || label.asText().trim().length() > 20) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "stats_band 项 label 须为不超过 20 字的文本");
+            }
+            JsonNode value = item.get("value");
+            if (value == null || !value.isTextual() || value.asText().trim().isEmpty()
+                    || value.asText().trim().length() > 10) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "stats_band 项 value 须为不超过 10 字的数字文本（如 3.2 万）");
+            }
+            JsonNode unit = item.get("unit");
+            if (unit != null && (!unit.isTextual() || unit.asText().length() > 10)) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "stats_band 项 unit 须为不超过 10 字的文本");
+            }
+            JsonNode icon = item.get("icon");
+            if (icon != null && (!icon.isTextual() || icon.asText().isEmpty()
+                    || !HOME_LAYOUT_ICON_PATTERN.matcher(icon.asText()).matches())) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "stats_band 项 icon 须为内置图标标识符");
+            }
+        }
+    }
+
+    /** featured_topics（docs/20 D-3）：items 1~6 项，每项 {title ≤50, description ≤200, image 资产, ctaText ≤20, ctaUrl 链接} */
+    private void validateFeaturedTopicsBlock(JsonNode block) {
+        JsonNode items = block.get("items");
+        if (items == null || !items.isArray() || items.size() == 0) {
+            throw new BizException(ErrorCode.PARAM_ERROR, "featured_topics 区块必须填写 items（专题卡数组）");
+        }
+        if (items.size() > HOME_LAYOUT_MAX_TOPICS) {
+            throw new BizException(ErrorCode.PARAM_ERROR,
+                    "featured_topics items 不能超过 " + HOME_LAYOUT_MAX_TOPICS + " 项");
+        }
+        for (JsonNode item : items) {
+            if (!item.isObject()) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "featured_topics items 每项必须是对象");
+            }
+            JsonNode title = item.get("title");
+            if (title == null || !title.isTextual() || title.asText().trim().isEmpty()
+                    || title.asText().trim().length() > 50) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "featured_topics 项 title 须为不超过 50 字的文本");
+            }
+            JsonNode description = item.get("description");
+            if (description != null && (!description.isTextual() || description.asText().length() > 200)) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "featured_topics 项 description 不能超过 200 字");
+            }
+            requireLayoutAsset(item.get("image"), "featured_topics 项 image");
+            JsonNode ctaText = item.get("ctaText");
+            if (ctaText != null && (!ctaText.isTextual() || ctaText.asText().length() > 20)) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "featured_topics 项 ctaText 不能超过 20 字");
+            }
+            if (item.has("ctaUrl")) {
+                requireLayoutLink(item.get("ctaUrl"), "featured_topics 项");
+            }
+        }
+    }
+
+    /** video_tour（docs/20 D-5）：cover 资产 + url 链接 + title ≤100 */
+    private void validateVideoTourBlock(JsonNode block) {
+        requireLayoutAsset(block.get("cover"), "video_tour cover");
+        requireLayoutLink(block.get("url"), "video_tour");
+    }
+
+    /** badges（docs/20 D-9）：badgeItems 1~8 项，每项 {label ≤20, desc ≤50, image 资产}
+     *  （键名与前端 cleanBlock 序列化一致——避免与 quick_links/featured_topics 的 items 语义混淆） */
+    private void validateBadgesBlock(JsonNode block) {
+        JsonNode items = block.get("badgeItems");
+        if (items == null || !items.isArray() || items.size() == 0) {
+            throw new BizException(ErrorCode.PARAM_ERROR, "badges 区块必须填写 items（徽章数组）");
+        }
+        if (items.size() > HOME_LAYOUT_MAX_BADGES) {
+            throw new BizException(ErrorCode.PARAM_ERROR,
+                    "badges items 不能超过 " + HOME_LAYOUT_MAX_BADGES + " 项");
+        }
+        for (JsonNode item : items) {
+            if (!item.isObject()) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "badges items 每项必须是对象");
+            }
+            JsonNode label = item.get("label");
+            if (label == null || !label.isTextual() || label.asText().trim().isEmpty()
+                    || label.asText().trim().length() > 20) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "badges 项 label 须为不超过 20 字的文本");
+            }
+            JsonNode desc = item.get("desc");
+            if (desc != null && (!desc.isTextual() || desc.asText().length() > 50)) {
+                throw new BizException(ErrorCode.PARAM_ERROR, "badges 项 desc 不能超过 50 字");
+            }
+            requireLayoutAsset(item.get("image"), "badges 项 image");
+        }
+    }
+
     /**
      * custom_css 校验（B3，服务端强校验）：长度 ≤10240；黑名单忽略大小写拒绝
      * {@code </style}（逃逸内联 style 块）、{@code <script}、{@code @import}（外链样式注入）、

src/main/java/com/yunhai/cms/svcitem/config/OpenApiAuthEnforceConfiguration.java

@@ -1,49 +0,0 @@
-package com.yunhai.cms.svcitem.config;
-
-import com.yunhai.platform.appauth.AppAuthFilter;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 开放接口签名强制（事项库详细设计 §3.4，照 UserBase OpenApiAuthEnforceConfiguration 范式）：
- * yh-app-auth 的 {@link AppAuthFilter}（order +10，全路由）设计为「无签名头则放行」以兼容浏览器
- * CAS 流；本过滤器（order +11）只挂 /oapi/**，校验其写入的请求属性——已验签放行，否则 401。
- * CMS 的 /oapi/** 无用户会话语义，一律应用签名（X-App-Key/X-Timestamp/X-Signature 三件套）。
- */
-@Configuration
-public class OpenApiAuthEnforceConfiguration {
-
-    @Bean
-    public FilterRegistrationBean<RequireAppSignFilter> requireAppSignFilter() {
-        FilterRegistrationBean<RequireAppSignFilter> bean = new FilterRegistrationBean<>();
-        bean.setFilter(new RequireAppSignFilter());
-        bean.addUrlPatterns("/oapi/*");
-        bean.setOrder(Ordered.HIGHEST_PRECEDENCE + 11);
-        return bean;
-    }
-
-    public static class RequireAppSignFilter implements Filter {
-        @Override
-        public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-                throws IOException, ServletException {
-            HttpServletRequest req = (HttpServletRequest) request;
-            HttpServletResponse res = (HttpServletResponse) response;
-            if (req.getAttribute(AppAuthFilter.APP_AUTH_ATTR) == null) {
-                res.sendError(HttpServletResponse.SC_UNAUTHORIZED, "missing app signature");
-                return;
-            }
-            chain.doFilter(request, response);
-        }
-    }
-}

src/main/java/com/yunhai/cms/svcitem/service/impl/SvcHallClient.java

@@ -15,7 +15,7 @@ import java.util.Map;
 
 /**
  * 办事大厅开放接口客户端（V2.0 Part C.3）：经 SDK {@link YschOpenCall} 命名目标
- * {@code svchall}（服务目录 {@code yh.open.services.svchall}）调 svc-hall {@code /oapi/svc/**}；
+ * {@code svc-hall}（服务目录 {@code yh.open.services.svc-hall}）调 svc-hall {@code /oapi/svc/**}；
  * 出站签名/信封解包/错误映射全部由 SDK 承载——本应用零专属地址配置
  * （《子应用配置优化方案》§4.2）。<br><br>
  * <b>为何不能再用共享 {@code IDHttp}</b>：svc-hall 带 context-path {@code /svc-hall}，而共享
@@ -26,7 +26,7 @@ import java.util.Map;
  * <b>错误语义</b>：业务失败信封 {@code code!=0} → {@code DException}（携带 OpenApiErrorCode，
  * 办事大厅"不存在/未发布"= code 2）；传输/HTTP 失败 → {@code OpenApiException}；401/403 →
  * {@code DException("验签失败")}。降级判定见 {@code SvcItemRemoteQuery}。<br><br>
- * 目录未显式配置时回落 legacy {@code yh.svchall.base-url}（迁移期兼容）；两者皆无则构造期
+ * 目录未显式配置时回落 legacy {@code yh.svc-hall.base-url}（迁移期兼容）；两者皆无则构造期
  * fail-fast——不给"沉默连不上 localhost"的假象。
  */
 @Component
@@ -35,9 +35,9 @@ public class SvcHallClient {
     private static final Logger log = LoggerFactory.getLogger(SvcHallClient.class);
 
     /** 服务目录命名目标（svc-hall 未晋升 PlatformService 枚举，按名直调） */
-    static final String DIRECTORY_KEY = "svchall";
+    static final String DIRECTORY_KEY = "svc-hall";
 
-    private static final String LEGACY_KEY = "yh.svchall.base-url";
+    private static final String LEGACY_KEY = "yh.svc-hall.base-url";
 
     private final YschOpenCall openCall;
     private final IDHttp http;
@@ -46,7 +46,7 @@ public class SvcHallClient {
 
     public SvcHallClient(YschOpenCall openCall,
                          IDHttp http,
-                         @Value("${yh.svchall.base-url:}") String baseUrl) {
+                         @Value("${yh.svc-hall.base-url:}") String baseUrl) {
         this.openCall = openCall;
         this.http = http;
         this.directoryResolved = openCall != null && openCall.hasTarget(DIRECTORY_KEY);

src/main/java/com/yunhai/cms/theme/ThemeParam.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -47,6 +48,13 @@ public class ThemeParam {
 
     private List<Option> options;
 
+    /**
+     * docs/20 E（colorScheme 配色预设）：select 参数可携带「选项值 → CSS 变量组」映射——
+     * 选中某选项时整组变量并入 :root{}（值逐一过 COLOR_PATTERN，非法丢弃）。
+     * 供伪主题合并：色皮档 4 套并 default、骨架克隆档 6 套并 scholar-blue。
+     */
+    private Map<String, Map<String, String>> presets;
+
     /** 值是否合法（按参数类型；null/空一律不合法，方案 §5.3） */
     public boolean isValidValue(String value) {
         if (value == null || value.isEmpty()) {

src/main/java/com/yunhai/cms/theme/ThemeRegistry.java

@@ -44,6 +44,44 @@ public class ThemeRegistry {
     public static final String SOURCE_BUILTIN = "builtin";
     public static final String SOURCE_EXTERNAL = "external";
 
+    /**
+     * docs/20 E（激进清场）下架主题别名表：原主题名 → [保留主题, colorScheme 预设值]。
+     * 存量站点 theme 仍写下架名时按本表解析（R-46：门户不断渲染，不 404）；
+     * 站点下次保存时由 SiteService 归一化为保留主题 + config.theme_params.colorScheme。
+     */
+    private static final java.util.Map<String, String[]> DEPRECATED_ALIASES = java.util.Collections.unmodifiableMap(
+            new java.util.LinkedHashMap<String, String[]>() {{
+                // 色皮档 4 套 → default 预设
+                put("blue-white", new String[] {DEFAULT_THEME, "blue-white"});
+                put("classic-red", new String[] {DEFAULT_THEME, "classic-red"});
+                put("fresh-mint", new String[] {DEFAULT_THEME, "fresh-mint"});
+                put("warm-kinder", new String[] {DEFAULT_THEME, "warm-kinder"});
+                // 骨架克隆档 6 套 → scholar-blue 预设
+                put("academic-navy", new String[] {"scholar-blue", "navy"});
+                put("campus-azure", new String[] {"scholar-blue", "azure"});
+                put("poly-blue", new String[] {"scholar-blue", "poly"});
+                put("agri-forest", new String[] {"scholar-blue", "agri"});
+                put("jade-normal", new String[] {"scholar-blue", "jade"});
+                put("mint-breeze", new String[] {"scholar-blue", "mint"});
+            }});
+
+    /** 下架别名解析结果：target=保留主题名；colorScheme=对应预设值（可能为 null） */
+    public static final class AliasInfo {
+        public final String target;
+        public final String colorScheme;
+
+        AliasInfo(String target, String colorScheme) {
+            this.target = target;
+            this.colorScheme = colorScheme;
+        }
+    }
+
+    /** 下架别名解析：非别名返回 null */
+    public static AliasInfo aliasOf(String name) {
+        String[] mapped = name == null ? null : DEPRECATED_ALIASES.get(name);
+        return mapped == null ? null : new AliasInfo(mapped[0], mapped[1]);
+    }
+
     /** 包名与目录名约束（方案 §4.1） */
     private static final Pattern NAME_PATTERN = Pattern.compile("^[a-z][a-z0-9-]{1,30}[a-z0-9]$");
 

src/main/java/com/yunhai/cms/theme/ThemeVarsCss.java

@@ -23,15 +23,23 @@ public final class ThemeVarsCss {
         }
         StringBuilder sb = new StringBuilder(":root{");
         for (ThemeParam p : theme.getParams()) {
-            if (!p.isCssVarParam()) {
-                continue;
-            }
             String value = params.get(p.getKey());
-            // 双重校验（方案 §9 注入面）：入口已过滤，此处仍只拼通过 color 正则的值
             if (value == null || !p.isValidValue(value)) {
                 continue;
             }
-            sb.append(p.getCssVar()).append(':').append(value).append(';');
+            if (p.isCssVarParam()) {
+                // 双重校验（方案 §9 注入面）：入口已过滤，此处仍只拼通过 color 正则的值
+                sb.append(p.getCssVar()).append(':').append(value).append(';');
+            } else if (p.getPresets() != null && p.getPresets().containsKey(value)) {
+                // docs/20 E：select 参数携带 presets（colorScheme → 变量组）时，选中值对应的
+                // 整组变量并入输出（每个值仍过 COLOR_PATTERN，非法丢弃——注入面与 color 参数同标）
+                p.getPresets().get(value).forEach((cssVar, color) -> {
+                    if (cssVar != null && cssVar.matches("^--[a-zA-Z][\\w-]*$")
+                            && color != null && ThemeParam.COLOR_PATTERN.matcher(color).matches()) {
+                        sb.append(cssVar).append(':').append(color).append(';');
+                    }
+                });
+            }
         }
         return sb.length() == 6 ? "" : sb.append('}').toString();
     }

src/main/java/com/yunhai/cms/utils/SvcHallLinks.java

@@ -0,0 +1,44 @@
+package com.yunhai.cms.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * 「我要办理」深链构造器（T4 回跳闭环，2026-10-03 执行方案）。
+ * 纯函数无状态：base 尾斜杠裁剪、参数 UTF-8 urlencode、from 缺省不追加。
+ */
+public final class SvcHallLinks {
+
+    private SvcHallLinks() {
+    }
+
+    /**
+     * 「我要办理」深链（双端契约：hall/src/router/routes.ts 依赖此形态，改参数名两侧同步）。
+     *
+     * @param base     svc-hall hall 部署基地址（站点 svc_hall_base，尾斜杠容忍）
+     * @param siteCode 站点编码
+     * @param itemCode 事项编码
+     * @param fromUrl  指南页绝对 URL（回跳地址；null/空=不追加 from 段，hall 不显示返回门户）
+     */
+    public static String build(String base, String siteCode, String itemCode, String fromUrl) {
+        String url = trimTail(base) + "/#/apply?siteCode=" + enc(siteCode)
+                + "&itemCode=" + enc(itemCode);
+        return fromUrl == null || fromUrl.isEmpty() ? url : url + "&from=" + enc(fromUrl);
+    }
+
+    private static String trimTail(String url) {
+        String s = url == null ? "" : url.trim();
+        while (s.endsWith("/")) {
+            s = s.substring(0, s.length() - 1);
+        }
+        return s;
+    }
+
+    private static String enc(String value) {
+        try {
+            return URLEncoder.encode(value, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            return value;
+        }
+    }
+}

src/main/resources/application.yml

@@ -60,8 +60,18 @@ yh:
     # UserBase 注册后分配（进白名单），与 yh.open 保持一致；生产由 projman 注入
     app-key: 100005
     app-secret: 2c7885de594742cc840b8762910b2d2e
-    # 入站验签白名单：办事大厅 svc-hall（站点目录 /oapi/site/list 消费方，appKey=100018；
-    # P0-1 修复）。secret 与 svc-hall application.yml yh.app-auth.app-secret 逐字一致（联调态），
+    # 提供方强制验签（两级模型 §4.1，flow-center/Notice 同款）：本地 svcitem/config/
+    # OpenApiAuthEnforceConfiguration 副本已删（2026-10-05），换此一行——/oapi/**（站点目录
+    # /oapi/site/list）无签名三件套即 401（starter 版 RequireAppSignFilter，order +11 行为等价）
+    server:
+      enforce-patterns: [/oapi/*]
+    # 中央密钥链（两级模型 §4.2）：trusted-apps 先（确定性兜底），未命中走 SignKeyResolver
+    # （Redis sign:app:* → Caffeine → UserBase 兜底端点）——任何在 UserBase 注册过的 appKey
+    # 自动可验。需 data-redis 编译期依赖（yh-app-auth 侧 optional 不传递，pom 已提升 scope）
+    trust-registry: true
+    # 入站验签白名单（组合链第一层，Redis 停摆时确定性工作）：办事大厅 svc-hall
+    # （站点目录 /oapi/site/list 消费方，appKey=100018；P0-1 修复）。
+    # secret 与 svc-hall application.yml yh.app-auth.app-secret 逐字一致（联调态），
     # 生产两侧由 projman/Nacos 注入同一密钥对
     trusted-apps:
       "100018": "svc-hall-dev-secret-100018"
@@ -74,11 +84,11 @@ yh:
     # per-target base-path 与提供方 context-path 对齐 → 签名天然一致）。
     # 容器直连形态（生产）：http://svc-hall-service:10007/svc-hall（网关无 /oapi 路由）。
     services:
-      svchall: http://localhost:8086
+      svc-hall: http://localhost:8086
   # 办事大厅（svc-hall）对接（V2.0 Part C.3）：门户 service/guide 数据源。
   # 双向信任：CMS 出站签名用 yh.app-auth 身份（appKey=100005，办事大厅侧须在 UserBase
   # 注册表内可用）；入站收 svc-hall 站点目录调用（appKey=100018，见上方 trusted-apps）。
-  # 地址不再单独配置：见上方 yh.open.services.svchall（原 yh.svchall.base-url 已删）。
+  # 地址不再单独配置：见上方 yh.open.services.svc-hall（私有 legacy 回落键已随 D1 目录键归一同步改名）。
   # env-config 管理端运行时配置（免登录 GET /api/env-config?target=admin，数据源见
   # config/PropertyEnvConfigSource：聚合 starter 自动装配，有 bean 即注册端点）。
   # 本地无需配值（前端 dev 走 .env.dev）；线上值经环境变量 YH_ENV_CONFIG_SOURCE_ADMIN
@@ -104,7 +114,7 @@ cms:
     item:
       # 【V2.0 拆分遗留说明】事项库已迁独立"办事大厅"应用（svc-hall），CMS 侧 SvcItemQuery
       # 由 SvcItemRemoteQuery 经 oapi 调办事大厅；本配置已废弃（部门口径归办事大厅
-      # svchall.item.dept-group-type）。保留注释防误解。
+      # svc-hall.item.dept-group-type）。保留注释防误解。
       dept-group-type: 7
 
 
@@ -120,6 +130,11 @@ management:
   endpoint:
     health:
       show-details: never
+  # 密钥链验签依赖 Redis（sign:app:*）。关掉 Redis 健康指标：Redis 抖动不应把 /actuator/health
+  # 拉成 DOWN(503)，否则部署健康检查与探活会误判整机不可用（Notice/flow-center/svc-hall 同口径）
+  health:
+    redis:
+      enabled: false
 
 # 文件上传（同 UserHome 双 key 约定，方案 §7.3）
 # FILE_WEB_PATH 只接受相对路径（默认 /cms/upload/，含 context-path）或公网可达绝对地址；

src/main/resources/sql/docs20_home_components.sql

@@ -0,0 +1,31 @@
+-- ============================================================
+-- docs/20 D-3/D-6/D-7：首页新组件库数据结构变更（DDL 供 DBA 审阅，不自动执行）
+-- 日期：2026-09-28
+-- 说明：应用侧由 JPA ddl-auto=update 自动建列/建表；本脚本为生产发布前
+--       人工变更单底稿。执行前请备份相关表。
+-- ============================================================
+
+-- ① cms_banner 扩展列（D-3 专题大卡位 topic / D-6 学术活动位 event；均可空，老数据不受影响）
+ALTER TABLE cms_banner
+    ADD COLUMN description VARCHAR(500) NULL COMMENT '专题大卡描述（position=topic）' AFTER status,
+    ADD COLUMN cta_text    VARCHAR(100) NULL COMMENT '专题大卡 CTA 按钮文字（position=topic）' AFTER description,
+    ADD COLUMN cta_url     VARCHAR(500) NULL COMMENT '专题大卡 CTA 跳转地址（position=topic）' AFTER cta_text,
+    ADD COLUMN event_date  DATETIME     NULL COMMENT '活动日期（position=event）' AFTER cta_url,
+    ADD COLUMN location    VARCHAR(200) NULL COMMENT '活动地点（position=event）' AFTER event_date;
+
+-- ② cms_person 新表（D-7 名师风采，people 区块数据源）
+CREATE TABLE cms_person (
+    id          INT AUTO_INCREMENT PRIMARY KEY,
+    site_id     INT          NOT NULL COMMENT '所属站点（cms_site.id）',
+    name        VARCHAR(100) NOT NULL COMMENT '姓名',
+    title       VARCHAR(100) NULL COMMENT '头衔/职称',
+    bio         VARCHAR(500) NULL COMMENT '一句话简介',
+    avatar      VARCHAR(500) NULL COMMENT '头像 URL（/cms/upload/** 或 http(s)，空=首字徽章兜底）',
+    category_id INT          NULL COMMENT '所属栏目外键（cms_category.id，空=未分组）',
+    sort_no     INT          NOT NULL DEFAULT 0 COMMENT '同级排序（升序）',
+    status      INT          NOT NULL DEFAULT 1 COMMENT '0=停用 1=启用',
+    create_time DATETIME     NULL,
+    update_time DATETIME     NULL,
+    KEY idx_person_site (site_id, status, sort_no),
+    KEY idx_person_category (category_id)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT = '名师风采人物（docs/20 D-7）';

src/main/resources/templates/themes/academic-navy/README.md

@@ -1,33 +0,0 @@
-# academic-navy（学府藏蓝）
-
-高校官网风皮肤包：以 `scholar-blue` 为基座派生，配色与首页区块形态按综合类大学官网（浙江理工大学一类）重做。
-配了 `home_layout` 的站点，首页正文区块由本主题 `fragments/home-blocks.html` 渲染——派生包不自带区块形态时，
-正文会落到 `themes/common` 的通用骨架，换肤就只剩页头页脚（线上事故根因，见《审计验收清单-20260919》）。
-
-## 风格定位
-
-- 主色藏蓝 `#0b4a8f` + 加深 `#063161` + 点缀金 `#b8934a`（标题左竖条与居中线脚走金线，区别于基座的全蓝语言）。
-- 圆角收紧到 4/8px、页脚 `#0a2b4d`，行高压到 40px 一档，整体比基座更「机关报」而非「校园活动页」。
-- 全部 11 个颜色参数可在站点 theme_params 微调（`primary/primaryDark/primaryLight/accent/navBg/footerBg/text/textLight/bg/cardBg/border`）。
-
-## 首页区块形态（布局模式与回落模式同构）
-
-| homeStyle | 呈现 | 类名 |
-| -- | -- | -- |
-| `news_grid` | 双栏要闻：左 3 份图文头条（16:7 封面 + 摘要 + 元信息）、右 2 份紧凑行；区块背景可取站点 `news_bg_image` | `an-split` / `an-feat-*` |
-| `compact` | 日期方块行：46px 见方的「日 + 年月」方块，hover 反白 | `an-date-chip` |
-| `media_focus` | 媒体聚焦：来源徽标 + 双列密行 | `an-src` / `an-block-list--two` |
-| `image_wall` | 四列图片墙：封面 + 底部渐变遮罩标题，hover 抬图 | `an-wall` |
-| （空/未知） | 整宽区块卡：头条 + 行式列表 | `an-block--flow` |
-| `ticker` | 藏蓝要闻速递横条（单行不换行、超长省略，中文不塌列） | `an-ticker*` |
-| `gallery` | 线上展厅：居中双语文区头 + 四列图墙 | `an-gallery` |
-| `links` | 友情链接分组（胶囊标签行） | `an-links` |
-
-## 契约要点
-
-- 结构类前缀 `an-`，CSS 变量前缀 `--an-`；`:root` 把 `--an-*` 别名到皮肤契约变量（`--primary`/`--text`/`--card-bg`/`--border`…），
-  使 `themes/common` 兜底骨架也能跟随本皮肤着色。
-- 空态文案「栏目暂无内容」只在 `block.items` 为空时出现；守卫必须写在 `th:block` 外层——
-  `th:replace`（优先级 100）先于 `th:if`（300）求值，写在同一标签上等于没写。
-- 回归防线：`AcademicSkinContractTest`（自带区块 fragment + 中文不塌列 + 契约变量别名 + 主色必须学术蓝）、
-  `PortalHomeLayoutIT#academicNavy_layoutUsesOwnFragments`（布局模式不落通用骨架）、`ThemeContractIT`（7 条路由）。

src/main/resources/templates/themes/academic-navy/assets/favicon.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96">
-  <rect width="96" height="96" rx="20" fill="#0a5aa8"/>
-  <path d="M48 16l8.6 17.5 19.3 2.8-14 13.6 3.3 19.2L48 60.1 30.8 69.1l3.3-19.2-14-13.6 19.3-2.8L48 16z" fill="#ffffff"/>
-</svg>

src/main/resources/templates/themes/academic-navy/assets/js/main.js

@@ -1,190 +0,0 @@
-/* academic-navy 主题脚本：顶栏日期 + 轮播(圆点/箭头/触摸) + 导航吸顶反蓝 + 移动端抽屉与二级手风琴。
-   与 default 同源逻辑，无任何外部依赖。 */
-(function () {
-  'use strict';
-
-  /* ---------- 顶栏日期（本地时间，YYYY年M月D日 星期X） ---------- */
-  var dateEl = document.getElementById('siteDate');
-  if (dateEl) {
-    var now = new Date();
-    var week = ['日', '一', '二', '三', '四', '五', '六'][now.getDay()];
-    dateEl.textContent = now.getFullYear() + '年' + (now.getMonth() + 1) + '月'
-      + now.getDate() + '日 星期' + week;
-  }
-
-  /* ---------- 导航吸顶反蓝（桌面端；≤768 不吸顶） ---------- */
-  var nav = document.getElementById('anNav');
-  var DESKTOP_MIN = 769;
-  var navBaseTop = 0;
-  var holder = null;
-
-  function measureNavTop() {
-    unlockNav();
-    navBaseTop = nav.getBoundingClientRect().top + window.pageYOffset;
-  }
-
-  function lockNav() {
-    if (!nav.classList.contains('an-nav--fixed')) {
-      holder = document.createElement('div');
-      holder.className = 'an-nav-holder';
-      holder.style.height = nav.offsetHeight + 'px';
-      nav.parentNode.insertBefore(holder, nav);
-      nav.classList.add('an-nav--fixed');
-    } else if (holder) {
-      holder.style.height = nav.offsetHeight + 'px';
-    }
-  }
-
-  function unlockNav() {
-    nav.classList.remove('an-nav--fixed');
-    if (holder && holder.parentNode) {
-      holder.parentNode.removeChild(holder);
-    }
-    holder = null;
-  }
-
-  function onScrollNav() {
-    if (window.innerWidth < DESKTOP_MIN) {
-      unlockNav();
-      return;
-    }
-    if (window.pageYOffset > navBaseTop) {
-      lockNav();
-    } else {
-      unlockNav();
-    }
-  }
-
-  if (nav) {
-    measureNavTop();
-    window.addEventListener('scroll', onScrollNav, { passive: true });
-    var resizeTimer = null;
-    window.addEventListener('resize', function () {
-      if (resizeTimer) { window.clearTimeout(resizeTimer); }
-      resizeTimer = window.setTimeout(function () {
-        measureNavTop();
-        onScrollNav();
-      }, 150);
-    });
-  }
-
-  /* ---------- 移动端抽屉 + 二级手风琴 ---------- */
-  var navToggle = document.querySelector('.an-nav-toggle');
-  var navList = document.querySelector('.an-nav-list');
-
-  if (navToggle && navList) {
-    navToggle.addEventListener('click', function () {
-      var open = navList.classList.toggle('an-open');
-      navToggle.setAttribute('aria-expanded', open ? 'true' : 'false');
-    });
-  }
-
-  /* 窄屏下：点击带二级的项先展开面板，再点才跳转；宽屏交还给 CSS hover */
-  if (navList) {
-    navList.addEventListener('click', function (e) {
-      if (window.innerWidth >= DESKTOP_MIN) { return; }
-      var link = e.target.closest ? e.target.closest('a') : null;
-      if (!link) { return; }
-      var li = link.parentElement;
-      if (!li || !li.classList.contains('has-sub')) { return; }
-      var sub = li.querySelector('.an-sub');
-      if (!sub) { return; }
-      if (!li.classList.contains('an-sub-open')) {
-        e.preventDefault();
-        li.classList.add('an-sub-open');
-      }
-    });
-  }
-
-  /* ---------- 首页轮播 ---------- */
-  var root = document.querySelector('.an-banner');
-  var slides = document.querySelectorAll('.an-banner-slide');
-  var dots = document.querySelectorAll('.an-banner-dots button');
-  var prevBtn = document.querySelector('.an-banner-arrow.prev');
-  var nextBtn = document.querySelector('.an-banner-arrow.next');
-  if (!slides.length || !root) {
-    return;
-  }
-  var current = 0;
-  var timer = null;
-  var INTERVAL = 5000;
-
-  function show(index) {
-    slides[current].classList.remove('active');
-    if (dots[current]) {
-      dots[current].classList.remove('active');
-    }
-    current = (index + slides.length) % slides.length;
-    slides[current].classList.add('active');
-    if (dots[current]) {
-      dots[current].classList.add('active');
-    }
-  }
-
-  function start() {
-    stop();
-    if (slides.length > 1) {
-      timer = window.setInterval(function () {
-        show(current + 1);
-      }, INTERVAL);
-    }
-  }
-
-  function stop() {
-    if (timer) {
-      window.clearInterval(timer);
-      timer = null;
-    }
-  }
-
-  dots.forEach(function (dot, index) {
-    dot.addEventListener('click', function () {
-      show(index);
-      start();
-    });
-  });
-  if (prevBtn) {
-    prevBtn.addEventListener('click', function () {
-      show(current - 1);
-      start();
-    });
-  }
-  if (nextBtn) {
-    nextBtn.addEventListener('click', function () {
-      show(current + 1);
-      start();
-    });
-  }
-  root.addEventListener('mouseenter', stop);
-  root.addEventListener('mouseleave', start);
-  root.addEventListener('focusin', stop);
-  root.addEventListener('focusout', start);
-  root.setAttribute('tabindex', '-1');
-  root.addEventListener('keydown', function (e) {
-    if (e.key === 'ArrowLeft') {
-      show(current - 1);
-      start();
-    } else if (e.key === 'ArrowRight') {
-      show(current + 1);
-      start();
-    }
-  });
-
-  /* 触摸滑动切页 */
-  var touchX = null;
-  root.addEventListener('touchstart', function (e) {
-    touchX = e.changedTouches[0].clientX;
-    stop();
-  }, { passive: true });
-  root.addEventListener('touchend', function (e) {
-    if (touchX === null) { return; }
-    var dx = e.changedTouches[0].clientX - touchX;
-    if (Math.abs(dx) > 40) {
-      show(dx < 0 ? current + 1 : current - 1);
-    }
-    touchX = null;
-    start();
-  }, { passive: true });
-
-  start();
-})();

src/main/resources/templates/themes/academic-navy/detail.html

@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="an-page an-container" id="main-content">
-    <div class="an-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="an-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="an-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="an-side-nav-list">
-                <li class="an-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="an-page-card">
-        <nav class="an-crumb" aria-label="面包屑">
-            <a th:href="${url.home()}">首页</a>
-            <th:block th:each="node : ${categoryPath}">
-                <span class="an-crumb-sep" aria-hidden="true">/</span>
-                <a class="crumb-parent" th:href="${url.category(node.id)}" th:text="${node.name}">栏目</a>
-            </th:block>
-            <span class="an-crumb-sep" th:if="${currentCategoryId != null}" aria-hidden="true">/</span>
-            <span class="an-crumb-current">正文</span>
-        </nav>
-
-        <article class="an-article">
-            <h1 class="an-article-title" th:text="${article.title}">文章标题</h1>
-            <div class="an-article-meta">
-                <time th:if="${article.publishTime != null}"
-                      th:text="${#temporals.format(article.publishTime, 'yyyy-MM-dd HH:mm')}">2026-01-01 10:00</time>
-                <span th:if="${!#strings.isEmpty(article.authorName)}"
-                      th:text="'作者：' + ${article.authorName}">作者</span>
-                <span th:if="${!#strings.isEmpty(article.source)}"
-                      th:text="'来源：' + ${article.source}">来源</span>
-                <span th:text="'浏览量：' + ${article.viewCount}">浏览量</span>
-            </div>
-            <!-- 正文：入库前已经 jsoup 白名单清洗（方案 §8.5），此处允许 utext；
-                 其余字段一律 th:text 转义输出 -->
-            <div class="an-article-content" th:utext="${article.content}">正文</div>
-        </article>
-
-        <nav class="an-sibling" aria-label="上下篇导航">
-            <a th:if="${prevArticle != null}" class="an-sib prev"
-               th:href="${url.article(prevArticle.id)}">
-                <span class="an-sib-label">上一篇</span>
-                <span class="an-sib-title" th:text="${prevArticle.title}">上一篇标题</span>
-            </a>
-            <span class="an-sib-none prev" th:if="${prevArticle == null}">
-                <span class="an-sib-label">上一篇</span>
-                <span class="an-sib-title">已经是最早一篇</span>
-            </span>
-            <a th:if="${nextArticle != null}" class="an-sib next"
-               th:href="${url.article(nextArticle.id)}">
-                <span class="an-sib-label">下一篇</span>
-                <span class="an-sib-title" th:text="${nextArticle.title}">下一篇标题</span>
-            </a>
-            <span class="an-sib-none next" th:if="${nextArticle == null}">
-                <span class="an-sib-label">下一篇</span>
-                <span class="an-sib-title">已是最新一篇</span>
-            </span>
-        </nav>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/academic-navy/fragments/footer.html

@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- academic-navy 公共页脚：深蓝渐变底 + 同心圆环纹理(CSS 绘制) + 三栏(品牌/联系备案/友链分组) + 底条校名。
-     数据绑定与 default 契约一致（linkGroups/contact/copyright/beian/logo/schName），仅换皮。 -->
-<footer class="an-footer" th:fragment="footer">
-    <i class="an-ring an-ring--1" aria-hidden="true"></i>
-    <i class="an-ring an-ring--2" aria-hidden="true"></i>
-    <i class="an-ring an-ring--3" aria-hidden="true"></i>
-
-    <div class="an-footer-inner">
-        <!-- 品牌栏 -->
-        <div class="an-footer-brand">
-            <span class="an-footer-badge" th:if="${site.config['logo'] != null}">
-                <img class="an-footer-logo" th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
-            </span>
-            <span class="an-footer-badge an-footer-badge--plain" th:if="${site.config['logo'] == null}" aria-hidden="true">
-                <svg viewBox="0 0 24 24" width="30" height="30" focusable="false">
-                    <path d="M12 2l2.4 4.9 5.4.8-3.9 3.8.9 5.4L12 14.4 7.2 16.9l.9-5.4L4.2 7.7l5.4-.8L12 2z"
-                          fill="currentColor"></path>
-                </svg>
-            </span>
-            <span class="an-footer-site" th:text="${site.name}">站点名称</span>
-        </div>
-
-        <!-- 联系/版权/备案 -->
-        <div class="an-footer-info">
-            <p class="an-footer-line" th:if="${site.config['contact'] != null}">
-                <i class="an-dot" aria-hidden="true"></i><span th:text="${site.config['contact']}">联系方式</span>
-            </p>
-            <p class="an-footer-line" th:if="${site.config['copyright'] != null}">
-                <i class="an-dot" aria-hidden="true"></i><span th:text="${site.config['copyright']}">版权信息</span>
-            </p>
-            <p class="an-footer-line" th:if="${site.config['beian'] != null}">
-                <i class="an-dot" aria-hidden="true"></i><span th:text="${site.config['beian']}">备案号</span>
-            </p>
-        </div>
-
-        <!-- 友情链接（分组渲染；无分组整栏不渲染） -->
-        <div class="an-footer-links" th:if="${!#lists.isEmpty(site.linkGroups)}">
-            <div class="an-links-group" th:each="group : ${site.linkGroups}"
-                 th:if="${!#lists.isEmpty(group.links)}">
-                <span class="an-group-name" th:text="${group.groupName}">分组</span>
-                <p class="an-links-row">
-                    <a th:each="link : ${group.links}" th:href="${link.linkUrl}" target="_blank" rel="noopener">
-                        <img th:if="${link.logoUrl != null and !#strings.isEmpty(link.logoUrl)}" class="link-logo"
-                             th:src="${url.upload(link.logoUrl)}" th:alt="${link.name}" loading="lazy">
-                        <span th:text="${link.name}">链接</span>
-                    </a>
-                </p>
-            </div>
-        </div>
-    </div>
-
-    <div class="an-footer-bottom">
-        <p th:if="${site.schName != null and !#strings.isEmpty(site.schName)}"
-           th:text="${site.schName}">学校名称</p>
-    </div>
-</footer>
-</html>

src/main/resources/templates/themes/academic-navy/fragments/head.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<!-- academic-navy 公共 head 片段：与 default 契约一致（pageTitle/seo/canonical/og/themeVarsCss/favicon 兜底） -->
-<head th:fragment="head">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title th:text="${pageTitle}">页面标题</title>
-    <meta name="description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}"
-          th:content="${seoDescription}">
-    <link rel="canonical" th:if="${canonical != null}" th:href="${canonical}">
-    <meta property="og:title" th:if="${pageTitle != null}" th:content="${pageTitle}">
-    <meta property="og:description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}" th:content="${seoDescription}">
-    <meta property="og:image" th:if="${ogImage != null}" th:content="${ogImage}">
-    <link rel="stylesheet" th:href="${url.asset('css/main.css')}">
-    <style th:if="${not #strings.isEmpty(themeVarsCss)}" th:utext="${themeVarsCss}"></style>
-    <!-- 站点级自定义样式（B3）：位于皮肤 CSS 与微调变量之后层叠覆盖；内容经服务端黑名单强校验后直出 -->
-    <style th:if="${not #strings.isEmpty(customCss)}" th:utext="${customCss}"></style>
-    <link rel="icon" type="image/png"
-          th:href="${site.config['favicon'] != null ? url.upload(site.config['favicon']) : url.asset('favicon.png')}">
-</head>
-</html>

src/main/resources/templates/themes/academic-navy/fragments/header.html

@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- academic-navy 公共头部：深蓝顶栏(日期+院系切换) + 深蓝品牌行(徽标+站名+圆角搜索) + 白底主导航(吸顶反蓝、
-     主蓝半透明下拉面板)。数据绑定与 default 契约一致，仅换皮。 -->
-<header class="an-header" th:fragment="header">
-    <a class="skip-link" href="#main-content">跳到主要内容</a>
-
-    <!-- 顶栏 -->
-    <div class="an-topbar">
-        <div class="an-topbar-inner">
-            <span class="an-topbar-date" id="siteDate" th:aria-label="'今日日期'">加载日期…</span>
-            <div class="an-topbar-side" th:if="${!site.colleges.isEmpty()}"
-                 th:with="collegesLabel=${site.config['colleges_label'] ?: '专业院系'}">
-                <div class="an-colleges">
-                    <span class="an-colleges-toggle">
-                        <a href="javascript:void(0)" th:text="${collegesLabel}">专业院系</a>
-                        <i class="an-colleges-arrow" aria-hidden="true">▾</i>
-                    </span>
-                    <ul class="an-colleges-menu">
-                        <li th:each="col : ${site.colleges}" th:classappend="${col.path == site.path} ? 'active'">
-                            <a th:href="${url.siteHome(col.path, col.publicBaseUrl)}"
-                               th:title="${col.name}" th:text="${col.name}">学院名称</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- 品牌行 -->
-    <div class="an-brandbar">
-        <div class="an-brandbar-inner">
-            <div class="an-brand">
-                <span class="an-brand-badge" th:if="${site.config['logo'] != null}">
-                    <img class="an-logo" th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
-                </span>
-                <span class="an-brand-badge an-brand-badge--plain" th:if="${site.config['logo'] == null}" aria-hidden="true">
-                    <svg viewBox="0 0 24 24" width="26" height="26" focusable="false">
-                        <path d="M12 2l2.4 4.9 5.4.8-3.9 3.8.9 5.4L12 14.4 7.2 16.9l.9-5.4L4.2 7.7l5.4-.8L12 2z"
-                              fill="currentColor"></path>
-                    </svg>
-                </span>
-                <a class="an-site-name" th:href="${url.home()}" th:text="${site.name}">站点名称</a>
-            </div>
-            <form class="an-search" th:action="${url.search('', null)}" method="get" role="search">
-                <input type="text" name="q" placeholder="请输入关键字…" aria-label="站内搜索">
-                <button type="submit" aria-label="搜索">
-                    <svg viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
-                        <path d="M10.5 3a7.5 7.5 0 015.9 12.1l4.3 4.3-1.4 1.4-4.3-4.3A7.5 7.5 0 1110.5 3zm0 2a5.5 5.5 0 100 11 5.5 5.5 0 000-11z"
-                              fill="currentColor"></path>
-                    </svg>
-                </button>
-            </form>
-        </div>
-    </div>
-
-    <!-- 主导航：白底深蓝字；下拉为主蓝半透明面板（.an-sub 展开动效见 main.css）；吸顶反蓝由 main.js 处理 -->
-    <nav class="an-nav" id="anNav" aria-label="栏目导航">
-        <div class="an-nav-inner">
-            <button class="an-nav-toggle" type="button" aria-label="展开菜单" aria-expanded="false">
-                <span></span><span></span><span></span>
-            </button>
-            <ul class="an-nav-list">
-                <li th:classappend="${currentCategoryId == null and navServiceActive == null} ? 'active'">
-                    <a th:href="${url.home()}">首页</a>
-                </li>
-                <li th:each="cat : ${navCategories}"
-                    th:classappend="${((currentCategoryId == cat.id or navTopId == cat.id) ? 'active' : '') + (!cat.children.isEmpty() ? ' has-sub' : '')}">
-                    <a th:if="${cat.type == 3}" th:href="${cat.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${cat.name}">栏目</a>
-                    <a th:unless="${cat.type == 3}" th:href="${url.category(cat.id)}"><span th:text="${cat.name}">栏目</span><i th:if="${!cat.children.isEmpty()}" class="an-caret" aria-hidden="true">▾</i></a>
-                    <!-- 二级下拉：主蓝半透明面板，顶部亮线，项 hover 加深+左亮条 -->
-                    <ul class="an-sub" th:if="${!cat.children.isEmpty()}">
-                        <li th:each="sub : ${cat.children}"
-                            th:classappend="${sub.id == currentCategoryId} ? 'active'">
-                            <a th:if="${sub.type == 3}" th:href="${sub.linkUrl}" target="_blank" rel="noopener"
-                               th:text="${sub.name}">子栏目</a>
-                            <a th:unless="${sub.type == 3}" th:href="${url.category(sub.id)}" th:text="${sub.name}">子栏目</a>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </div>
-    </nav>
-</header>
-</html>

src/main/resources/templates/themes/academic-navy/fragments/home-blocks.html

@@ -1,205 +0,0 @@
-<!--
-  academic-navy（学府藏蓝）首页区块 fragment：站点配了 home_layout 时，区块正文必须由本文件渲染，
-  不能落到 themes/common 的通用骨架——否则换肤只换了页头页脚，首页正文仍是骨架内置蓝灰卡（线上事故根因）。
-  结构复用主题 main.css 第 7/9 节既有语汇（an-block / an-block-head--bar / an-block-item / an-date-chip /
-  an-feat-* / an-top-badge / an-empty），仅布局模式特有的排布（双栏、速递条、图墙、链接行）另起第 16 节。
-  契约：block 为渲染端装配的同构 Map（category.name/title/homeStyle/items/moreUrl/background），
-  与回落模式 categoryBlocks 兼容；区块标题一律取 category.name（两种模式都有值）。
--->
-<!-- 形态一：双栏要闻（homeStyle=news_grid）——左 3 份头条图文、右 2 份紧凑行（综合类高校官网 60/40） -->
-<section class="an-section an-container" th:fragment="news_grid(block)" aria-label="栏目区块"
-         th:with="newsBg=${block['background'] != null ? (block['background'] ? site.config['news_bg_image'] : null) : site.config['news_bg_image']}">
-    <div class="an-sec-bg" th:if="${!#strings.isEmpty(newsBg)}"
-         th:style="|background-image:url(${url.upload(newsBg)})|"></div>
-    <div class="an-block an-block--flow"
-         th:with="lead=${!#lists.isEmpty(block.items) ? block.items[0] : null},
-                  rest=${#lists.size(block.items) > 1 ? block.items.subList(1, block.items.size()) : null}">
-        <div class="an-block-head an-block-head--bar">
-            <h2 th:text="${block.category.name}">校园要闻</h2>
-            <a class="an-more" th:href="${block.moreUrl}">更多 ›</a>
-        </div>
-        <div class="an-split" th:if="${lead != null}">
-            <div class="an-block-featured">
-                <a th:href="${url.article(lead.id)}">
-                    <span class="an-feat-cover" th:if="${lead.coverImage != null}">
-                        <img th:src="${url.upload(lead.coverImage)}" th:alt="${lead.title}" loading="lazy">
-                    </span>
-                    <span class="an-feat-title" th:text="${lead.title}">头条标题</span>
-                    <span class="an-feat-summary" th:if="${!#strings.isEmpty(lead.summary)}"
-                          th:text="${lead.summary}">摘要</span>
-                    <span class="an-feat-meta">
-                        <span class="an-top-badge" th:if="${lead.topmost == 1}">置顶</span>
-                        <time th:if="${lead.publishTime != null}"
-                              th:text="${#temporals.format(lead.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                    </span>
-                </a>
-            </div>
-            <ul class="an-block-list" th:if="${rest != null}">
-                <li class="an-block-item" th:each="item : ${rest}">
-                    <a class="an-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                    <span class="an-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                    <time class="an-item-date" th:if="${item.publishTime != null}"
-                          th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-                </li>
-            </ul>
-        </div>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/academic-navy/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态二：默认卡（homeStyle 未设/未知）——整宽头条 + 行式列表 -->
-<section class="an-section an-container" th:fragment="card(block)" aria-label="栏目区块">
-    <div class="an-block an-block--flow">
-        <div class="an-block-head an-block-head--bar">
-            <h2 th:text="${block.category.name}">栏目名</h2>
-            <a class="an-more" th:href="${block.moreUrl}">更多 ›</a>
-        </div>
-        <div class="an-block-featured" th:if="${!#lists.isEmpty(block.items)}"
-             th:with="feat=${block.items[0]}">
-            <a th:href="${url.article(feat.id)}">
-                <span class="an-feat-cover an-feat-cover--row" th:if="${feat.coverImage != null}">
-                    <img th:src="${url.upload(feat.coverImage)}" th:alt="${feat.title}" loading="lazy">
-                </span>
-                <span class="an-feat-title" th:text="${feat.title}">头条标题</span>
-                <span class="an-feat-summary" th:if="${!#strings.isEmpty(feat.summary)}" th:text="${feat.summary}">摘要</span>
-                <span class="an-feat-meta">
-                    <span class="an-top-badge" th:if="${feat.topmost == 1}">置顶</span>
-                    <time th:if="${feat.publishTime != null}"
-                          th:text="${#temporals.format(feat.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                </span>
-            </a>
-        </div>
-        <ul class="an-block-list" th:if="${#lists.size(block.items) > 1}">
-            <li class="an-block-item" th:each="item, stat : ${block.items}" th:if="${stat.index > 0}">
-                <a class="an-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <span class="an-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                <time class="an-item-date" th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/academic-navy/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态三：日期方块列表（homeStyle=compact）——官网最典型的「方块日期 + 标题」行式 -->
-<section class="an-section an-container" th:fragment="compact(block)" aria-label="栏目区块">
-    <div class="an-block an-block--flow">
-        <div class="an-block-head an-block-head--bar">
-            <h2 th:text="${block.category.name}">通知公告</h2>
-            <a class="an-more" th:href="${block.moreUrl}">更多 ›</a>
-        </div>
-        <ul class="an-block-list" th:if="${!#lists.isEmpty(block.items)}">
-            <li class="an-block-item" th:each="item : ${block.items}">
-                <span class="an-date-chip" th:if="${item.publishTime != null}" th:with="d=${item.publishTime}">
-                    <b th:text="${#temporals.format(d, 'dd')}">01</b>
-                    <i th:text="${#temporals.format(d, 'yyyy-MM')}">2026-01</i>
-                </span>
-                <a class="an-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <span class="an-top-badge" th:if="${item.topmost == 1}">置顶</span>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/academic-navy/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态四：媒体聚焦（homeStyle=media_focus）——来源徽标 + 双列行式 -->
-<section class="an-section an-container" th:fragment="media_focus(block)" aria-label="栏目区块">
-    <div class="an-block an-block--flow">
-        <div class="an-block-head an-block-head--bar">
-            <h2 th:text="${block.category.name}">媒体聚焦</h2>
-            <a class="an-more" th:href="${block.moreUrl}">更多 ›</a>
-        </div>
-        <ul class="an-block-list an-block-list--two" th:if="${!#lists.isEmpty(block.items)}">
-            <li class="an-block-item" th:each="item : ${block.items}">
-                <span class="an-src" th:if="${!#strings.isEmpty(item.source)}" th:text="${item.source}">媒体来源</span>
-                <a class="an-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <time class="an-item-date" th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/academic-navy/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态五：图片墙（homeStyle=image_wall）——仅取有封面的条目，四列格 -->
-<section class="an-section an-container" th:fragment="image_wall(block)" aria-label="栏目区块">
-    <div class="an-block-head an-block-head--bar">
-        <h2 th:text="${block.category.name}">图片新闻</h2>
-        <a class="an-more" th:href="${block.moreUrl}">更多 ›</a>
-    </div>
-    <ul class="an-wall" th:if="${!#lists.isEmpty(block.items)}">
-        <li class="an-wall-item" th:each="item : ${block.items}" th:if="${item.coverImage != null}">
-            <a th:href="${url.article(item.id)}" th:title="${item.title}">
-                <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}" loading="lazy">
-                <span class="an-wall-cap" th:text="${item.title}">图片标题</span>
-            </a>
-        </li>
-    </ul>
-    <th:block th:if="${#lists.isEmpty(block.items)}">
-        <div th:replace="~{'themes/academic-navy/fragments/home-blocks' :: empty(${block})}"></div>
-    </th:block>
-</section>
-
-<!-- 布局模式：要闻速递横条（block.items 由渲染端按置顶+最新装配；单行不换行，中文不塌列） -->
-<section class="an-ticker" th:fragment="ticker(block)" aria-label="要闻速递"
-         th:if="${!#lists.isEmpty(block.items)}">
-    <div class="an-container an-ticker-inner">
-        <span class="an-ticker-label" th:text="${block.title}">要闻速递</span>
-        <ul class="an-ticker-list">
-            <li th:each="item : ${block.items}">
-                <a class="an-ticker-item" th:href="${url.article(item.id)}" th:text="${item.title}">要闻标题</a>
-            </li>
-        </ul>
-    </div>
-</section>
-
-<!-- 布局模式：线上展厅（block.items = 轮播位 gallery） -->
-<section class="an-section an-container an-gallery" th:fragment="gallery(block)" aria-label="线上展厅"
-         th:if="${!#lists.isEmpty(block.items)}">
-    <div class="an-block-head">
-        <h2 th:text="${block.title}">线上展厅</h2>
-        <i class="an-block-tick" aria-hidden="true"></i>
-    </div>
-    <p class="an-gallery-sub" th:if="${!#strings.isEmpty(block.subtitle)}" th:text="${block.subtitle}">
-        Online Exhibition Hall
-    </p>
-    <ul class="an-wall an-wall--4">
-        <li class="an-wall-item" th:each="g : ${block.items}">
-            <a th:href="${g.linkUrl}" th:title="${g.title}">
-                <img th:src="${g.imageUrl}" th:alt="${g.title}" loading="lazy">
-                <span class="an-wall-cap" th:if="${!#strings.isEmpty(g.title)}" th:text="${g.title}">作品标题</span>
-            </a>
-        </li>
-    </ul>
-</section>
-
-<!-- 布局模式：友情链接分组（block.linkGroups 由渲染端按 group 过滤） -->
-<section class="an-section an-container" th:fragment="links(block)" aria-label="友情链接">
-    <div class="an-block an-block--flow">
-        <div class="an-block-head an-block-head--bar">
-            <h2 th:text="${block.title}">友情链接</h2>
-        </div>
-        <th:block th:each="grp : ${block.linkGroups}">
-            <p class="an-links-group" th:if="${!#strings.isEmpty(grp.groupName)}" th:text="${grp.groupName}">分组</p>
-            <ul class="an-links">
-                <li th:each="l : ${grp.links}">
-                    <a th:href="${l.linkUrl}" th:text="${l.name}" target="_blank" rel="noopener">链接名</a>
-                </li>
-            </ul>
-        </th:block>
-    </div>
-</section>
-
-<!-- 空态（各形态引用时守卫必须包在 th:block 外层：th:replace 优先级 100 先于 th:if 300 求值） -->
-<div class="an-empty" th:fragment="empty(block)">
-    <p>栏目暂无内容</p>
-    <p class="an-empty-hint">内容发布后将在此展示</p>
-</div>

src/main/resources/templates/themes/academic-navy/home.html

@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="an-home" id="main-content">
-    <!-- 首页轮播位（cms_banner position=home；设计尺寸见 theme.json bannerSize） -->
-    <section class="an-banner" th:if="${!#lists.isEmpty(banners)}" aria-label="焦点图片">
-        <div class="an-banner-slides">
-            <a class="an-banner-slide" th:each="b, stat : ${banners}"
-               th:classappend="${stat.first} ? 'active'"
-               th:href="${b.linkUrl}" th:title="${b.title}">
-                <img th:src="${b.imageUrl}" th:alt="${b.title}">
-                <span class="an-banner-title" th:text="${b.title}">标题</span>
-            </a>
-        </div>
-        <button class="an-banner-arrow prev" type="button" aria-label="上一张" th:if="${#lists.size(banners) > 1}">‹</button>
-        <button class="an-banner-arrow next" type="button" aria-label="下一张" th:if="${#lists.size(banners) > 1}">›</button>
-        <div class="an-banner-dots" th:if="${#lists.size(banners) > 1}">
-            <button th:each="b, stat : ${banners}" th:classappend="${stat.first} ? 'active'"
-                    th:aria-label="${'第' + (stat.count) + '张'}"></button>
-        </div>
-    </section>
-
-    <!-- 首页布局模式（docs/16 §4.4）：区块形态由本主题 fragments/home-blocks 承载——换肤必须连首页正文一起换，
-         只换页头页脚会被判「皮肤不生效」。未知类型仍回落 common 骨架（渲染端已过滤未知 type，正常不触发）。
-         注意：th:replace（优先级100）先于 th:case（300）执行——case 必须放父元素、replace 放子元素 -->
-    <th:block th:if="${layoutBlocks != null}">
-        <th:block th:each="block : ${layoutBlocks}">
-            <th:block th:switch="${block.type}">
-                <th:block th:case="'article_list'">
-                    <th:block th:switch="${block.homeStyle}">
-                        <th:block th:case="'news_grid'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: news_grid(${block})}" /></th:block>
-                        <th:block th:case="'media_focus'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: media_focus(${block})}" /></th:block>
-                        <th:block th:case="'compact'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: compact(${block})}" /></th:block>
-                        <th:block th:case="'image_wall'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: image_wall(${block})}" /></th:block>
-                        <th:block th:case="*"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: card(${block})}" /></th:block>
-                    </th:block>
-                </th:block>
-                <th:block th:case="'ticker'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: ticker(${block})}" /></th:block>
-                <th:block th:case="'gallery'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: gallery(${block})}" /></th:block>
-                <th:block th:case="'links'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: links(${block})}" /></th:block>
-                <th:block th:case="*"><th:block th:replace="~{'themes/common/fragments/home-blocks' :: render(${block})}" /></th:block>
-            </th:block>
-        </th:block>
-    </th:block>
-
-    <!-- 回落分支（docs/16 D2）：无 home_layout 时按现状渲染 -->
-    <th:block th:unless="${layoutBlocks != null}">
-    <section class="an-section an-container" aria-label="头条与图片新闻">
-        <div class="an-headline">
-            <div class="an-headline-card" th:if="${!#lists.isEmpty(topArticles)}">
-                <div class="an-block-head">
-                    <h2>头条推荐</h2>
-                    <i class="an-block-tick" aria-hidden="true"></i>
-                </div>
-                <ul class="an-headline-list">
-                    <li class="an-headline-lead" th:with="lead=${topArticles[0]}">
-                        <a class="an-lead-title" th:href="${url.article(lead.id)}" th:text="${lead.title}">头条标题</a>
-                        <div class="an-lead-meta">
-                            <span class="an-top-badge" th:if="${lead.topmost == 1}">置顶</span>
-                            <time th:if="${lead.publishTime != null}"
-                                  th:text="${#temporals.format(lead.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                        </div>
-                    </li>
-                    <li th:each="item, stat : ${topArticles}" th:if="${stat.index > 0}">
-                        <span class="an-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                        <a th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        <time th:if="${item.publishTime != null}"
-                              th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                    </li>
-                </ul>
-            </div>
-            <div class="an-focus-card" th:if="${!#lists.isEmpty(focusArticles)}">
-                <div class="an-block-head">
-                    <h2>图片新闻</h2>
-                    <i class="an-block-tick" aria-hidden="true"></i>
-                </div>
-                <a class="an-focus-lead" th:with="cover=${focusArticles[0]}"
-                   th:href="${url.article(cover.id)}">
-                    <span class="an-focus-cover">
-                        <img th:src="${url.upload(cover.coverImage)}" th:alt="${cover.title}">
-                    </span>
-                    <span class="an-focus-title" th:text="${cover.title}">图片新闻标题</span>
-                </a>
-                <ul class="an-focus-rows">
-                    <li th:each="row, stat : ${focusArticles}" th:if="${stat.index > 0}">
-                        <a th:href="${url.article(row.id)}">
-                            <span class="an-row-cover"><img th:src="${url.upload(row.coverImage)}" th:alt="${row.title}"></span>
-                            <span class="an-row-title" th:text="${row.title}">图片新闻标题</span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </section>
-
-    <!-- 一级栏目区块（聚合列表型子孙栏目 top 8） -->
-    <section class="an-section an-container" aria-label="栏目区块">
-        <div class="an-blocks">
-            <div class="an-block" th:each="block : ${categoryBlocks}">
-                <div class="an-block-head an-block-head--bar">
-                    <h2 th:text="${block.category.name}">栏目名</h2>
-                    <a class="an-more" th:href="${block.moreUrl}">更多 ›</a>
-                </div>
-                <ul class="an-block-list" th:if="${!#lists.isEmpty(block.items)}">
-                    <!-- 区块头条：有封面则图文，无封面则带摘要纯文 -->
-                    <li class="an-block-featured" th:with="feat=${block.items[0]}">
-                        <a th:href="${url.article(feat.id)}">
-                            <span class="an-feat-cover" th:if="${feat.coverImage != null}">
-                                <img th:src="${url.upload(feat.coverImage)}" th:alt="${feat.title}">
-                            </span>
-                            <span class="an-feat-body">
-                                <span class="an-feat-title" th:text="${feat.title}">头条标题</span>
-                                <span class="an-feat-summary" th:if="${!#strings.isEmpty(feat.summary)}"
-                                      th:text="${feat.summary}">摘要</span>
-                                <span class="an-feat-meta">
-                                    <span class="an-top-badge" th:if="${feat.topmost == 1}">置顶</span>
-                                    <time th:if="${feat.publishTime != null}"
-                                          th:text="${#temporals.format(feat.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                                </span>
-                            </span>
-                        </a>
-                    </li>
-                    <li class="an-block-item" th:each="item, stat : ${block.items}" th:if="${stat.index > 0}">
-                        <span class="an-date-chip" th:if="${item.publishTime != null}"
-                              th:with="d=${item.publishTime}">
-                            <b th:text="${#temporals.format(d, 'dd')}">01</b>
-                            <i th:text="${#temporals.format(d, 'yyyy-MM')}">2026-01</i>
-                        </span>
-                        <a class="an-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        <span class="an-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                    </li>
-                </ul>
-                <div class="an-empty" th:if="${#lists.isEmpty(block.items)}">
-                    <p>栏目暂无内容</p>
-                    <p class="an-empty-hint">内容发布后将在此展示</p>
-                </div>
-            </div>
-        </div>
-    </section>
-    </th:block>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/academic-navy/list.html

@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="an-page an-container" id="main-content">
-    <div class="an-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="an-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="an-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="an-side-nav-list">
-                <li class="an-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="an-page-card">
-            <nav class="an-crumb" aria-label="面包屑" th:if="${searchMode != true}">
-                <a th:href="${url.home()}">首页</a>
-                <th:block th:each="node, st : ${categoryPath}">
-                    <span class="an-crumb-sep" aria-hidden="true">/</span>
-                    <a th:if="${!st.last}" class="crumb-parent" th:href="${url.category(node.id)}"
-                       th:text="${node.name}">父栏目</a>
-                    <span class="an-crumb-current" th:if="${st.last}" th:text="${node.name}">栏目</span>
-                </th:block>
-            </nav>
-        <nav class="an-crumb" aria-label="面包屑" th:if="${searchMode == true}">
-            <a th:href="${url.home()}">首页</a>
-            <span class="an-crumb-sep" aria-hidden="true">/</span>
-            <span class="an-crumb-current">搜索结果</span>
-        </nav>
-
-        <h1 class="an-page-title" th:if="${searchMode != true}" th:text="${category.name}">栏目名</h1>
-        <h1 class="an-page-title" th:if="${searchMode == true}" th:text="'搜索：' + ${q}">搜索词</h1>
-
-        <ul class="an-article-list">
-            <!-- 有封面：图文行；无封面：行式（符号 + 标题 + 右侧日期） -->
-            <li th:each="item : ${listData.items}">
-                <div class="an-article-row" th:if="${item.coverImage != null}">
-                    <a class="an-item-cover" th:href="${url.article(item.id)}">
-                        <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}">
-                    </a>
-                    <div class="an-item-body">
-                        <div class="an-item-title">
-                            <a th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        </div>
-                        <p class="an-item-summary" th:if="${!#strings.isEmpty(item.summary)}"
-                           th:text="${item.summary}">摘要</p>
-                        <div class="an-item-meta">
-                            <time th:if="${item.publishTime != null}"
-                                  th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                            <span class="an-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                        </div>
-                    </div>
-                </div>
-                <div class="an-article-line" th:if="${item.coverImage == null}">
-                    <i class="an-line-tick" aria-hidden="true"></i>
-                    <div class="an-line-main">
-                        <a class="an-line-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        <p class="an-item-summary" th:if="${!#strings.isEmpty(item.summary)}"
-                           th:text="${item.summary}">摘要</p>
-                    </div>
-                    <div class="an-line-side">
-                        <span class="an-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                        <time th:if="${item.publishTime != null}"
-                              th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                    </div>
-                </div>
-            </li>
-        </ul>
-        <div class="an-empty" th:if="${#lists.isEmpty(listData.items)}">
-            <p th:if="${searchMode == true}">未找到相关内容</p>
-            <p th:if="${searchMode != true}">栏目暂无内容</p>
-            <p class="an-empty-hint" th:if="${searchMode == true}">换个关键词试试</p>
-            <p class="an-empty-hint" th:if="${searchMode != true}">内容发布后将在此展示</p>
-        </div>
-
-        <!-- 分页（列表页/搜索页共用） -->
-        <nav class="an-pagination" th:if="${listData.totalPages > 1}"
-             th:with="cur=${listData.page}, total=${listData.totalPages}" aria-label="分页">
-            <a th:classappend="${cur <= 1} ? 'disabled'"
-               th:href="${searchMode == true} ? ${url.search(q, cur - 1)} : ${url.category(listData.categoryId) + '?page=' + (cur - 1)}"
-               th:aria-disabled="${cur <= 1}">上一页</a>
-            <a th:each="p : ${#numbers.sequence(1, total)}"
-               th:classappend="${p == cur} ? 'active'"
-               th:href="${searchMode == true} ? ${url.search(q, p)} : ${url.category(listData.categoryId) + '?page=' + p}"
-               th:aria-label="${'第' + p + '页'}"
-               th:text="${p}">1</a>
-            <a th:classappend="${cur >= total} ? 'disabled'"
-               th:href="${searchMode == true} ? ${url.search(q, cur + 1)} : ${url.category(listData.categoryId) + '?page=' + (cur + 1)}"
-               th:aria-disabled="${cur >= total}">下一页</a>
-        </nav>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/academic-navy/single.html

@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="an-page an-container" id="main-content">
-    <div class="an-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="an-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="an-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="an-side-nav-list">
-                <li class="an-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="an-page-card">
-        <nav class="an-crumb" aria-label="面包屑">
-            <a th:href="${url.home()}">首页</a>
-            <th:block th:each="node, st : ${categoryPath}">
-                <span class="an-crumb-sep" aria-hidden="true">/</span>
-                <a th:if="${!st.last}" class="crumb-parent" th:href="${url.category(node.id)}"
-                   th:text="${node.name}">父栏目</a>
-                <span class="an-crumb-current" th:if="${st.last}" th:text="${node.name}">栏目</span>
-            </th:block>
-        </nav>
-
-        <article class="an-article">
-            <h1 class="an-article-title" th:text="${category.name}">栏目名</h1>
-            <!-- 单页栏目内容（type=2，入库前已 jsoup 清洗） -->
-            <div class="an-article-content" th:if="${!#strings.isEmpty(category.content)}"
-                 th:utext="${category.content}">单页内容</div>
-            <div class="an-empty" th:if="${#strings.isEmpty(category.content)}">
-                <p>页面暂无内容</p>
-                <p class="an-empty-hint">内容编辑后将在此展示</p>
-            </div>
-        </article>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/academic-navy/theme.json

@@ -1,23 +0,0 @@
-{
-  "specVersion": 1,
-  "name": "academic-navy",
-  "title": "学府藏蓝（academic-navy）",
-  "version": "1.0.0",
-  "author": "yunhai",
-  "description": "学府藏蓝·高校官网门户：藏蓝顶栏+白底主导航+金线标题+日期方块列表+双栏要闻（左图右列）+深色三段页脚。基座 scholar-blue，配色与首页区块形态按综合类高校官网重做。",
-  "screenshot": "assets/screenshot.png",
-  "bannerSize": "1920x560",
-  "params": [
-    { "key": "primary",      "cssVar": "--an-primary",      "label": "主色",       "type": "color", "default": "#0b4a8f" },
-    { "key": "primaryDark",  "cssVar": "--an-primary-dark", "label": "主色加深",   "type": "color", "default": "#063161" },
-    { "key": "primaryLight", "cssVar": "--an-primary-light","label": "主色提亮",   "type": "color", "default": "#1a6cb5" },
-    { "key": "accent",       "cssVar": "--an-accent",       "label": "点缀金",     "type": "color", "default": "#b8934a" },
-    { "key": "navBg",        "cssVar": "--an-nav-bg",       "label": "导航条底色", "type": "color", "default": "#ffffff" },
-    { "key": "footerBg",     "cssVar": "--an-footer-bg",    "label": "页脚底色",   "type": "color", "default": "#0a2b4d" },
-    { "key": "text",         "cssVar": "--an-text",         "label": "正文文字色", "type": "color", "default": "#2b3644" },
-    { "key": "textLight",    "cssVar": "--an-text-light",   "label": "次要文字色", "type": "color", "default": "#6b7889" },
-    { "key": "bg",           "cssVar": "--an-bg",           "label": "页面底色",   "type": "color", "default": "#f1f4f9" },
-    { "key": "cardBg",       "cssVar": "--an-card-bg",      "label": "卡片底色",   "type": "color", "default": "#ffffff" },
-    { "key": "border",       "cssVar": "--an-border",       "label": "边框色",     "type": "color", "default": "#dbe3ee" }
-  ]
-}

src/main/resources/templates/themes/agri-forest/README.md

@@ -1,58 +0,0 @@
-# agri-forest · 农林绿
-
-云海 CMS 皮肤包。fork 自 `default`（数据契约、模板 th:* 绑定与 default 完全一致），视觉层按农林院校门户语言全部重写，设计语言参考信阳农林学院官网（仅学语言，不复制实现）。
-
-## 风格定位
-
-- **气质词**：庄重、质朴、农林学府。
-- **配色**：墨绿 `#1C6E19` 主导（通栏导航/日期方块/页脚主底），加深端 `#14510F`（页脚/标题条），提亮端 `#3FA43A`（当前导航项/hover），麦穗金 `#C8A45C` 只做装饰线与角标（栏目标题下划线、导航当前项下杠、日期方块 hover 金线、置顶角标）。
-- **结构**：白色页头（左校徽+校名，右工具行：今日日期 + 校园直通车下拉 + 站内搜索）→ 墨绿通栏主导航（白字，当前栏目提亮绿底+金下杠，导航下方与 banner 无缝）→ 通栏轮播（左下墨绿标题条带金边）→ 首页区块 → 墨绿多列页脚（更深底条）。
-- **工艺**：小圆角 4px；间距刻度 4/8/12/16/24/32/48；字号阶梯 12/13/14/15/16/18/20/24/28/32；hover 过渡 0.2s ease；正文行高 1.75；无渐变堆砌、无粉紫、无玻璃拟态；图标一律内联 SVG。
-
-## 参数取值建议（theme.json，13 项）
-
-| key | cssVar | 默认 | 建议 |
-| --- | --- | --- | --- |
-| primary | `--af-primary` | `#1C6E19` | 主色。换季校庆可微调为 `#1F7A1B`，勿低于 `#14510F` 明度（导航白字对比） |
-| primaryDark | `--af-primary-dark` | `#14510F` | 页脚主底/轮播标题条。与 primary 保持同色相 1~2 档差 |
-| primaryLight | `--af-primary-light` | `#3FA43A` | 当前导航项/hover。需要更醒目可用 `#4DB548`，过亮会刺眼 |
-| accent | `--af-accent` | `#C8A45C` | 麦穗金装饰线/角标。庄重场合可降饱和为 `#B8934A` |
-| navBg | `--af-nav-bg` | `#1C6E19` | 主导航底色。默认与 primary 一致；要"导航深一档"配 `#14510F` |
-| footerBg | `--af-footer-bg` | `#14510F` | 页脚主底；底条固定更深一档（`--af-primary-deep`，非参数） |
-| text / textLight | `--af-text` / `--af-text-light` | `#2A3327` / `#6C7A67` | 正文/次要文字，偏绿灰 |
-| bg | `--af-bg` | `#F5F8F3` | 页面底色，带一点绿调的暖白 |
-| cardBg | `--af-card-bg` | `#FFFFFF` | 卡片底，建议保持纯白 |
-| border | `--af-border` | `#DDE8DA` | 边框/分隔线，绿灰调 |
-| linkGreen | `--af-link` | `#277428` | 正文链接绿，介于主色深浅之间 |
-| listLayout | —（select） | `date` | 列表页形态：`date`=46px 日期方块行（农林官网典型）；`plain`=通栏行式（日期右置），信息密度更高 |
-
-微调优先级：站点 `theme_params`（本表参数）→ 站点 `custom_css` → 本包 main.css（契约 §6）。
-
-## 首页九段形态表（fragments/home-blocks.html）
-
-站点配 `home_layout` 时首页正文由本包 fragment 渲染（换肤必须连正文一起换）：
-
-| fragment | 触发 | 形态 |
-| --- | --- | --- |
-| `news_grid` | article_list + homeStyle=news_grid | 三图焦点（横排 3 封面卡）+ 双列要闻行式列表；支持站点背景带（news_bg_image，画在卡片之下） |
-| `media_focus` | article_list + homeStyle=media_focus | 学术动态：双列密行 + 墨绿来源徽标 |
-| `compact` | article_list + homeStyle=compact | 通知公告：46px 墨绿日期方块（日大号+年月小号），行 hover 出金线 |
-| `image_wall` | article_list + homeStyle=image_wall | 四列图片墙（仅有封面条目），悬浮标题 |
-| `card` | article_list 其他/未设 | 默认卡：头条图文（有封面则图文）+ 行式列表 |
-| `ticker` | type=ticker | 要闻速递横条：墨绿底、金色分隔、单行不塌列 |
-| `gallery` | type=gallery | 校园映像：居中标题+副题+四列图墙+悬浮标题 |
-| `links` | type=links | 专题网站：4 列缩略卡（绿标题条+金下杠+圆徽），分组拉平 |
-| `empty` | 各形态 items 为空 | 空态「栏目暂无内容」（守卫包在外层 th:block，th:replace 优先级 100 先于 th:if 300） |
-
-未知类型回落 `themes/common` 通用骨架；`:root` 已把 `--af-*` 别名到契约变量（`--primary/--text/--card-bg/--border/--bg/--radius`），兜底骨架与 themeVarsCss 换色可穿透。
-
-## 纪律要点
-
-- URL 一律 `url.*` 生成，无硬编码绝对地址；非转义输出仅契约七处白名单。
-- 中文防塌列：`.af-ticker-list{min-width:0;white-space:nowrap}`、`.af-ticker-item{flex:none;text-overflow:ellipsis}`、`.af-block-item-title{min-width:0;overflow:hidden;text-overflow:ellipsis}`。
-- 网格一律 `minmax(0,1fr)`；≤768px 单列、导航横滚、子菜单静态平铺。
-- 背景带层序：`.af-sec-bg` z-index:0，其后 `.af-block` z-index:1。
-
-## 截图说明
-
-`assets/screenshot.png` 为按本皮肤设计语言绘制的门户结构示意图（非浏览器实拍）。管理端选择器如需实拍图，起服后截首页替换即可（记入遗留项）。

src/main/resources/templates/themes/agri-forest/assets/js/main.js

@@ -1,87 +0,0 @@
-/* agri-forest 皮肤包脚本：页头日期 + 首页轮播（自动播放/圆点/箭头/悬停暂停/键盘），无任何外部依赖 */
-(function () {
-  /* 页头工具行日期（本地时间，YYYY年M月D日 星期X） */
-  var dateEl = document.getElementById('siteDate');
-  if (dateEl) {
-    var now = new Date();
-    var week = ['日', '一', '二', '三', '四', '五', '六'][now.getDay()];
-    dateEl.textContent = now.getFullYear() + '年' + (now.getMonth() + 1) + '月'
-      + now.getDate() + '日 星期' + week;
-  }
-
-  /* 轮播 */
-  var root = document.querySelector('.af-banner');
-  var slides = document.querySelectorAll('.af-banner-slide');
-  var dots = document.querySelectorAll('.af-banner-dots button');
-  var prevBtn = document.querySelector('.af-banner-arrow.prev');
-  var nextBtn = document.querySelector('.af-banner-arrow.next');
-  if (!slides.length || !root) {
-    return;
-  }
-  var current = 0;
-  var timer = null;
-  var INTERVAL = 5000;
-
-  function show(index) {
-    slides[current].classList.remove('active');
-    if (dots[current]) {
-      dots[current].classList.remove('active');
-    }
-    current = (index + slides.length) % slides.length;
-    slides[current].classList.add('active');
-    if (dots[current]) {
-      dots[current].classList.add('active');
-    }
-  }
-
-  function start() {
-    stop();
-    if (slides.length > 1) {
-      timer = window.setInterval(function () {
-        show(current + 1);
-      }, INTERVAL);
-    }
-  }
-
-  function stop() {
-    if (timer) {
-      window.clearInterval(timer);
-      timer = null;
-    }
-  }
-
-  dots.forEach(function (dot, index) {
-    dot.addEventListener('click', function () {
-      show(index);
-      start();
-    });
-  });
-  if (prevBtn) {
-    prevBtn.addEventListener('click', function () {
-      show(current - 1);
-      start();
-    });
-  }
-  if (nextBtn) {
-    nextBtn.addEventListener('click', function () {
-      show(current + 1);
-      start();
-    });
-  }
-  root.addEventListener('mouseenter', stop);
-  root.addEventListener('mouseleave', start);
-  root.addEventListener('focusin', stop);
-  root.addEventListener('focusout', start);
-  root.setAttribute('tabindex', '-1');
-  root.addEventListener('keydown', function (e) {
-    if (e.key === 'ArrowLeft') {
-      show(current - 1);
-      start();
-    } else if (e.key === 'ArrowRight') {
-      show(current + 1);
-      start();
-    }
-  });
-
-  start();
-})();

src/main/resources/templates/themes/agri-forest/detail.html

@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="af-page af-container" id="main-content">
-    <div class="af-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="af-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="af-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="af-side-nav-list">
-                <li class="af-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="af-page-card">
-            <nav class="af-crumb" aria-label="面包屑">
-                <a th:href="${url.home()}">首页</a>
-                <th:block th:each="node : ${categoryPath}">
-                    <span class="af-crumb-sep" aria-hidden="true">/</span>
-                    <a class="af-crumb-parent" th:href="${url.category(node.id)}" th:text="${node.name}">栏目</a>
-                </th:block>
-                <span class="af-crumb-sep" th:if="${currentCategoryId != null}" aria-hidden="true">/</span>
-                <span class="af-crumb-current">正文</span>
-            </nav>
-
-        <article class="af-article">
-            <h1 class="af-article-title" th:text="${article.title}">文章标题</h1>
-            <div class="af-article-meta">
-                <time th:if="${article.publishTime != null}"
-                      th:text="${'发布时间：' + #temporals.format(article.publishTime, 'yyyy-MM-dd HH:mm')}">2026-01-01 10:00</time>
-                <span th:if="${!#strings.isEmpty(article.authorName)}"
-                      th:text="'作者：' + ${article.authorName}">作者</span>
-                <span th:if="${!#strings.isEmpty(article.source)}"
-                      th:text="'来源：' + ${article.source}">来源</span>
-                <span th:text="'浏览量：' + ${article.viewCount}">浏览量</span>
-            </div>
-            <!-- 正文：入库前已经 jsoup 白名单清洗（方案 §8.5），此处允许 utext；
-                 其余字段一律 th:text 转义输出 -->
-            <div class="af-article-content" th:utext="${article.content}">正文</div>
-        </article>
-
-        <nav class="af-sibling" aria-label="上下篇导航">
-            <a th:if="${prevArticle != null}" class="prev"
-               th:href="${url.article(prevArticle.id)}">
-                <span class="sib-label">上一篇</span>
-                <span class="sib-title" th:text="${prevArticle.title}">上一篇标题</span>
-            </a>
-            <span class="sib-none prev" th:if="${prevArticle == null}">
-                <span class="sib-label">上一篇</span>
-                <span class="sib-title">已经是最早一篇</span>
-            </span>
-            <a th:if="${nextArticle != null}" class="next"
-               th:href="${url.article(nextArticle.id)}">
-                <span class="sib-label">下一篇</span>
-                <span class="sib-title" th:text="${nextArticle.title}">下一篇标题</span>
-            </a>
-            <span class="sib-none next" th:if="${nextArticle == null}">
-                <span class="sib-label">下一篇</span>
-                <span class="sib-title">已是最新一篇</span>
-            </span>
-        </nav>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/agri-forest/fragments/footer.html

@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- 公共页脚（农林绿·墨绿多列）：品牌区(校徽+站名+社媒图标) + 地址/联系/版权/备案 + 二维码位
-     + 友链分组（浅色带）+ 更深底条（校名）。
-     数据契约与 default 一致（linkGroups/contact/copyright/beian/logo/schName），
-     增强键（docs/12）：footerAddressLines / qr_wechat / qr_weibo / social_*（有值才渲染，空站点优雅降级）。 -->
-<footer class="af-footer" th:fragment="footer">
-    <!-- 主区：墨绿多列 -->
-    <div class="af-footer-main">
-        <div class="af-container af-footer-cols">
-            <!-- 品牌列 -->
-            <div class="af-footer-brand">
-                <div class="af-footer-logo-row">
-                    <img th:if="${site.config['logo'] != null}" class="af-footer-logo"
-                         th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
-                    <span class="af-footer-site" th:text="${site.name}">站点名称</span>
-                </div>
-                <!-- 社媒主页（url 校验，有值才渲染对应图标；图标内联 SVG，契约 §4.6 不引外链） -->
-                <div class="af-social" th:if="${site.config['social_wechat'] != null
-                                                or site.config['social_weibo'] != null
-                                                or site.config['social_douyin'] != null
-                                                or site.config['social_bilibili'] != null}">
-                    <a th:if="${site.config['social_wechat'] != null}" class="af-social-icon"
-                       th:href="${site.config['social_wechat']}" target="_blank" rel="noopener" aria-label="微信公众号" th:title="微信公众号">
-                        <svg viewBox="0 0 24 24" width="20" height="20" focusable="false" aria-hidden="true"><path fill="currentColor" d="M9.3 4C5.8 4 3 6.4 3 9.4c0 1.7.9 3.2 2.4 4.2l-.6 2 2.2-1.1c.6.2 1.3.3 2 .3h.4a5 5 0 0 1-.2-1.4c0-2.9 2.7-5.2 6-5.2h.3C14.9 5.9 12.3 4 9.3 4zM7 7.5a.9.9 0 1 1 0 1.8.9.9 0 0 1 0-1.8zm4.7 0a.9.9 0 1 1 0 1.8.9.9 0 0 1 0-1.8zM15 9.6c-3 0-5.4 2-5.4 4.5S12 18.5 15 18.5c.6 0 1.2-.1 1.7-.3l1.9 1-.5-1.8c1.3-.9 2.2-2.2 2.2-3.7 0-2.5-2.4-4.1-5.3-4.1zm-1.9 2.5a.8.8 0 1 1 0 1.6.8.8 0 0 1 0-1.6zm3.8 0a.8.8 0 1 1 0 1.6.8.8 0 0 1 0-1.6z"/></svg>
-                    </a>
-                    <a th:if="${site.config['social_weibo'] != null}" class="af-social-icon"
-                       th:href="${site.config['social_weibo']}" target="_blank" rel="noopener" aria-label="微博" th:title="微博">
-                        <svg viewBox="0 0 24 24" width="20" height="20" focusable="false" aria-hidden="true"><path fill="currentColor" d="M10.1 19.6c-3.5.3-6.6-1.3-6.9-3.6-.3-2.2 2.3-4.4 5.8-4.8 3.5-.3 6.6 1.3 6.9 3.6.3 2.3-2.3 4.5-5.8 4.8zm3.2-4.9c-.4-1.3-2-2-3.8-1.8-1.9.3-3.2 1.6-2.9 3 .3 1.3 2 2.1 3.9 1.8 1.8-.3 3.1-1.7 2.8-3zm-3.1 1.9a.7.7 0 0 1-.9.3.6.6 0 0 1-.2-.9c.2-.3.6-.4.9-.2.3.1.4.5.2.8zm.8-1a.3.3 0 0 1-.4.1c-.2 0-.3-.2-.2-.4.1-.1.3-.2.4-.1.2 0 .3.2.2.4zm3.6-7.3a3.9 3.9 0 0 0-3.6-1.1.5.5 0 0 0-.4.6c.1.3.4.5.6.4a2.9 2.9 0 0 1 3.3 3.7c-.1.3.1.5.4.6.2 0 .5-.1.6-.4.4-1.4.1-2.8-.9-3.8zm2.6-1a6.8 6.8 0 0 0-6.3-2 .5.5 0 0 0-.4.6c0 .3.3.5.6.4a5.8 5.8 0 0 1 6.7 7.4c-.1.3.1.5.3.6.3.1.6 0 .7-.3.8-2.3.3-4.9-1.6-6.7z"/></svg>
-                    </a>
-                    <a th:if="${site.config['social_douyin'] != null}" class="af-social-icon"
-                       th:href="${site.config['social_douyin']}" target="_blank" rel="noopener" aria-label="抖音" th:title="抖音">
-                        <svg viewBox="0 0 24 24" width="20" height="20" focusable="false" aria-hidden="true"><path fill="currentColor" d="M16.6 3c.4 1.8 1.6 3.2 3.4 3.5v2.8c-1.3 0-2.5-.4-3.5-1.1v5.6a5.6 5.6 0 1 1-5.6-5.6c.3 0 .6 0 .9.1v2.9a2.7 2.7 0 1 0 1.9 2.6V3h2.9z"/></svg>
-                    </a>
-                    <a th:if="${site.config['social_bilibili'] != null}" class="af-social-icon"
-                       th:href="${site.config['social_bilibili']}" target="_blank" rel="noopener" aria-label="哔哩哔哩" th:title="哔哩哔哩">
-                        <svg viewBox="0 0 24 24" width="20" height="20" focusable="false" aria-hidden="true"><path fill="currentColor" d="M7.2 4.3 9 6.4h6l1.8-2.1c.3-.4.9-.4 1.2-.1.3.3.4.8.1 1.2l-1 1h1.4A3.5 3.5 0 0 1 22 9.9v6.6a3.5 3.5 0 0 1-3.5 3.5h-13A3.5 3.5 0 0 1 2 16.5V9.9a3.5 3.5 0 0 1 3.5-3.5h1.4l-1-1A.9.9 0 0 1 6 4.2c.3-.3.9-.3 1.2.1zM5.5 8.2A1.7 1.7 0 0 0 3.8 9.9v6.6c0 .9.8 1.7 1.7 1.7h13c.9 0 1.7-.8 1.7-1.7V9.9c0-.9-.8-1.7-1.7-1.7h-13zm3 3.2c.5 0 .9.4.9.9v.9a.9.9 0 1 1-1.8 0v-.9c0-.5.4-.9.9-.9zm7 0c.5 0 .9.4.9.9v.9a.9.9 0 1 1-1.8 0v-.9c0-.5.4-.9.9-.9z"/></svg>
-                    </a>
-                </div>
-            </div>
-
-            <!-- 地址/联系列（多校区地址按行直出；contact/copyright/beian 可空，空块收敛） -->
-            <div class="af-footer-info">
-                <ul class="af-footer-addr" th:if="${!#lists.isEmpty(site.footerAddressLines)}">
-                    <li th:each="line : ${site.footerAddressLines}" th:text="${line}">校区地址</li>
-                </ul>
-                <p class="af-footer-line" th:if="${site.config['contact'] != null}" th:text="${site.config['contact']}">联系方式</p>
-                <p class="af-footer-line" th:if="${site.config['copyright'] != null}" th:text="${site.config['copyright']}">版权信息</p>
-                <p class="af-footer-line" th:if="${site.config['beian'] != null}" th:text="${site.config['beian']}">备案号</p>
-            </div>
-
-            <!-- 二维码位（asset 校验，有值才渲染） -->
-            <div class="af-footer-qr" th:if="${site.config['qr_wechat'] != null or site.config['qr_weibo'] != null}">
-                <figure class="af-qr" th:if="${site.config['qr_wechat'] != null}">
-                    <img th:src="${url.upload(site.config['qr_wechat'])}" alt="微信二维码">
-                    <figcaption>官方微信</figcaption>
-                </figure>
-                <figure class="af-qr" th:if="${site.config['qr_weibo'] != null}">
-                    <img th:src="${url.upload(site.config['qr_weibo'])}" alt="微博二维码">
-                    <figcaption>官方微博</figcaption>
-                </figure>
-            </div>
-        </div>
-    </div>
-
-    <!-- 友链区（浅绿带；无分组的站整段不渲染；分组无链接时防御性跳过——数据上分组由链接行物化，不可达） -->
-    <div class="af-footer-links" th:if="${!#lists.isEmpty(site.linkGroups)}">
-        <div class="af-container af-footer-links-inner">
-            <div class="af-links-group" th:each="group : ${site.linkGroups}"
-                 th:if="${!#lists.isEmpty(group.links)}">
-                <span class="af-group-name" th:text="${group.groupName}">分组</span>
-                <p class="af-links-row">
-                    <a th:each="link : ${group.links}" th:href="${link.linkUrl}" target="_blank" rel="noopener">
-                        <!-- B4 友链 Logo：有 logo 图片+名称并排（渲染期补基准），无 logo 纯文字 -->
-                        <img th:if="${link.logoUrl != null and !#strings.isEmpty(link.logoUrl)}" class="af-link-logo"
-                             th:src="${url.upload(link.logoUrl)}" th:alt="${link.name}" loading="lazy">
-                        <span th:text="${link.name}">链接</span>
-                    </a>
-                </p>
-            </div>
-        </div>
-    </div>
-
-    <!-- 底条（更深墨绿）：全站无任何配置信息时仍保留结构完整（空块由 CSS 收敛） -->
-    <div class="af-footer-bottom">
-        <div class="af-container af-footer-bottom-inner">
-            <p th:if="${site.schName != null and !#strings.isEmpty(site.schName)}"
-               th:text="${site.schName}">学校名称</p>
-        </div>
-    </div>
-</footer>
-</html>

src/main/resources/templates/themes/agri-forest/fragments/head.html

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<!-- 公共 head 片段：SEO（title/description/canonical）+ 主题资产（方案 §8.3/8.6），与 default 数据契约一致 -->
-<head th:fragment="head">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title th:text="${pageTitle}">页面标题</title>
-    <meta name="description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}"
-          th:content="${seoDescription}">
-    <link rel="canonical" th:if="${canonical != null}" th:href="${canonical}">
-    <!-- og 标签基本三件（C-7，方案 §8.6 canonical/og 同基准） -->
-    <meta property="og:title" th:if="${pageTitle != null}" th:content="${pageTitle}">
-    <meta property="og:description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}" th:content="${seoDescription}">
-    <meta property="og:image" th:if="${ogImage != null}" th:content="${ogImage}">
-    <link rel="stylesheet" th:href="${url.asset('css/main.css')}">
-    <!-- 微调参数 CSS 变量覆盖（方案 §5.3）：位于皮肤 CSS 之后层叠覆盖；值由服务端预构建并校验 -->
-    <style th:if="${not #strings.isEmpty(themeVarsCss)}" th:utext="${themeVarsCss}"></style>
-    <!-- 站点级自定义样式（B3）：位于皮肤 CSS 与微调变量之后层叠覆盖；内容经服务端黑名单强校验后直出 -->
-    <style th:if="${not #strings.isEmpty(customCss)}" th:utext="${customCss}"></style>
-    <!-- favicon：管理端配置了 favicon 键用上传图，未配置输出主题内置兜底 icon（assets/favicon.png） -->
-    <link rel="icon" type="image/png"
-          th:href="${site.config['favicon'] != null ? url.upload(site.config['favicon']) : url.asset('favicon.png')}">
-</head>
-</html>

src/main/resources/templates/themes/agri-forest/fragments/header.html

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- 公共头部（农林绿）：白色页头（左校徽+校名 / 右工具行：日期+校园直通车下拉+搜索）
-     + 墨绿通栏主导航（白字，当前栏目 primaryLight 底），导航下方与 banner 无缝衔接。
-     数据契约与 default 完全一致：topbar 日期由 main.js 填充、专业院系下拉（site.colleges 空则不渲染）。 -->
-<header class="af-header" th:fragment="header">
-    <a class="af-skip-link" href="#main-content">跳到主要内容</a>
-
-    <!-- 白色页头 -->
-    <div class="af-head">
-        <div class="af-head-inner">
-            <!-- 左：校徽 + 校名 -->
-            <div class="af-brand">
-                <img th:if="${site.config['logo'] != null}" class="af-logo"
-                     th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
-                <a class="af-sitename" th:href="${url.home()}" th:text="${site.name}">站点名称</a>
-            </div>
-            <!-- 右：工具行（今日日期 + 校园直通车 + 站内搜索）；无子站站点下拉整块不渲染 -->
-            <div class="af-head-side">
-                <span class="af-date" id="siteDate" th:aria-label="'今日日期'">加载日期…</span>
-                <div class="af-colleges" th:if="${!site.colleges.isEmpty()}"
-                     th:with="collegesLabel=${site.config['colleges_label'] ?: '校园直通车'}">
-                    <span class="af-colleges-toggle">
-                        <a href="javascript:void(0)" th:text="${collegesLabel}">校园直通车</a>
-                        <i class="af-colleges-arrow" aria-hidden="true">▾</i>
-                    </span>
-                    <ul class="af-colleges-menu">
-                        <li th:each="col : ${site.colleges}" th:classappend="${col.path == site.path} ? 'active'">
-                            <a th:href="${url.siteHome(col.path, col.publicBaseUrl)}"
-                               th:title="${col.name}" th:text="${col.name}">学院名称</a>
-                        </li>
-                    </ul>
-                </div>
-                <form class="af-search" th:action="${url.search('', null)}" method="get" role="search">
-                    <input type="text" name="q" placeholder="站内搜索" aria-label="站内搜索">
-                    <button type="submit">搜索</button>
-                </form>
-            </div>
-        </div>
-    </div>
-
-    <!-- 墨绿通栏主导航：外链栏目直接外跳；其余进栏目页（方案 §8.1） -->
-    <nav class="af-nav" aria-label="栏目导航">
-        <ul>
-            <li th:classappend="${currentCategoryId == null and navServiceActive == null} ? 'active'">
-                <a th:href="${url.home()}">首页</a>
-            </li>
-            <li th:each="cat : ${navCategories}"
-                th:classappend="${((currentCategoryId == cat.id or navTopId == cat.id) ? 'active' : '') + (!cat.children.isEmpty() ? ' has-sub' : '')}">
-                <a th:if="${cat.type == 3}" th:href="${cat.linkUrl}" target="_blank" rel="noopener"
-                   th:text="${cat.name}">栏目</a>
-                <a th:unless="${cat.type == 3}" th:href="${url.category(cat.id)}"><span th:text="${cat.name}">栏目</span><i th:if="${!cat.children.isEmpty()}" class="af-caret" aria-hidden="true">▾</i></a>
-                <!-- 二级下拉：白底面板（.af-sub-nav 样式见 assets/css/main.css）；当前项高亮（docs/11） -->
-                <ul class="af-sub-nav" th:if="${!cat.children.isEmpty()}">
-                    <li th:each="sub : ${cat.children}"
-                        th:classappend="${sub.id == currentCategoryId} ? 'active'">
-                        <a th:if="${sub.type == 3}" th:href="${sub.linkUrl}" target="_blank" rel="noopener"
-                           th:text="${sub.name}">子栏目</a>
-                        <a th:unless="${sub.type == 3}" th:href="${url.category(sub.id)}" th:text="${sub.name}">子栏目</a>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-    </nav>
-</header>
-</html>

src/main/resources/templates/themes/agri-forest/fragments/home-blocks.html

@@ -1,257 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!--
-  agri-forest（农林绿）首页区块 fragment：站点配了 home_layout 时，区块正文必须由本文件渲染，
-  不能落到 themes/common 的通用骨架——否则换肤只换了页头页脚，首页正文仍是骨架内置蓝灰卡（线上事故根因）。
-  九段形态：news_grid（三图焦点+要闻列表）/ media_focus（来源徽标密行）/ compact（46px 日期方块行）/
-  image_wall（四列图片墙）/ card（默认卡：头条+行式）/ ticker（速递横条）/ gallery（校园映像图廊）/
-  links（专题网站缩略卡）/ empty（空态）。
-  契约：block 为渲染端装配的同构 Map（type/title/category.name/homeStyle/items/moreUrl/subtitle/
-  background/source/linkGroups），与回落模式 categoryBlocks 兼容；区块标题一律取 category.name。
-  空态守卫必须包在 th:block 外层：th:replace（优先级 100）先于 th:if（300）求值，写在同一标签上等于没写。
--->
-<!-- 形态一：三图焦点 + 要闻列表（homeStyle=news_grid）——横排 3 张封面卡 + 双列行式列表 -->
-<section class="af-section af-section--news" th:fragment="news_grid(block)" aria-label="栏目区块"
-         th:with="newsBg=${block['background'] != null ? (block['background'] ? site.config['news_bg_image'] : null) : site.config['news_bg_image']}">
-    <div class="af-sec-bg" th:if="${!#strings.isEmpty(newsBg)}"
-         th:style="|background-image:url(${url.upload(newsBg)})|"></div>
-    <div class="af-block af-container">
-        <div class="af-block-head">
-            <div class="af-block-title">
-                <span class="af-block-icon" aria-hidden="true">
-                    <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M4 5h11a1 1 0 0 1 1 1v13H6a2 2 0 0 1-2-2V5z"/><path d="M16 9h3a1 1 0 0 1 1 1v7a2 2 0 0 1-2 2"/><path d="M7 9h6M7 13h6M7 17h4"/></svg>
-                </span>
-                <h2 th:text="${block.category.name}">学校要闻</h2>
-            </div>
-            <a class="af-more" th:href="${block.moreUrl}">更多 &gt;</a>
-        </div>
-        <div class="af-news-body" th:if="${!#lists.isEmpty(block.items)}"
-             th:with="rest=${#lists.size(block.items) > 3 ? block.items.subList(3, block.items.size()) : null}">
-            <ul class="af-trio">
-                <li class="af-trio-item" th:each="item, stat : ${block.items}" th:if="${stat.index &lt; 3}">
-                    <a th:href="${url.article(item.id)}" th:title="${item.title}">
-                        <span class="af-trio-cover" th:if="${item.coverImage != null}">
-                            <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}" loading="lazy">
-                        </span>
-                        <span class="af-trio-cover af-trio-ph" th:if="${item.coverImage == null}" aria-hidden="true">
-                            <svg viewBox="0 0 24 24" width="30" height="30" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M5 19C5 9 12 4 20 4c0 9-5 15-12 15-1.5 0-3-.4-3-1z"/><path d="M5 19c3-5 6-8 10-10"/></svg>
-                        </span>
-                        <span class="af-trio-cap">
-                            <span class="af-trio-title" th:text="${item.title}">焦点标题</span>
-                            <span class="af-trio-meta">
-                                <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                                <time class="af-item-date" th:if="${item.publishTime != null}"
-                                      th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                            </span>
-                        </span>
-                    </a>
-                </li>
-            </ul>
-            <ul class="af-block-list af-block-list--two" th:if="${rest != null}">
-                <li class="af-line" th:each="item : ${rest}">
-                    <a class="af-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                    <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                    <time class="af-item-date" th:if="${item.publishTime != null}"
-                          th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-                </li>
-            </ul>
-        </div>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/agri-forest/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态二：来源徽标密行（homeStyle=media_focus）——学术动态，双列紧凑行 + 来源徽标 -->
-<section class="af-section af-container" th:fragment="media_focus(block)" aria-label="栏目区块">
-    <div class="af-block">
-        <div class="af-block-head">
-            <div class="af-block-title">
-                <span class="af-block-icon" aria-hidden="true">
-                    <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M9 3h6M10 3v6L4.6 18A2 2 0 0 0 6.3 21h11.4a2 2 0 0 0 1.7-3L14 9V3"/><path d="M7.5 15h9"/></svg>
-                </span>
-                <h2 th:text="${block.category.name}">学术动态</h2>
-            </div>
-            <a class="af-more" th:href="${block.moreUrl}">更多 &gt;</a>
-        </div>
-        <ul class="af-block-list af-block-list--two" th:if="${!#lists.isEmpty(block.items)}">
-            <li class="af-line af-line--media" th:each="item : ${block.items}">
-                <span class="af-src" th:if="${!#strings.isEmpty(item.source)}" th:text="${item.source}">来源</span>
-                <a class="af-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                <time class="af-item-date" th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/agri-forest/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态三：46px 日期方块列表（homeStyle=compact）——通知公告：日大号 + 年月小号，墨绿底白字，hover 金线 -->
-<section class="af-section af-container" th:fragment="compact(block)" aria-label="栏目区块">
-    <div class="af-block">
-        <div class="af-block-head">
-            <div class="af-block-title">
-                <span class="af-block-icon" aria-hidden="true">
-                    <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M3 10v4l6 1 9 5V4L9 9l-6 1z"/><path d="M7 15l1.5 5h3L10 16"/></svg>
-                </span>
-                <h2 th:text="${block.category.name}">通知公告</h2>
-            </div>
-            <a class="af-more" th:href="${block.moreUrl}">更多 &gt;</a>
-        </div>
-        <ul class="af-block-list af-notice-list" th:if="${!#lists.isEmpty(block.items)}">
-            <li class="af-line af-line--date" th:each="item : ${block.items}">
-                <span class="af-date-chip" th:if="${item.publishTime != null}" th:with="d=${item.publishTime}">
-                    <b th:text="${#temporals.format(d, 'dd')}">01</b>
-                    <i th:text="${#temporals.format(d, 'yyyy-MM')}">2026-01</i>
-                </span>
-                <a class="af-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/agri-forest/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态四：四列图片墙（homeStyle=image_wall）——仅取有封面的条目，悬浮标题 -->
-<section class="af-section af-container" th:fragment="image_wall(block)" aria-label="栏目区块">
-    <div class="af-block-head">
-        <div class="af-block-title">
-            <span class="af-block-icon" aria-hidden="true">
-                <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="5" width="18" height="14" rx="1"/><circle cx="8.5" cy="10" r="1.5"/><path d="M21 15.5l-4.5-4.5-9 8"/></svg>
-            </span>
-            <h2 th:text="${block.category.name}">图片新闻</h2>
-        </div>
-        <a class="af-more" th:href="${block.moreUrl}">更多 &gt;</a>
-    </div>
-    <ul class="af-wall" th:if="${!#lists.isEmpty(block.items)}">
-        <li class="af-wall-item" th:each="item : ${block.items}" th:if="${item.coverImage != null}">
-            <a th:href="${url.article(item.id)}" th:title="${item.title}">
-                <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}" loading="lazy">
-                <span class="af-wall-cap" th:text="${item.title}">图片标题</span>
-            </a>
-        </li>
-    </ul>
-    <th:block th:if="${#lists.isEmpty(block.items)}">
-        <div th:replace="~{'themes/agri-forest/fragments/home-blocks' :: empty(${block})}"></div>
-    </th:block>
-</section>
-
-<!-- 形态五：默认卡（homeStyle 未设/未知）——整宽头条（有封面则图文）+ 行式列表 -->
-<section class="af-section af-container" th:fragment="card(block)" aria-label="栏目区块">
-    <div class="af-block">
-        <div class="af-block-head">
-            <div class="af-block-title">
-                <span class="af-block-icon" aria-hidden="true">
-                    <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M6 3h8l4 4v14H6V3z"/><path d="M14 3v4h4M9 12h6M9 16h6"/></svg>
-                </span>
-                <h2 th:text="${block.category.name}">栏目名</h2>
-            </div>
-            <a class="af-more" th:href="${block.moreUrl}">更多 &gt;</a>
-        </div>
-        <div class="af-feat" th:if="${!#lists.isEmpty(block.items)}" th:with="feat=${block.items[0]}">
-            <a th:href="${url.article(feat.id)}">
-                <span class="af-feat-cover" th:if="${feat.coverImage != null}">
-                    <img th:src="${url.upload(feat.coverImage)}" th:alt="${feat.title}" loading="lazy">
-                </span>
-                <span class="af-feat-body">
-                    <span class="af-feat-title" th:text="${feat.title}">头条标题</span>
-                    <span class="af-feat-summary" th:if="${!#strings.isEmpty(feat.summary)}"
-                          th:text="${feat.summary}">摘要</span>
-                    <span class="af-feat-meta">
-                        <span class="af-top-badge" th:if="${feat.topmost == 1}">置顶</span>
-                        <time class="af-item-date" th:if="${feat.publishTime != null}"
-                              th:text="${#temporals.format(feat.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                    </span>
-                </span>
-            </a>
-        </div>
-        <ul class="af-block-list" th:if="${#lists.size(block.items) > 1}">
-            <li class="af-line" th:each="item, stat : ${block.items}" th:if="${stat.index > 0}">
-                <a class="af-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                <time class="af-item-date" th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/agri-forest/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 布局模式：要闻速递横条（block.items 由渲染端按置顶+最新装配；单行不换行，中文不塌列） -->
-<section class="af-ticker" th:fragment="ticker(block)" aria-label="要闻速递"
-         th:if="${!#lists.isEmpty(block.items)}">
-    <div class="af-container af-ticker-inner">
-        <span class="af-ticker-label">
-            <svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true" focusable="false"><path d="M3 10v4l6 1 9 5V4L9 9l-6 1z"/><path d="M7 15l1.5 5h3L10 16"/></svg>
-            <span th:text="${block.title}">要闻速递</span>
-        </span>
-        <ul class="af-ticker-list">
-            <li th:each="item : ${block.items}">
-                <a class="af-ticker-item" th:href="${url.article(item.id)}" th:text="${item.title}">要闻标题</a>
-            </li>
-        </ul>
-    </div>
-</section>
-
-<!-- 布局模式：校园映像图廊（block.items = 轮播位 gallery，四列图片墙 + 悬浮标题） -->
-<section class="af-section af-container af-gallery" th:fragment="gallery(block)" aria-label="校园映像"
-         th:if="${!#lists.isEmpty(block.items)}">
-    <div class="af-gallery-head">
-        <div class="af-block-title af-gallery-title">
-            <span class="af-block-icon" aria-hidden="true">
-                <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="5" width="18" height="14" rx="1"/><circle cx="8.5" cy="10" r="1.5"/><path d="M21 15.5l-4.5-4.5-9 8"/></svg>
-            </span>
-            <h2 th:text="${block.title}">校园映像</h2>
-        </div>
-        <p class="af-gallery-sub" th:if="${!#strings.isEmpty(block.subtitle)}" th:text="${block.subtitle}">
-            Campus Gallery
-        </p>
-    </div>
-    <ul class="af-wall af-wall--4">
-        <li class="af-wall-item" th:each="g : ${block.items}">
-            <a th:href="${g.linkUrl}" th:title="${g.title}">
-                <img th:src="${g.imageUrl}" th:alt="${g.title}" loading="lazy">
-                <span class="af-wall-cap" th:if="${!#strings.isEmpty(g.title)}" th:text="${g.title}">作品标题</span>
-            </a>
-        </li>
-    </ul>
-</section>
-
-<!-- 布局模式：专题网站缩略卡（block.linkGroups 由渲染端按 group 过滤；4 列卡片含标题条） -->
-<section class="af-section af-container" th:fragment="links(block)" aria-label="专题网站">
-    <div class="af-block-head">
-        <div class="af-block-title">
-            <span class="af-block-icon" aria-hidden="true">
-                <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
-            </span>
-            <h2 th:text="${block.title}">专题网站</h2>
-        </div>
-    </div>
-    <ul class="af-topic-grid">
-        <th:block th:each="grp : ${block.linkGroups}">
-            <li class="af-topic" th:each="l : ${grp.links}">
-                <a th:href="${l.linkUrl}" target="_blank" rel="noopener" th:title="${l.name}">
-                    <span class="af-topic-bar" aria-hidden="true"></span>
-                    <span class="af-topic-glyph" aria-hidden="true">
-                        <svg viewBox="0 0 24 24" width="22" height="22" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" focusable="false"><circle cx="12" cy="12" r="9"/><path d="M3 12h18M12 3c3 3.5 3 14 0 18M12 3c-3 3.5-3 14 0 18"/></svg>
-                    </span>
-                    <span class="af-topic-name" th:text="${l.name}">专题名称</span>
-                </a>
-            </li>
-        </th:block>
-    </ul>
-</section>
-
-<!-- 空态（各形态引用时守卫必须包在 th:block 外层：th:replace 优先级 100 先于 th:if 300 求值） -->
-<div class="af-empty" th:fragment="empty(block)">
-    <p>栏目暂无内容</p>
-    <p class="af-empty-hint">内容发布后将在此展示</p>
-</div>
-</html>

src/main/resources/templates/themes/agri-forest/guide.html

@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<!-- 事项指南页（事项库 §6.2 契约）：item / attachments[] / relatedItems[] /
-     faqCategoryUrl·noticeCategoryUrl·ruleCategoryUrl（可空）/ applyUrl（可空，空则不渲染"我要办理"）。
-     三个富文本字段已在保存期过 jsoup 白名单、渲染期补 URL 基准，此处允许 utext。
-     svcUnavailable=true（P1-4 停机降级）：只渲染骨架+空态，不渲染事项内容与"我要办理" -->
-<main class="af-page af-container" id="main-content">
-    <div class="af-page-card af-svc-guide">
-        <nav class="af-crumb" aria-label="面包屑">
-            <a th:href="${url.home()}">首页</a>
-            <span class="af-crumb-sep" aria-hidden="true">/</span>
-            <a th:href="${url.serviceList()}">服务中心</a>
-            <span class="af-crumb-sep" aria-hidden="true">/</span>
-            <span class="af-crumb-current" th:text="${svcUnavailable} ? '服务中心' : ${item.title}">事项名称</span>
-        </nav>
-
-        <!-- P1-4 停机空态：svc-hall 不可达时降级渲染（200），不出 500 错误页 -->
-        <div class="af-empty af-svc-unavailable" th:if="${svcUnavailable}">
-            <p>事项服务暂时不可用，请稍后再试</p>
-            <p class="af-empty-hint">事项数据服务暂不可达，稍后刷新即可恢复</p>
-        </div>
-
-        <article class="af-svc-guide-body" th:if="${!svcUnavailable}">
-            <h1 class="af-article-title" th:text="${item.title}">事项名称</h1>
-            <div class="af-article-meta">
-                <span th:if="${!#strings.isEmpty(item.deptName)}"
-                      th:text="${'办理部门：' + item.deptName}">办理部门</span>
-                <span th:text="${item.handleMode == 1 ? '线上办理' : (item.handleMode == 2 ? '线下办理' : '线上线下均可办理')}">办理方式</span>
-                <time th:if="${item.publishTime != null}"
-                      th:text="${'发布时间：' + #temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                <span th:text="${'浏览量：' + item.viewCount}">浏览量</span>
-            </div>
-
-            <!-- 我要办理：三态（手填外链 > svc_hall_base 生成 > 不渲染），按钮外链新窗口打开 -->
-            <div class="af-svc-apply" th:if="${applyUrl != null}">
-                <a class="af-svc-apply-btn" th:href="${applyUrl}" target="_blank" rel="noopener">我要办理</a>
-                <span class="af-svc-apply-hint">进入服务大厅在线办理</span>
-            </div>
-
-            <p class="af-svc-summary" th:if="${!#strings.isEmpty(item.summary)}" th:text="${item.summary}">简介</p>
-
-            <table class="af-svc-info">
-                <caption class="af-skip-link">事项基本信息</caption>
-                <tbody>
-                <tr th:if="${!#strings.isEmpty(item.objectName)}">
-                    <th scope="row">服务对象</th>
-                    <td th:text="${item.objectName}">服务对象</td>
-                </tr>
-                <tr th:if="${!#strings.isEmpty(item.categoryName)}">
-                    <th scope="row">事项类别</th>
-                    <td th:text="${item.categoryName}">事项类别</td>
-                </tr>
-                <tr th:if="${!#strings.isEmpty(item.handlePlace)}">
-                    <th scope="row">办理地点</th>
-                    <td th:text="${item.handlePlace}">办理地点</td>
-                </tr>
-                <tr th:if="${!#strings.isEmpty(item.handleTimeLimit)}">
-                    <th scope="row">办理时限</th>
-                    <td th:text="${item.handleTimeLimit}">办理时限</td>
-                </tr>
-                <tr th:if="${!#strings.isEmpty(item.promiseTimeLimit)}">
-                    <th scope="row">承诺时限</th>
-                    <td th:text="${item.promiseTimeLimit}">承诺时限</td>
-                </tr>
-                <tr th:if="${!#strings.isEmpty(item.contactPhone)}">
-                    <th scope="row">咨询电话</th>
-                    <td th:text="${item.contactPhone}">咨询电话</td>
-                </tr>
-                <tr th:if="${!#strings.isEmpty(item.supervisePhone)}">
-                    <th scope="row">监督投诉</th>
-                    <td th:text="${item.supervisePhone}">监督投诉电话</td>
-                </tr>
-                </tbody>
-            </table>
-
-            <section class="af-svc-section" th:if="${!#strings.isEmpty(item.processHtml)}">
-                <h2>办理流程</h2>
-                <div class="af-article-content" th:utext="${item.processHtml}">办理流程</div>
-            </section>
-            <section class="af-svc-section" th:if="${!#strings.isEmpty(item.materialHtml)}">
-                <h2>所需材料</h2>
-                <div class="af-article-content" th:utext="${item.materialHtml}">所需材料</div>
-            </section>
-            <section class="af-svc-section" th:if="${!#strings.isEmpty(item.noticeHtml)}">
-                <h2>注意事项</h2>
-                <div class="af-article-content" th:utext="${item.noticeHtml}">注意事项</div>
-            </section>
-
-            <section class="af-svc-section af-svc-attachments" th:if="${!#lists.isEmpty(attachments)}">
-                <h2>相关材料下载</h2>
-                <ul>
-                    <li th:each="att : ${attachments}">
-                        <a th:href="${url.upload(att.webUrl)}" th:download
-                           th:text="${att.fileName}">材料文件</a>
-                        <span class="af-svc-att-size" th:if="${att.fileSize != null}"
-                              th:text="${#numbers.formatDecimal(att.fileSize / 1024.0, 1, 1) + ' KB'}">12.3 KB</span>
-                    </li>
-                </ul>
-            </section>
-
-            <nav class="af-svc-links" th:if="${faqCategoryUrl != null or noticeCategoryUrl != null or ruleCategoryUrl != null}">
-                <a th:if="${faqCategoryUrl != null}" th:href="${faqCategoryUrl}">常见问题</a>
-                <a th:if="${noticeCategoryUrl != null}" th:href="${noticeCategoryUrl}">公告信息</a>
-                <a th:if="${ruleCategoryUrl != null}" th:href="${ruleCategoryUrl}">文件规定</a>
-            </nav>
-        </article>
-
-        <aside class="af-svc-related" th:if="${!svcUnavailable and !#lists.isEmpty(relatedItems)}">
-            <h2 class="af-section-title">相关服务</h2>
-            <ul class="af-svc-related-list">
-                <li th:each="rel : ${relatedItems}">
-                    <a th:href="${rel.url}">
-                        <span class="af-svc-related-name" th:text="${rel.title}">相关事项</span>
-                        <span class="af-svc-related-meta">
-                            <span th:if="${!#strings.isEmpty(rel.deptName)}" th:text="${rel.deptName}">部门</span>
-                            <span class="af-svc-tag"
-                                  th:text="${rel.handleMode == 1 ? '线上' : (rel.handleMode == 2 ? '线下' : '线上线下')}">方式</span>
-                        </span>
-                    </a>
-                </li>
-            </ul>
-        </aside>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/agri-forest/home.html

@@ -1,169 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="af-home" id="main-content">
-    <!-- 首页轮播位（cms_banner position=home；设计尺寸 1920×560，见 theme.json bannerSize）：
-         干净切图 + 左下墨绿标题条 -->
-    <section class="af-banner" th:if="${!#lists.isEmpty(banners)}" aria-label="焦点图片">
-        <div class="af-banner-slides">
-            <a class="af-banner-slide" th:each="b, stat : ${banners}"
-               th:classappend="${stat.first} ? 'active'"
-               th:href="${b.linkUrl}" th:title="${b.title}">
-                <img th:src="${b.imageUrl}" th:alt="${b.title}">
-                <span class="af-banner-title" th:text="${b.title}">标题</span>
-            </a>
-        </div>
-        <button class="af-banner-arrow prev" type="button" aria-label="上一张" th:if="${#lists.size(banners) > 1}">‹</button>
-        <button class="af-banner-arrow next" type="button" aria-label="下一张" th:if="${#lists.size(banners) > 1}">›</button>
-        <div class="af-banner-dots" th:if="${#lists.size(banners) > 1}">
-            <button th:each="b, stat : ${banners}" th:classappend="${stat.first} ? 'active'"
-                    th:aria-label="${'第' + (stat.count) + '张'}"></button>
-        </div>
-    </section>
-
-    <!-- 首页布局模式（docs/16 §4.4）：区块形态由本主题 fragments/home-blocks 承载——换肤必须连首页正文一起换，
-         只换页头页脚会被判「皮肤不生效」。未知类型仍回落 common 骨架（渲染端已过滤未知 type，正常不触发）。
-         注意：th:replace（优先级100）先于 th:case（300）执行——case 必须放父元素、replace 放子元素 -->
-    <th:block th:if="${layoutBlocks != null}">
-        <th:block th:each="block : ${layoutBlocks}">
-            <th:block th:switch="${block.type}">
-                <th:block th:case="'article_list'">
-                    <th:block th:switch="${block.homeStyle}">
-                        <th:block th:case="'news_grid'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: news_grid(${block})}" /></th:block>
-                        <th:block th:case="'media_focus'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: media_focus(${block})}" /></th:block>
-                        <th:block th:case="'compact'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: compact(${block})}" /></th:block>
-                        <th:block th:case="'image_wall'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: image_wall(${block})}" /></th:block>
-                        <th:block th:case="*"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: card(${block})}" /></th:block>
-                    </th:block>
-                </th:block>
-                <th:block th:case="'ticker'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: ticker(${block})}" /></th:block>
-                <th:block th:case="'gallery'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: gallery(${block})}" /></th:block>
-                <th:block th:case="'links'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: links(${block})}" /></th:block>
-                <th:block th:case="*"><th:block th:replace="~{'themes/common/fragments/home-blocks' :: render(${block})}" /></th:block>
-            </th:block>
-        </th:block>
-    </th:block>
-
-    <!-- 回落分支（docs/16 D2）：无 home_layout 时按现状渲染 -->
-    <th:block th:unless="${layoutBlocks != null}">
-    <!-- 三图焦点：图片新闻（focusArticles 必有封面）横排 3 卡 -->
-    <section class="af-section af-container" aria-label="图片新闻" th:if="${!#lists.isEmpty(focusArticles)}">
-        <div class="af-block-head">
-            <div class="af-block-title">
-                <span class="af-block-icon" aria-hidden="true">
-                    <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><rect x="3" y="5" width="18" height="14" rx="1"/><circle cx="8.5" cy="10" r="1.5"/><path d="M21 15.5l-4.5-4.5-9 8"/></svg>
-                </span>
-                <h2>图片新闻</h2>
-            </div>
-        </div>
-        <ul class="af-trio">
-            <li class="af-trio-item" th:each="item : ${focusArticles}">
-                <a th:href="${url.article(item.id)}" th:title="${item.title}">
-                    <span class="af-trio-cover">
-                        <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}">
-                    </span>
-                    <span class="af-trio-cap">
-                        <span class="af-trio-title" th:text="${item.title}">图片新闻标题</span>
-                        <span class="af-trio-meta">
-                            <time class="af-item-date" th:if="${item.publishTime != null}"
-                                  th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                        </span>
-                    </span>
-                </a>
-            </li>
-        </ul>
-    </section>
-
-    <!-- 头条区：头条推荐（置顶优先）大卡 + 右侧密行 -->
-    <section class="af-section af-container" aria-label="头条推荐">
-        <div class="af-headline" th:if="${!#lists.isEmpty(topArticles)}">
-            <div class="af-block">
-                <div class="af-block-head">
-                    <div class="af-block-title">
-                        <span class="af-block-icon" aria-hidden="true">
-                            <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M4 5h11a1 1 0 0 1 1 1v13H6a2 2 0 0 1-2-2V5z"/><path d="M16 9h3a1 1 0 0 1 1 1v7a2 2 0 0 1-2 2"/><path d="M7 9h6M7 13h6M7 17h4"/></svg>
-                        </span>
-                        <h2>头条推荐</h2>
-                    </div>
-                </div>
-                <div class="af-headline-body"
-                     th:with="rest=${#lists.size(topArticles) > 1 ? topArticles.subList(1, topArticles.size()) : null}">
-                    <div class="af-headline-lead" th:with="lead=${topArticles[0]}">
-                        <a class="af-lead-title" th:href="${url.article(lead.id)}" th:text="${lead.title}">头条标题</a>
-                        <div class="af-lead-meta">
-                            <span class="af-top-badge" th:if="${lead.topmost == 1}">置顶</span>
-                            <time class="af-item-date" th:if="${lead.publishTime != null}"
-                                  th:text="${#temporals.format(lead.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                        </div>
-                    </div>
-                    <ul class="af-block-list" th:if="${rest != null}">
-                        <li class="af-line" th:each="item : ${rest}">
-                            <a class="af-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                            <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                            <time class="af-item-date" th:if="${item.publishTime != null}"
-                                  th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <!-- 一级栏目区块（聚合列表型子孙栏目 top 8，D1-2）：通知公告形态（46px 日期方块） -->
-    <section class="af-section af-container" aria-label="栏目区块">
-        <div class="af-blocks">
-            <div class="af-block" th:each="block : ${categoryBlocks}">
-                <div class="af-block-head">
-                    <div class="af-block-title">
-                        <span class="af-block-icon" aria-hidden="true">
-                            <svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" focusable="false"><path d="M6 3h8l4 4v14H6V3z"/><path d="M14 3v4h4M9 12h6M9 16h6"/></svg>
-                        </span>
-                        <h2 th:text="${block.category.name}">栏目名</h2>
-                    </div>
-                    <a class="af-more" th:href="${block.moreUrl}">更多 &gt;</a>
-                </div>
-                <ul class="af-block-list af-notice-list" th:if="${!#lists.isEmpty(block.items)}">
-                    <!-- 区块头条：有封面则图文，无封面则带摘要纯文 -->
-                    <li class="af-feat-row" th:with="feat=${block.items[0]}">
-                        <a th:href="${url.article(feat.id)}">
-                            <span class="af-feat-cover" th:if="${feat.coverImage != null}">
-                                <img th:src="${url.upload(feat.coverImage)}" th:alt="${feat.title}">
-                            </span>
-                            <span class="af-feat-body">
-                                <span class="af-feat-title" th:text="${feat.title}">头条标题</span>
-                                <span class="af-feat-summary" th:if="${!#strings.isEmpty(feat.summary)}"
-                                      th:text="${feat.summary}">摘要</span>
-                                <span class="af-feat-meta">
-                                    <span class="af-top-badge" th:if="${feat.topmost == 1}">置顶</span>
-                                    <time class="af-item-date" th:if="${feat.publishTime != null}"
-                                          th:text="${#temporals.format(feat.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                                </span>
-                            </span>
-                        </a>
-                    </li>
-                    <li class="af-line af-line--date" th:each="item, stat : ${block.items}" th:if="${stat.index > 0}">
-                        <span class="af-date-chip" th:if="${item.publishTime != null}" th:with="d=${item.publishTime}">
-                            <b th:text="${#temporals.format(d, 'dd')}">01</b>
-                            <i th:text="${#temporals.format(d, 'yyyy-MM')}">2026-01</i>
-                        </span>
-                        <a class="af-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                    </li>
-                </ul>
-                <div class="af-empty" th:if="${#lists.isEmpty(block.items)}">
-                    <p>栏目暂无内容</p>
-                    <p class="af-empty-hint">内容发布后将在此展示</p>
-                </div>
-            </div>
-        </div>
-    </section>
-    </th:block>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/agri-forest/list.html

@@ -1,111 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<!-- 列表页（含搜索结果页两用）：themeParams['listLayout'] 切换形态——
-     date=46px 日期方块行（默认，农林官网典型）/ plain=通栏行式（隐藏方块、日期右置） -->
-<main class="af-page af-container" id="main-content"
-      th:classappend="${themeParams['listLayout'] == 'plain'} ? 'af-page--plainlist'">
-    <div class="af-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="af-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="af-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="af-side-nav-list">
-                <li class="af-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="af-page-card">
-            <nav class="af-crumb" aria-label="面包屑" th:if="${searchMode != true}">
-                <a th:href="${url.home()}">首页</a>
-                <th:block th:each="node, st : ${categoryPath}">
-                    <span class="af-crumb-sep" aria-hidden="true">/</span>
-                    <a th:if="${!st.last}" class="af-crumb-parent" th:href="${url.category(node.id)}"
-                       th:text="${node.name}">父栏目</a>
-                    <span class="af-crumb-current" th:if="${st.last}" th:text="${node.name}">栏目</span>
-                </th:block>
-            </nav>
-            <nav class="af-crumb" aria-label="面包屑" th:if="${searchMode == true}">
-                <a th:href="${url.home()}">首页</a>
-                <span class="af-crumb-sep" aria-hidden="true">/</span>
-                <span class="af-crumb-current">搜索结果</span>
-            </nav>
-
-            <h1 class="af-page-title" th:if="${searchMode != true}" th:text="${category.name}">栏目名</h1>
-            <h1 class="af-page-title" th:if="${searchMode == true}" th:text="'搜索：' + ${q}">搜索词</h1>
-
-            <ul class="af-article-list">
-                <!-- 有封面：图文行；无封面：日期方块行（plain 形态下自动切通栏行式），不造占位图 -->
-                <li th:each="item : ${listData.items}">
-                    <div class="af-article-row" th:if="${item.coverImage != null}">
-                        <a class="af-item-cover" th:href="${url.article(item.id)}">
-                            <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}">
-                        </a>
-                        <div class="af-item-body">
-                            <div class="af-item-title">
-                                <a th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                            </div>
-                            <p class="af-item-summary" th:if="${!#strings.isEmpty(item.summary)}"
-                               th:text="${item.summary}">摘要</p>
-                            <div class="af-item-meta">
-                                <time th:if="${item.publishTime != null}"
-                                      th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                                <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="af-article-line" th:if="${item.coverImage == null}">
-                        <span class="af-date-chip" th:if="${item.publishTime != null}" th:with="d=${item.publishTime}">
-                            <b th:text="${#temporals.format(d, 'dd')}">01</b>
-                            <i th:text="${#temporals.format(d, 'yyyy-MM')}">2026-01</i>
-                        </span>
-                        <div class="af-line-main">
-                            <a class="af-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                            <p class="af-item-summary" th:if="${!#strings.isEmpty(item.summary)}"
-                               th:text="${item.summary}">摘要</p>
-                        </div>
-                        <div class="af-line-side">
-                            <span class="af-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                            <time class="af-line-date" th:if="${item.publishTime != null}"
-                                  th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                        </div>
-                    </div>
-                </li>
-            </ul>
-            <div class="af-empty" th:if="${#lists.isEmpty(listData.items)}">
-                <p th:if="${searchMode == true}">未找到相关内容</p>
-                <p th:if="${searchMode != true}">栏目暂无内容</p>
-                <p class="af-empty-hint" th:if="${searchMode == true}">换个关键词试试</p>
-                <p class="af-empty-hint" th:if="${searchMode != true}">内容发布后将在此展示</p>
-            </div>
-
-            <!-- 分页（列表页/搜索页共用） -->
-            <nav class="af-pagination" th:if="${listData.totalPages > 1}"
-                 th:with="cur=${listData.page}, total=${listData.totalPages}" aria-label="分页">
-                <a th:classappend="${cur <= 1} ? 'disabled'"
-                   th:href="${searchMode == true} ? ${url.search(q, cur - 1)} : ${url.category(listData.categoryId) + '?page=' + (cur - 1)}"
-                   th:aria-disabled="${cur <= 1}">上一页</a>
-                <a th:each="p : ${#numbers.sequence(1, total)}"
-                   th:classappend="${p == cur} ? 'active'"
-                   th:href="${searchMode == true} ? ${url.search(q, p)} : ${url.category(listData.categoryId) + '?page=' + p}"
-                   th:aria-label="${'第' + p + '页'}"
-                   th:text="${p}">1</a>
-                <a th:classappend="${cur >= total} ? 'disabled'"
-                   th:href="${searchMode == true} ? ${url.search(q, cur + 1)} : ${url.category(listData.categoryId) + '?page=' + (cur + 1)}"
-                   th:aria-disabled="${cur >= total}">下一页</a>
-            </nav>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/agri-forest/service.html

@@ -1,111 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<!-- 服务中心（事项库 §6.1 契约）：serviceList / serviceFilters / activeFilters / q；
-     筛选与分页 URL 全部后端预生成（facets[].url / pageUrls[].url），模板禁止手拼 query -->
-<main class="af-page af-container" id="main-content">
-    <div class="af-page-card af-svc-page">
-        <nav class="af-crumb" aria-label="面包屑">
-            <a th:href="${url.home()}">首页</a>
-            <span class="af-crumb-sep" aria-hidden="true">/</span>
-            <span class="af-crumb-current">服务中心</span>
-        </nav>
-
-        <h1 class="af-page-title">服务中心</h1>
-
-        <!-- P1-4 停机空态：svc-hall 不可达时降级渲染（200），不出 500 错误页 -->
-        <div class="af-empty af-svc-unavailable" th:if="${svcUnavailable}">
-            <p>事项服务暂时不可用，请稍后再试</p>
-            <p class="af-empty-hint">事项数据服务暂不可达，稍后刷新即可恢复</p>
-        </div>
-
-        <div class="af-svc-filters"
-             th:if="${!svcUnavailable and (!#lists.isEmpty(serviceFilters.objects) or !#lists.isEmpty(serviceFilters.categories) or !#lists.isEmpty(serviceFilters.depts))}">
-            <div class="af-svc-filter-group" th:if="${!#lists.isEmpty(serviceFilters.objects)}">
-                <span class="af-svc-filter-label">服务对象</span>
-                <div class="af-svc-filter-options">
-                    <a class="af-svc-chip" th:each="opt : ${serviceFilters.objects}"
-                       th:classappend="${opt.active} ? 'active'" th:href="${opt.url}">
-                        <span th:text="${opt.name}">对象</span><em th:text="${opt.count}">0</em>
-                    </a>
-                </div>
-            </div>
-            <div class="af-svc-filter-group" th:if="${!#lists.isEmpty(serviceFilters.categories)}">
-                <span class="af-svc-filter-label">事项类别</span>
-                <div class="af-svc-filter-options">
-                    <a class="af-svc-chip" th:each="opt : ${serviceFilters.categories}"
-                       th:classappend="${opt.active} ? 'active'" th:href="${opt.url}">
-                        <span th:text="${opt.name}">类别</span><em th:text="${opt.count}">0</em>
-                    </a>
-                </div>
-            </div>
-            <div class="af-svc-filter-group" th:if="${!#lists.isEmpty(serviceFilters.depts)}">
-                <span class="af-svc-filter-label">服务部门</span>
-                <div class="af-svc-filter-options">
-                    <a class="af-svc-chip" th:each="opt : ${serviceFilters.depts}"
-                       th:classappend="${opt.active} ? 'active'" th:href="${opt.url}">
-                        <span th:text="${opt.name}">部门</span><em th:text="${opt.count}">0</em>
-                    </a>
-                </div>
-            </div>
-        </div>
-
-        <div class="af-svc-toolbar" th:if="${!svcUnavailable}">
-            <form class="af-svc-search" th:action="${url.serviceList()}" method="get" role="search">
-                <input type="search" name="q" th:value="${q}" placeholder="搜索事项名称 / 简介" maxlength="64">
-                <button type="submit">搜索</button>
-            </form>
-            <a class="af-svc-clear" th:if="${activeFilters.hasAny}" th:href="${activeFilters.clearUrl}">清除筛选</a>
-        </div>
-
-        <ul class="af-svc-list" th:if="${!svcUnavailable}">
-            <li th:each="it : ${serviceList.items}">
-                <a class="af-svc-item" th:href="${url.serviceItem(it.id)}">
-                    <span class="af-svc-item-cover" th:if="${it.coverImage != null}">
-                        <img th:src="${url.upload(it.coverImage)}" th:alt="${it.title}">
-                    </span>
-                    <span class="af-svc-item-body">
-                        <span class="af-svc-item-title">
-                            <span class="af-svc-item-name" th:text="${it.title}">事项名称</span>
-                            <span class="af-svc-tag online" th:if="${it.onlineFlag == 1}">可在线办理</span>
-                            <span class="af-svc-tag"
-                                  th:text="${it.handleMode == 1 ? '线上办理' : (it.handleMode == 2 ? '线下办理' : '线上线下')}">办理方式</span>
-                        </span>
-                        <span class="af-svc-item-summary" th:if="${!#strings.isEmpty(it.summary)}"
-                              th:text="${it.summary}">简介</span>
-                        <span class="af-svc-item-meta">
-                            <span th:if="${!#strings.isEmpty(it.deptName)}" th:text="${it.deptName}">部门</span>
-                            <span th:if="${!#strings.isEmpty(it.categoryName)}" th:text="${it.categoryName}">类别</span>
-                            <time th:if="${it.publishTime != null}"
-                                  th:text="${#temporals.format(it.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                        </span>
-                    </span>
-                </a>
-            </li>
-        </ul>
-        <div class="af-empty" th:if="${!svcUnavailable and #lists.isEmpty(serviceList.items)}">
-            <p th:if="${activeFilters.hasAny}">未找到符合条件的服务事项</p>
-            <p th:if="${!activeFilters.hasAny}">服务中心暂未上架事项</p>
-            <p class="af-empty-hint" th:if="${activeFilters.hasAny}">换个筛选条件或关键词试试</p>
-            <p class="af-empty-hint" th:if="${!activeFilters.hasAny}">事项发布后将在此展示</p>
-        </div>
-
-        <!-- 分页：URL 由后端预生成（携带当前筛选，pageUrls[].active 标记当前页）；停机态 totalPages=0 自然隐藏 -->
-        <nav class="af-pagination" th:if="${!svcUnavailable and serviceList.totalPages > 1}" aria-label="分页">
-            <a th:each="p : ${serviceList.pageUrls}"
-               th:classappend="${p.active} ? 'active'"
-               th:href="${p.url}"
-               th:aria-label="${'第' + p.page + '页'}"
-               th:aria-current="${p.active} ? 'page'"
-               th:text="${p.page}">1</a>
-        </nav>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/agri-forest/single.html

@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="af-page af-container" id="main-content">
-    <div class="af-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="af-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="af-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="af-side-nav-list">
-                <li class="af-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="af-page-card">
-            <nav class="af-crumb" aria-label="面包屑">
-                <a th:href="${url.home()}">首页</a>
-                <th:block th:each="node : ${categoryPath}">
-                    <span class="af-crumb-sep" aria-hidden="true">/</span>
-                    <a class="af-crumb-parent" th:href="${url.category(node.id)}" th:text="${node.name}">栏目</a>
-                </th:block>
-                <span class="af-crumb-sep" th:if="${currentCategoryId != null}" aria-hidden="true">/</span>
-                <span class="af-crumb-current">正文</span>
-            </nav>
-
-            <article class="af-article">
-                <h1 class="af-article-title" th:text="${category.name}">栏目名</h1>
-                <!-- 单页栏目内容（type=2，入库前已 jsoup 清洗） -->
-                <div class="af-article-content" th:if="${!#strings.isEmpty(category.content)}"
-                     th:utext="${category.content}">单页内容</div>
-                <div class="af-empty" th:if="${#strings.isEmpty(category.content)}">
-                    <p>页面暂无内容</p>
-                    <p class="af-empty-hint">内容编辑后将在此展示</p>
-                </div>
-            </article>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/agri-forest/theme.json

@@ -1,30 +0,0 @@
-{
-  "specVersion": 1,
-  "name": "agri-forest",
-  "title": "农林绿（agri-forest）",
-  "version": "1.0.0",
-  "author": "yunhai",
-  "description": "墨绿+麦穗金的农林院校风（设计语言参考信阳农林学院官网）。",
-  "screenshot": "assets/screenshot.png",
-  "bannerSize": "1920x560",
-  "params": [
-    { "key": "primary",      "cssVar": "--af-primary",      "label": "主色（墨绿）", "type": "color", "default": "#1C6E19" },
-    { "key": "primaryDark",  "cssVar": "--af-primary-dark", "label": "主色加深",     "type": "color", "default": "#14510F" },
-    { "key": "primaryLight", "cssVar": "--af-primary-light","label": "主色提亮",     "type": "color", "default": "#3FA43A" },
-    { "key": "accent",       "cssVar": "--af-accent",       "label": "麦穗金",       "type": "color", "default": "#C8A45C" },
-    { "key": "navBg",        "cssVar": "--af-nav-bg",       "label": "主导航底色",   "type": "color", "default": "#1C6E19" },
-    { "key": "footerBg",     "cssVar": "--af-footer-bg",    "label": "页脚底色",     "type": "color", "default": "#14510F" },
-    { "key": "text",         "cssVar": "--af-text",         "label": "正文文字色",   "type": "color", "default": "#2A3327" },
-    { "key": "textLight",    "cssVar": "--af-text-light",   "label": "次要文字色",   "type": "color", "default": "#6C7A67" },
-    { "key": "bg",           "cssVar": "--af-bg",           "label": "页面底色",     "type": "color", "default": "#F5F8F3" },
-    { "key": "cardBg",       "cssVar": "--af-card-bg",      "label": "卡片底色",     "type": "color", "default": "#FFFFFF" },
-    { "key": "border",       "cssVar": "--af-border",       "label": "边框色",       "type": "color", "default": "#DDE8DA" },
-    { "key": "linkGreen",    "cssVar": "--af-link",         "label": "链接绿",       "type": "color", "default": "#277428" },
-    { "key": "listLayout",   "label": "列表页形态", "type": "select", "default": "date",
-      "options": [
-        { "value": "date",  "label": "日期方块" },
-        { "value": "plain", "label": "通栏行式" }
-      ]
-    }
-  ]
-}

src/main/resources/templates/themes/blue-white/README.md

@@ -1,23 +0,0 @@
-# blue-white 皮肤包
-
-由 default 派生的演示皮肤（方案 §7）。**升级随版本发布，不在站点间复制目录**。
-
-## 数据契约（模板可取用的 model 属性全集，§4.3）
-
-| 页面 | 属性 |
-| --- | --- |
-| 全部 | `site`（快照：config/分类树/轮播/友链组/院系子站）、`url`（PortalUrlHelper：home/category/article/asset/search/siteHome）、`themeBase`（=`themes/blue-white`）、`navCategories`、`pageTitle`、`seoDescription`、`canonical`、`themeParams`（微调参数，仅 theme.json 声明过的 key）、`themeVarsCss`（服务端预构建 `:root{}` 覆盖串，无参数为空） |
-| home | `banners`（时间窗内 home 位）、`topArticles`（置顶+最新 6）、`categoryBlocks`（LIST 型根栏目块，各 top 8） |
-| list / search | `listData`（分页）、`category`（list）、`q` + `searchMode`（search） |
-| detail | `article`、`prevArticle`、`nextArticle`、`currentCategoryId` |
-| single | `category`（含 `content`）、`currentCategoryId` |
-
-原则：皮肤不得假设"首页一定有轮播"，对空集合优雅降级。
-
-## 轮播图尺寸约定（bannerSize）
-
-1920x560（管理端上传端按此引导裁剪，D2 决策点）。
-
-## 可调参数
-
-见 `theme.json` 的 `params`（color 进 CSS 变量；select 供模板 `th:if` 分支布局）。

src/main/resources/templates/themes/blue-white/assets/css/main.css

@@ -1,370 +0,0 @@
-/* ============================================================
- * blue-white 皮肤包样式（default 派生）（方案 §8.2）
- * 换肤 = 拷贝 default 目录改 CSS 变量与布局，零后端代码。
- * 轮播图设计尺寸约定：1920×560（管理端上传端按此引导裁剪，D2 决策点确认）。
- * ============================================================ */
-:root {
-  --primary: #2f6bd8;
-  --primary-dark: #1d4fae;
-  --text: #333;
-  --text-light: #777;
-  --bg: #f7f9fc;
-  --card-bg: #fff;
-  --border: #e3e9f2;
-  --max-width: 1200px;
-}
-
-* { box-sizing: border-box; }
-body {
-  margin: 0;
-  font-family: "PingFang SC", "Microsoft YaHei", "Helvetica Neue", Arial, sans-serif;
-  color: var(--text);
-  background: var(--bg);
-}
-a { color: inherit; text-decoration: none; }
-a:hover { color: var(--primary); }
-img { max-width: 100%; }
-time, .item-meta { color: var(--text-light); font-size: 13px; }
-.empty { color: var(--text-light); text-align: center; padding: 32px 0; }
-
-/* ===== 头部 ===== */
-.site-header { background: var(--card-bg); border-bottom: 1px solid var(--border); }
-.header-inner {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 18px 16px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-}
-.site-brand { display: flex; align-items: center; gap: 12px; }
-.site-logo { height: 44px; }
-.site-name { font-size: 26px; font-weight: 700; color: var(--primary); }
-.site-search { display: flex; }
-.site-search input {
-  border: 1px solid var(--border);
-  border-right: none;
-  padding: 8px 12px;
-  width: 220px;
-  outline: none;
-}
-.site-search button {
-  border: none;
-  background: var(--primary);
-  color: #fff;
-  padding: 8px 18px;
-  cursor: pointer;
-}
-
-/* ===== 专业院系下拉（院系子站切换，《院系子站方案》） ===== */
-/* 悬停展开白底纵向列表，右对齐 + 超高滚动（院系数十个子站场景） */
-.site-colleges { position: relative; }
-.site-colleges .colleges-toggle {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  border: 1px solid var(--border);
-  padding: 8px 14px;
-  cursor: pointer;
-  color: var(--primary);
-  font-weight: 600;
-  white-space: nowrap;
-}
-.site-colleges .colleges-arrow { font-style: normal; font-size: 12px; color: var(--text-light); }
-.site-colleges .colleges-menu {
-  display: none;
-  position: absolute;
-  top: 100%;
-  right: 0;
-  min-width: 200px;
-  max-height: 420px;
-  overflow-y: auto;
-  margin: 0;
-  padding: 6px 0;
-  list-style: none;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-  border-top: 2px solid var(--primary);
-  box-shadow: 0 6px 16px rgba(0, 0, 0, .12);
-  z-index: 110;
-}
-.site-colleges:hover .colleges-menu { display: block; }
-.site-colleges .colleges-menu li a {
-  display: block;
-  padding: 9px 16px;
-  color: var(--text);
-  white-space: nowrap;
-}
-.site-colleges .colleges-menu li a:hover { background: #f2f6fc; color: var(--primary); }
-.site-colleges .colleges-menu li.active a { color: var(--primary); font-weight: 600; }
-.site-nav { background: var(--primary); }
-.site-nav ul {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 0 16px;
-  list-style: none;
-  display: flex;
-  flex-wrap: wrap;
-}
-.site-nav li a {
-  display: block;
-  padding: 12px 22px;
-  color: #fff;
-}
-.site-nav li:hover a, .site-nav li.active a { background: var(--primary-dark); }
-
-/* ===== 二级下拉导航 ===== */
-/* 面板为白底纵向列表：需整体覆盖 .site-nav ul 的横向 flex 与内边距 */
-.site-nav > ul > li { position: relative; }
-.site-nav li.has-sub > a::after { content: " ▾"; font-size: 12px; opacity: .85; }
-.site-nav ul.sub-nav {
-  display: none;
-  position: absolute;
-  top: 100%;
-  left: 0;
-  min-width: 168px;
-  max-width: none;
-  margin: 0;
-  padding: 6px 0;
-  list-style: none;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-  border-top: 2px solid var(--primary);
-  box-shadow: 0 6px 16px rgba(0, 0, 0, .12);
-  z-index: 100;
-}
-.site-nav li:hover > .sub-nav { display: block; }
-.site-nav .sub-nav li a {
-  padding: 9px 16px;
-  color: var(--text);
-  white-space: nowrap;
-  background: none;
-}
-.site-nav .sub-nav li a:hover { background: #f2f6fc; color: var(--primary); }
-.site-nav .sub-nav li.active a { color: var(--primary); font-weight: 600; }
-
-/* ===== 首页轮播 ===== */
-.banner { position: relative; max-width: var(--max-width); margin: 16px auto; overflow: hidden; }
-.banner-slides { position: relative; height: 420px; }
-.banner-slide { display: none; position: absolute; inset: 0; }
-.banner-slide.active { display: block; }
-.banner-slide img { width: 100%; height: 100%; object-fit: cover; }
-.banner-title {
-  position: absolute;
-  left: 0; right: 0; bottom: 0;
-  padding: 12px 20px;
-  color: #fff;
-  background: linear-gradient(transparent, rgba(0, 0, 0, .6));
-}
-.banner-dots {
-  position: absolute;
-  bottom: 12px; right: 20px;
-  display: flex; gap: 8px;
-}
-.banner-dots button {
-  width: 10px; height: 10px;
-  border-radius: 50%;
-  border: none;
-  background: rgba(255, 255, 255, .6);
-  cursor: pointer;
-}
-.banner-dots button.active { background: #fff; }
-
-/* ===== 通用区块 ===== */
-.top-strip, .category-block {
-  max-width: var(--max-width);
-  margin: 16px auto;
-  padding: 20px;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-}
-.section-title, .block-head h2 {
-  margin: 0 0 12px;
-  font-size: 20px;
-  border-left: 4px solid var(--primary);
-  padding-left: 10px;
-}
-.block-head { display: flex; align-items: baseline; justify-content: space-between; }
-.more { font-size: 13px; color: var(--text-light); }
-.top-strip ul, .block-list { list-style: none; margin: 0; padding: 0; }
-.top-strip li, .block-list li {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-  padding: 9px 0;
-  border-bottom: 1px dashed var(--border);
-}
-.top-strip li:last-child, .block-list li:last-child { border-bottom: none; }
-.top-strip li a, .block-list li a {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.top-badge {
-  flex: none;
-  color: #fff;
-  background: var(--primary);
-  font-size: 12px;
-  padding: 1px 6px;
-  border-radius: 2px;
-}
-
-/* ===== 列表页 ===== */
-.list-main {
-  max-width: var(--max-width);
-  margin: 16px auto;
-  padding: 24px;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-}
-.breadcrumb { color: var(--text-light); font-size: 13px; margin-bottom: 16px; }
-.breadcrumb a { margin-right: 8px; }
-.breadcrumb span { margin-left: 8px; }
-.page-title {
-  font-size: 22px;
-  border-left: 4px solid var(--primary);
-  padding-left: 10px;
-  margin: 0 0 18px;
-}
-.article-list { list-style: none; margin: 0; padding: 0; }
-.article-list li { padding: 14px 0; border-bottom: 1px dashed var(--border); }
-.item-title { font-size: 17px; }
-.item-summary {
-  color: var(--text-light);
-  font-size: 14px;
-  margin: 6px 0;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-.item-meta { display: flex; gap: 10px; align-items: center; }
-
-/* ===== 分页 ===== */
-.pagination { display: flex; gap: 6px; justify-content: center; padding: 24px 0 4px; }
-.pagination a {
-  min-width: 34px;
-  text-align: center;
-  padding: 6px 10px;
-  border: 1px solid var(--border);
-  background: var(--card-bg);
-}
-.pagination a.active { background: var(--primary); color: #fff; border-color: var(--primary); }
-
-/* ===== 详情/单页 ===== */
-.detail-main {
-  max-width: var(--max-width);
-  margin: 16px auto;
-  padding: 32px;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-}
-.article-title { margin: 8px 0 12px; font-size: 26px; text-align: center; }
-.article-meta {
-  display: flex;
-  gap: 18px;
-  justify-content: center;
-  flex-wrap: wrap;
-  color: var(--text-light);
-  font-size: 13px;
-  padding-bottom: 18px;
-  border-bottom: 1px solid var(--border);
-}
-.article-content { line-height: 1.9; font-size: 16px; padding-top: 20px; word-break: break-word; }
-.article-content img { height: auto; }
-.article-content table { border-collapse: collapse; width: 100%; }
-.article-content table td, .article-content table th { border: 1px solid var(--border); padding: 6px 10px; }
-.article-sibling { display: flex; flex-direction: column; gap: 8px; margin-top: 28px; font-size: 14px; }
-
-/* ===== 页脚 ===== */
-.site-footer { margin-top: 32px; background: var(--primary-dark); color: rgba(255, 255, 255, .85); }
-.footer-links {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 18px 16px 0;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-.links-group { display: flex; flex-wrap: wrap; gap: 14px; align-items: center; font-size: 13px; }
-.group-name { font-weight: 600; margin-right: 4px; }
-.footer-info {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 12px 16px 20px;
-  text-align: center;
-  font-size: 13px;
-}
-.footer-info p { margin: 4px 0; }
-
-/* ===== 移动端适配 ===== */
-@media (max-width: 768px) {
-  .header-inner { flex-direction: column; align-items: stretch; }
-  .site-search input { flex: 1; width: auto; }
-  .site-colleges { align-self: flex-start; }
-  .site-colleges .colleges-menu { left: 0; right: auto; min-width: 100%; }
-  .banner-slides { height: 200px; }
-  .detail-main, .list-main { padding: 18px 14px; }
-  .article-title { font-size: 22px; }
-  /* 触屏无 hover：子菜单静态平铺（缩进列表），不做浮层 */
-  .site-nav ul.sub-nav {
-    display: block;
-    position: static;
-    border: none;
-    box-shadow: none;
-    background: transparent;
-    min-width: 0;
-    padding: 0 0 6px;
-  }
-  .site-nav .sub-nav li a { color: rgba(255, 255, 255, .9); padding: 8px 16px 8px 34px; }
-  .site-nav .sub-nav li a:hover { background: var(--primary-dark); color: #fff; }
-}
-
-
-/* ===== blue-white 主题差异层（方案 §7：差异仅限 CSS + fragments）===== */
-/* 细线顶栏 + 大留白 + 卡片化列表 */
-.site-header { border-bottom: 1px solid var(--border); box-shadow: none; }
-.home-main, .list-main, .detail-main { padding-top: 36px; padding-bottom: 56px; }
-.article-list .article-title, .block-head, .page-title { letter-spacing: .02em; }
-.article-list li, .banner, .banner-title { border-radius: 4px; }
-
-/* B4 友链 Logo：与名称并排小图（高度 ~20px，垂直居中；过宽截断不撑破页脚） */
-.links-group a .link-logo,
-.sp-links-row a .link-logo {
-    height: 20px;
-    width: auto;
-    max-width: 64px;
-    object-fit: contain;
-    vertical-align: middle;
-    margin-right: 4px;
-    border-radius: 2px;
-}
-
-
-/* ===== 左侧栏目导航（docs/11）：有二级节点的模块，栏目/文章页左侧展示兄弟目录 ===== */
-.list-main.has-sidenav, .detail-main.has-sidenav { display: flex; align-items: flex-start; gap: 24px; }
-.has-sidenav .list-body { flex: 1; min-width: 0; }
-.side-nav { flex: none; width: 220px; background: var(--card-bg, #fff); border: 1px solid var(--border); overflow: hidden; }
-.side-nav-head { background: var(--primary); color: #fff; font-size: 20px; font-weight: 700; text-align: center; padding: 18px 12px; letter-spacing: 2px; }
-.side-nav-list { list-style: none; margin: 0; padding: 0; }
-.side-nav-item + .side-nav-item { border-top: 1px dashed var(--border); }
-.side-nav-item a { display: block; padding: 12px 16px; color: var(--text); text-decoration: none; font-size: 15px; transition: background .15s ease, color .15s ease; }
-.side-nav-item a:hover { color: var(--primary); background: var(--bg); }
-.side-nav-item.active a { background: var(--primary); color: #fff; font-weight: 600; text-decoration: none; }
-/* 顶导航二级下拉当前项高亮（docs/11 顺带） */
-.site-nav ul.sub-nav li.active a { color: var(--primary); }
-@media (max-width: 768px) {
-  .list-main.has-sidenav, .detail-main.has-sidenav { flex-direction: column; gap: 12px; }
-  .side-nav { width: 100%; }
-  .side-nav-list { display: flex; overflow-x: auto; -webkit-overflow-scrolling: touch; }
-  .side-nav-item { flex: none; }
-  .side-nav-item + .side-nav-item { border-top: none; border-left: 1px dashed var(--border); }
-  .side-nav-item a { white-space: nowrap; }
-}
-@media print {
-  .side-nav { display: none; }
-  .list-main.has-sidenav, .detail-main.has-sidenav { display: block; }
-}

src/main/resources/templates/themes/blue-white/assets/favicon.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <defs><linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
-    <stop offset="0" stop-color="#5486df"/><stop offset="1" stop-color="#214b97"/>
-  </linearGradient></defs>
-  <rect width="64" height="64" fill="url(#bg)"/>
-  <circle cx="32" cy="25" r="10" fill="#ffffff"/>
-  <path d="M 16 49.3 Q 32 30.7 48 49.3 Z" fill="#ffffff" opacity="0.92"/>
-</svg>

src/main/resources/templates/themes/blue-white/assets/js/main.js

@@ -1,40 +0,0 @@
-/* default 皮肤包脚本：仅首页轮播自动播放与圆点切换，无任何外部依赖 */
-(function () {
-  var slides = document.querySelectorAll('.banner-slide');
-  var dots = document.querySelectorAll('.banner-dots button');
-  if (!slides.length) {
-    return;
-  }
-  var current = 0;
-  var timer = null;
-
-  function show(index) {
-    slides[current].classList.remove('active');
-    if (dots[current]) {
-      dots[current].classList.remove('active');
-    }
-    current = (index + slides.length) % slides.length;
-    slides[current].classList.add('active');
-    if (dots[current]) {
-      dots[current].classList.add('active');
-    }
-  }
-
-  function start() {
-    if (slides.length > 1) {
-      timer = window.setInterval(function () {
-        show(current + 1);
-      }, 5000);
-    }
-  }
-
-  dots.forEach(function (dot, index) {
-    dot.addEventListener('click', function () {
-      window.clearInterval(timer);
-      show(index);
-      start();
-    });
-  });
-
-  start();
-})();

src/main/resources/templates/themes/blue-white/detail.html

@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="detail-main" th:classappend="${sideNav != null} ? 'has-sidenav'">
-    <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-    <aside class="side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-        <div class="side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-        <ul class="side-nav-list">
-            <li class="side-nav-item" th:each="item : ${sideNav.items}"
-                th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                   th:text="${item.name}">子栏目</a>
-                <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-            </li>
-        </ul>
-    </aside>
-    <div class="list-body">
-    <nav class="breadcrumb">
-        <a th:href="${url.home()}">首页</a>
-        <th:block th:each="node : ${categoryPath}">
-            <a class="crumb-parent" th:href="${url.category(node.id)}" th:text="${node.name}">栏目</a>
-        </th:block>
-        <span>正文</span>
-    </nav>
-
-    <article class="article">
-        <h1 class="article-title" th:text="${article.title}">文章标题</h1>
-        <div class="article-meta">
-            <time th:if="${article.publishTime != null}"
-                  th:text="${'发布时间：' + #temporals.format(article.publishTime, 'yyyy-MM-dd HH:mm')}">2026-01-01 10:00</time>
-            <span th:if="${!#strings.isEmpty(article.authorName)}"
-                  th:text="'作者：' + ${article.authorName}">作者</span>
-            <span th:if="${!#strings.isEmpty(article.source)}"
-                  th:text="'来源：' + ${article.source}">来源</span>
-            <span th:text="'浏览量：' + ${article.viewCount}">浏览量</span>
-        </div>
-        <!-- 正文：入库前已经 jsoup 白名单清洗（方案 §8.5），此处允许 utext；
-             其余字段一律 th:text 转义输出 -->
-        <div class="article-content" th:utext="${article.content}">正文</div>
-    </article>
-
-    <nav class="article-sibling">
-        <a th:if="${prevArticle != null}" class="prev"
-           th:href="${url.article(prevArticle.id)}"
-           th:text="'上一篇：' + ${prevArticle.title}">上一篇</a>
-        <a th:if="${nextArticle != null}" class="next"
-           th:href="${url.article(nextArticle.id)}"
-           th:text="'下一篇：' + ${nextArticle.title}">下一篇</a>
-    </nav>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-</body>
-</html>

src/main/resources/templates/themes/blue-white/fragments/footer.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- 公共页脚：联系信息 + 友情链接（分组渲染，方案 §8.1：友链不设独立路由） -->
-<footer class="site-footer" th:fragment="footer">
-    <div class="footer-links" th:if="${!#lists.isEmpty(site.linkGroups)}">
-        <div class="links-group" th:each="group : ${site.linkGroups}">
-            <span class="group-name" th:text="${group.groupName}">分组</span>
-            <a th:each="link : ${group.links}" th:href="${link.linkUrl}" target="_blank" rel="noopener">
-                    <img th:if="${link.logoUrl != null and !#strings.isEmpty(link.logoUrl)}" class="link-logo"
-                         th:src="${url.upload(link.logoUrl)}" th:alt="${link.name}" loading="lazy">
-                    <span th:text="${link.name}">链接</span>
-                </a>
-        </div>
-    </div>
-    <div class="footer-info">
-        <p th:if="${site.config['contact'] != null}" th:text="${site.config['contact']}">联系方式</p>
-        <p th:if="${site.config['copyright'] != null}" th:text="${site.config['copyright']}">版权信息</p>
-        <p th:if="${site.config['beian'] != null}" th:text="${site.config['beian']}">备案号</p>
-    </div>
-</footer>
-</html>

src/main/resources/templates/themes/blue-white/fragments/head.html

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<!-- 公共 head 片段：SEO（title/description/canonical）+ 主题资产（方案 §8.3/§8.6） -->
-<head th:fragment="head">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title th:text="${pageTitle}">页面标题</title>
-    <meta name="description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}"
-          th:content="${seoDescription}">
-    <link rel="canonical" th:if="${canonical != null}" th:href="${canonical}">
-    <!-- og 标签基本三件（C-7，方案 §8.6 canonical/og 同基准） -->
-    <meta property="og:title" th:if="${pageTitle != null}" th:content="${pageTitle}">
-    <meta property="og:description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}" th:content="${seoDescription}">
-    <meta property="og:image" th:if="${ogImage != null}" th:content="${ogImage}">
-    <link rel="stylesheet" th:href="${url.asset('css/main.css')}">
-    <!-- 微调参数 CSS 变量覆盖（方案 §5.3）：位于皮肤 CSS 之后层叠覆盖；值由服务端预构建并校验 -->
-    <style th:if="${not #strings.isEmpty(themeVarsCss)}" th:utext="${themeVarsCss}"></style>
-    <!-- 站点级自定义样式（B3）：位于皮肤 CSS 与微调变量之后层叠覆盖；内容经服务端黑名单强校验后直出 -->
-    <style th:if="${not #strings.isEmpty(customCss)}" th:utext="${customCss}"></style>
-    <!-- favicon：管理端配置了 favicon 键用上传图，未配置输出主题内置兜底 icon（assets/favicon.png） -->
-    <link rel="icon" type="image/png"
-          th:href="${site.config['favicon'] != null ? url.upload(site.config['favicon']) : url.asset('favicon.png')}">
-</head>
-</html>

src/main/resources/templates/themes/blue-white/fragments/header.html

@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- 公共头部：站点名 + 栏目导航 + 站内搜索 + 专业院系下拉（院系子站切换，《院系子站方案》） -->
-<header class="site-header" th:fragment="header">
-    <div class="header-inner">
-        <div class="site-brand">
-            <img th:if="${site.config['logo'] != null}" class="site-logo"
-                 th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
-            <a class="site-name" th:href="${url.home()}" th:text="${site.name}">站点名称</a>
-        </div>
-        <form class="site-search" th:action="${url.search('', null)}" method="get">
-            <input type="text" name="q" placeholder="站内搜索" aria-label="站内搜索">
-            <button type="submit">搜索</button>
-        </form>
-        <!-- 专业院系下拉：顶层站取其子站、院系子站取兄弟站（含自身）；无子站不渲染；文案经 config_json.colleges_label 覆盖 -->
-        <div class="site-colleges" th:if="${!site.colleges.isEmpty()}"
-             th:with="collegesLabel=${site.config['colleges_label'] ?: '专业院系'}">
-            <span class="colleges-toggle">
-                <a href="javascript:void(0)" th:text="${collegesLabel}">专业院系</a>
-                <i class="colleges-arrow">▾</i>
-            </span>
-            <ul class="colleges-menu">
-                <li th:each="col : ${site.colleges}" th:classappend="${col.path == site.path} ? 'active'">
-                    <a th:href="${url.siteHome(col.path, col.publicBaseUrl)}"
-                       th:title="${col.name}" th:text="${col.name}">学院名称</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-    <nav class="site-nav">
-        <ul>
-            <li th:classappend="${currentCategoryId == null and navServiceActive == null} ? 'active'">
-                <a th:href="${url.home()}">首页</a>
-            </li>
-            <li th:each="cat : ${navCategories}"
-                th:classappend="${((currentCategoryId == cat.id or navTopId == cat.id) ? 'active' : '') + (!cat.children.isEmpty() ? ' has-sub' : '')}">
-                <!-- 外链栏目直接外跳；其余进栏目页（方案 §8.1） -->
-                <a th:if="${cat.type == 3}" th:href="${cat.linkUrl}" target="_blank" rel="noopener"
-                   th:text="${cat.name}">栏目</a>
-                <a th:unless="${cat.type == 3}" th:href="${url.category(cat.id)}" th:text="${cat.name}">栏目</a>
-                <!-- 二级下拉：悬停展开（样式见 assets/css/main.css .sub-nav） -->
-                <ul class="sub-nav" th:if="${!cat.children.isEmpty()}">
-                    <li th:each="sub : ${cat.children}"
-                        th:classappend="${sub.id == currentCategoryId} ? 'active'">
-                        <a th:if="${sub.type == 3}" th:href="${sub.linkUrl}" target="_blank" rel="noopener"
-                           th:text="${sub.name}">子栏目</a>
-                        <a th:unless="${sub.type == 3}" th:href="${url.category(sub.id)}" th:text="${sub.name}">子栏目</a>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-    </nav>
-</header>
-</html>

src/main/resources/templates/themes/blue-white/home.html

@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="home-main">
-    <!-- 首页轮播位（cms_banner position=home；设计尺寸约定 1920×560，见 assets/css 注释） -->
-    <section class="banner" th:if="${!#lists.isEmpty(banners)}">
-        <div class="banner-slides">
-            <a class="banner-slide" th:each="b, stat : ${banners}"
-               th:classappend="${stat.first} ? 'active'"
-               th:href="${b.linkUrl}" th:title="${b.title}">
-                <img th:src="${b.imageUrl}" th:alt="${b.title}">
-                <span class="banner-title" th:text="${b.title}">标题</span>
-            </a>
-        </div>
-        <div class="banner-dots" th:if="${#lists.size(banners) > 1}">
-            <button th:each="b, stat : ${banners}" th:classappend="${stat.first} ? 'active'"
-                    th:aria-label="${'第' + (stat.count) + '张'}"></button>
-        </div>
-    </section>
-
-    <!-- 首页布局模式（docs/16 §4.4）：home_layout 落库后按区块序列渲染（common 兜底骨架，本主题不另设形态） -->
-    <th:block th:if="${layoutBlocks != null}">
-        <th:block th:replace="~{'themes/common/fragments/home-blocks' :: style}" />
-        <th:block th:each="block : ${layoutBlocks}">
-            <th:block th:replace="~{'themes/common/fragments/home-blocks' :: render(${block})}" />
-        </th:block>
-    </th:block>
-
-    <!-- 回落分支（docs/16 D2）：无 home_layout 时按现状渲染 -->
-    <th:block th:unless="${layoutBlocks != null}">
-    <!-- 置顶/头条区（cms_article topmost 优先） -->
-    <section class="top-strip" th:if="${!#lists.isEmpty(topArticles)}">
-        <h2 class="section-title">头条推荐</h2>
-        <ul>
-            <li th:each="item : ${topArticles}">
-                <span class="top-badge" th:if="${item.topmost == 1}">置顶</span>
-                <a th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <time th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-            </li>
-        </ul>
-    </section>
-
-    <!-- 一级栏目区块（每栏目 top 8） -->
-    <section class="category-block" th:each="block : ${categoryBlocks}">
-        <div class="block-head">
-            <h2 th:text="${block.category.name}">栏目名</h2>
-            <a class="more" th:href="${block.moreUrl}">更多 &gt;</a>
-        </div>
-        <ul class="block-list" th:if="${!#lists.isEmpty(block.items)}">
-            <li th:each="item : ${block.items}">
-                <a th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <time th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-            </li>
-        </ul>
-        <p class="empty" th:if="${#lists.isEmpty(block.items)}">暂无内容</p>
-    </section>
-    </th:block>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/blue-white/list.html

@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="list-main" th:classappend="${sideNav != null} ? 'has-sidenav'">
-    <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-    <aside class="side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-        <div class="side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-        <ul class="side-nav-list">
-            <li class="side-nav-item" th:each="item : ${sideNav.items}"
-                th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                   th:text="${item.name}">子栏目</a>
-                <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-            </li>
-        </ul>
-    </aside>
-    <div class="list-body">
-    <nav class="breadcrumb" th:if="${searchMode != true}">
-        <a th:href="${url.home()}">首页</a>
-        <th:block th:each="node, st : ${categoryPath}">
-            <a th:if="${!st.last}" class="crumb-parent" th:href="${url.category(node.id)}"
-               th:text="${node.name}">父栏目</a>
-            <span th:if="${st.last}" th:text="${node.name}">栏目</span>
-        </th:block>
-    </nav>
-    <nav class="breadcrumb" th:if="${searchMode == true}">
-        <a th:href="${url.home()}">首页</a>
-        <span>搜索结果</span>
-    </nav>
-
-    <h1 class="page-title" th:if="${searchMode != true}" th:text="${category.name}">栏目名</h1>
-    <h1 class="page-title" th:if="${searchMode == true}" th:text="'搜索：' + ${q}">搜索词</h1>
-
-    <ul class="article-list">
-        <li th:each="item : ${listData.items}">
-            <a class="item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-            <p class="item-summary" th:if="${!#strings.isEmpty(item.summary)}" th:text="${item.summary}">摘要</p>
-            <div class="item-meta">
-                <time th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                <span class="top-badge" th:if="${item.topmost == 1}">置顶</span>
-            </div>
-        </li>
-    </ul>
-    <p class="empty" th:if="${#lists.isEmpty(listData.items)}">暂无内容</p>
-
-    <!-- 分页（列表页/搜索页共用） -->
-    <nav class="pagination" th:if="${listData.totalPages > 1}"
-         th:with="cur=${listData.page}, total=${listData.totalPages}">
-        <a th:if="${cur > 1}"
-           th:href="${searchMode == true} ? ${url.search(q, cur - 1)} : ${url.category(listData.categoryId) + '?page=' + (cur - 1)}">上一页</a>
-        <a th:each="p : ${#numbers.sequence(1, total)}"
-           th:classappend="${p == cur} ? 'active'"
-           th:href="${searchMode == true} ? ${url.search(q, p)} : ${url.category(listData.categoryId) + '?page=' + p}"
-           th:text="${p}">1</a>
-        <a th:if="${cur < total}"
-           th:href="${searchMode == true} ? ${url.search(q, cur + 1)} : ${url.category(listData.categoryId) + '?page=' + (cur + 1)}">下一页</a>
-    </nav>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/blue-white/single.html

@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="detail-main" th:classappend="${sideNav != null} ? 'has-sidenav'">
-    <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-    <aside class="side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-        <div class="side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-        <ul class="side-nav-list">
-            <li class="side-nav-item" th:each="item : ${sideNav.items}"
-                th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                   th:text="${item.name}">子栏目</a>
-                <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-            </li>
-        </ul>
-    </aside>
-    <div class="list-body">
-    <nav class="breadcrumb">
-        <a th:href="${url.home()}">首页</a>
-        <th:block th:each="node, st : ${categoryPath}">
-            <a th:if="${!st.last}" class="crumb-parent" th:href="${url.category(node.id)}"
-               th:text="${node.name}">父栏目</a>
-            <span th:if="${st.last}" th:text="${node.name}">栏目</span>
-        </th:block>
-    </nav>
-
-    <article class="article">
-        <h1 class="article-title" th:text="${category.name}">栏目名</h1>
-        <!-- 单页栏目内容（type=2，入库前已 jsoup 清洗） -->
-        <div class="article-content" th:utext="${category.content}">单页内容</div>
-        <p class="empty" th:if="${#strings.isEmpty(category.content)}">暂无内容</p>
-    </article>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-</body>
-</html>

src/main/resources/templates/themes/blue-white/theme.json

@@ -1,16 +0,0 @@
-{
-  "specVersion": 1,
-  "name": "blue-white",
-  "title": "蓝白简约",
-  "version": "1.0.0",
-  "author": "yunhai",
-  "description": "细线顶栏 + 卡片化列表 + 大留白，适合高校与职业院校（方案 §7）。",
-  "screenshot": "assets/screenshot.png",
-  "bannerSize": "1920x560",
-  "params": [
-    { "key": "primary",     "cssVar": "--primary",      "label": "主色",       "type": "color", "default": "#2f6bd8" },
-    { "key": "primaryDark", "cssVar": "--primary-dark", "label": "主色加深",   "type": "color", "default": "#1d4fae" },
-    { "key": "bg",          "cssVar": "--bg",           "label": "页面底色",   "type": "color", "default": "#f7f9fc" },
-    { "key": "border",      "cssVar": "--border",       "label": "边框色",     "type": "color", "default": "#e3e9f2" }
-  ]
-}

src/main/resources/templates/themes/campus-azure/README.md

@@ -1,33 +0,0 @@
-# campus-azure（青蓝校园）
-
-高校官网风皮肤包：以 `scholar-blue` 为基座派生，配色与首页区块形态按师范/农林类院校官网（信阳师范学院、
-信阳农林学院一类）重做。配了 `home_layout` 的站点，首页正文区块由本主题 `fragments/home-blocks.html` 渲染，
-不落 `themes/common` 通用骨架（否则换肤只剩页头页脚）。
-
-## 风格定位
-
-- 主色青蓝 `#0d6a9e` + 加深 `#084c73` + 点缀青绿 `#2b9c8f`（列表圆点、标题线脚、速递标签走青绿）。
-- 圆角放宽到 6/12px、页面底 `#eef3f6`，比 academic-navy 更松更「校园」；区块头统一走居中双线 + 右置「更多」。
-- 全部 11 个颜色参数可在站点 theme_params 微调（`primary/primaryDark/primaryLight/accent/navBg/footerBg/text/textLight/bg/cardBg/border`）。
-
-## 首页区块形态（布局模式与回落模式同构）
-
-| homeStyle | 呈现 | 类名 |
-| -- | -- | -- |
-| `news_grid` | 图文要闻：全宽封面头条（底部渐变遮罩标题 + 元信息）+ 双列圆点密行；区块背景可取站点 `news_bg_image` | `cz-hero*` / `cz-block-list--two` |
-| `compact` | 圆点密行：青绿圆点 + 标题 + 右对齐完整日期 | `cz-item-bullet` / `cz-item-date` |
-| `media_focus` | 媒体聚焦：胶囊来源徽标 + 双列密行 | `cz-src` |
-| `image_wall` | 三列大格图墙：圆角卡 + 底部遮罩标题 | `cz-wall` |
-| （空/未知） | 整宽区块卡：左 2 份图文头条 + 右 3 份圆点行 | `cz-block--flow` / `cz-split` |
-| `ticker` | 青蓝要闻速递横条，标签为青绿胶囊（单行不换行、超长省略，中文不塌列） | `cz-ticker*` |
-| `gallery` | 线上展厅：居中双语文区头 + 四列图墙 | `cz-gallery` |
-| `links` | 友情链接分组（胶囊标签行） | `cz-links` |
-
-## 契约要点
-
-- 结构类前缀 `cz-`，CSS 变量前缀 `--cz-`；`:root` 把 `--cz-*` 别名到皮肤契约变量（`--primary`/`--text`/`--card-bg`/`--border`…），
-  使 `themes/common` 兜底骨架也能跟随本皮肤着色。
-- 空态文案「栏目暂无内容」只在 `block.items` 为空时出现；守卫必须写在 `th:block` 外层——
-  `th:replace`（优先级 100）先于 `th:if`（300）求值，写在同一标签上等于没写。
-- 回归防线：`AcademicSkinContractTest`（自带区块 fragment + 中文不塌列 + 契约变量别名 + 主色必须学术蓝）、
-  `PortalHomeLayoutIT#campusAzure_fallbackAndAssets`（回落分支 + 资产通道）、`ThemeContractIT`（7 条路由）。

src/main/resources/templates/themes/campus-azure/assets/favicon.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 96 96">
-  <rect width="96" height="96" rx="20" fill="#0a5aa8"/>
-  <path d="M48 16l8.6 17.5 19.3 2.8-14 13.6 3.3 19.2L48 60.1 30.8 69.1l3.3-19.2-14-13.6 19.3-2.8L48 16z" fill="#ffffff"/>
-</svg>

src/main/resources/templates/themes/campus-azure/assets/js/main.js

@@ -1,190 +0,0 @@
-/* campus-azure 主题脚本：顶栏日期 + 轮播(圆点/箭头/触摸) + 导航吸顶反蓝 + 移动端抽屉与二级手风琴。
-   与 default 同源逻辑，无任何外部依赖。 */
-(function () {
-  'use strict';
-
-  /* ---------- 顶栏日期（本地时间，YYYY年M月D日 星期X） ---------- */
-  var dateEl = document.getElementById('siteDate');
-  if (dateEl) {
-    var now = new Date();
-    var week = ['日', '一', '二', '三', '四', '五', '六'][now.getDay()];
-    dateEl.textContent = now.getFullYear() + '年' + (now.getMonth() + 1) + '月'
-      + now.getDate() + '日 星期' + week;
-  }
-
-  /* ---------- 导航吸顶反蓝（桌面端；≤768 不吸顶） ---------- */
-  var nav = document.getElementById('czNav');
-  var DESKTOP_MIN = 769;
-  var navBaseTop = 0;
-  var holder = null;
-
-  function measureNavTop() {
-    unlockNav();
-    navBaseTop = nav.getBoundingClientRect().top + window.pageYOffset;
-  }
-
-  function lockNav() {
-    if (!nav.classList.contains('cz-nav--fixed')) {
-      holder = document.createElement('div');
-      holder.className = 'cz-nav-holder';
-      holder.style.height = nav.offsetHeight + 'px';
-      nav.parentNode.insertBefore(holder, nav);
-      nav.classList.add('cz-nav--fixed');
-    } else if (holder) {
-      holder.style.height = nav.offsetHeight + 'px';
-    }
-  }
-
-  function unlockNav() {
-    nav.classList.remove('cz-nav--fixed');
-    if (holder && holder.parentNode) {
-      holder.parentNode.removeChild(holder);
-    }
-    holder = null;
-  }
-
-  function onScrollNav() {
-    if (window.innerWidth < DESKTOP_MIN) {
-      unlockNav();
-      return;
-    }
-    if (window.pageYOffset > navBaseTop) {
-      lockNav();
-    } else {
-      unlockNav();
-    }
-  }
-
-  if (nav) {
-    measureNavTop();
-    window.addEventListener('scroll', onScrollNav, { passive: true });
-    var resizeTimer = null;
-    window.addEventListener('resize', function () {
-      if (resizeTimer) { window.clearTimeout(resizeTimer); }
-      resizeTimer = window.setTimeout(function () {
-        measureNavTop();
-        onScrollNav();
-      }, 150);
-    });
-  }
-
-  /* ---------- 移动端抽屉 + 二级手风琴 ---------- */
-  var navToggle = document.querySelector('.cz-nav-toggle');
-  var navList = document.querySelector('.cz-nav-list');
-
-  if (navToggle && navList) {
-    navToggle.addEventListener('click', function () {
-      var open = navList.classList.toggle('cz-open');
-      navToggle.setAttribute('aria-expanded', open ? 'true' : 'false');
-    });
-  }
-
-  /* 窄屏下：点击带二级的项先展开面板，再点才跳转；宽屏交还给 CSS hover */
-  if (navList) {
-    navList.addEventListener('click', function (e) {
-      if (window.innerWidth >= DESKTOP_MIN) { return; }
-      var link = e.target.closest ? e.target.closest('a') : null;
-      if (!link) { return; }
-      var li = link.parentElement;
-      if (!li || !li.classList.contains('has-sub')) { return; }
-      var sub = li.querySelector('.cz-sub');
-      if (!sub) { return; }
-      if (!li.classList.contains('cz-sub-open')) {
-        e.preventDefault();
-        li.classList.add('cz-sub-open');
-      }
-    });
-  }
-
-  /* ---------- 首页轮播 ---------- */
-  var root = document.querySelector('.cz-banner');
-  var slides = document.querySelectorAll('.cz-banner-slide');
-  var dots = document.querySelectorAll('.cz-banner-dots button');
-  var prevBtn = document.querySelector('.cz-banner-arrow.prev');
-  var nextBtn = document.querySelector('.cz-banner-arrow.next');
-  if (!slides.length || !root) {
-    return;
-  }
-  var current = 0;
-  var timer = null;
-  var INTERVAL = 5000;
-
-  function show(index) {
-    slides[current].classList.remove('active');
-    if (dots[current]) {
-      dots[current].classList.remove('active');
-    }
-    current = (index + slides.length) % slides.length;
-    slides[current].classList.add('active');
-    if (dots[current]) {
-      dots[current].classList.add('active');
-    }
-  }
-
-  function start() {
-    stop();
-    if (slides.length > 1) {
-      timer = window.setInterval(function () {
-        show(current + 1);
-      }, INTERVAL);
-    }
-  }
-
-  function stop() {
-    if (timer) {
-      window.clearInterval(timer);
-      timer = null;
-    }
-  }
-
-  dots.forEach(function (dot, index) {
-    dot.addEventListener('click', function () {
-      show(index);
-      start();
-    });
-  });
-  if (prevBtn) {
-    prevBtn.addEventListener('click', function () {
-      show(current - 1);
-      start();
-    });
-  }
-  if (nextBtn) {
-    nextBtn.addEventListener('click', function () {
-      show(current + 1);
-      start();
-    });
-  }
-  root.addEventListener('mouseenter', stop);
-  root.addEventListener('mouseleave', start);
-  root.addEventListener('focusin', stop);
-  root.addEventListener('focusout', start);
-  root.setAttribute('tabindex', '-1');
-  root.addEventListener('keydown', function (e) {
-    if (e.key === 'ArrowLeft') {
-      show(current - 1);
-      start();
-    } else if (e.key === 'ArrowRight') {
-      show(current + 1);
-      start();
-    }
-  });
-
-  /* 触摸滑动切页 */
-  var touchX = null;
-  root.addEventListener('touchstart', function (e) {
-    touchX = e.changedTouches[0].clientX;
-    stop();
-  }, { passive: true });
-  root.addEventListener('touchend', function (e) {
-    if (touchX === null) { return; }
-    var dx = e.changedTouches[0].clientX - touchX;
-    if (Math.abs(dx) > 40) {
-      show(dx < 0 ? current + 1 : current - 1);
-    }
-    touchX = null;
-    start();
-  }, { passive: true });
-
-  start();
-})();

src/main/resources/templates/themes/campus-azure/detail.html

@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="cz-page cz-container" id="main-content">
-    <div class="cz-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="cz-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="cz-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="cz-side-nav-list">
-                <li class="cz-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="cz-page-card">
-        <nav class="cz-crumb" aria-label="面包屑">
-            <a th:href="${url.home()}">首页</a>
-            <th:block th:each="node : ${categoryPath}">
-                <span class="cz-crumb-sep" aria-hidden="true">/</span>
-                <a class="crumb-parent" th:href="${url.category(node.id)}" th:text="${node.name}">栏目</a>
-            </th:block>
-            <span class="cz-crumb-sep" th:if="${currentCategoryId != null}" aria-hidden="true">/</span>
-            <span class="cz-crumb-current">正文</span>
-        </nav>
-
-        <article class="cz-article">
-            <h1 class="cz-article-title" th:text="${article.title}">文章标题</h1>
-            <div class="cz-article-meta">
-                <time th:if="${article.publishTime != null}"
-                      th:text="${#temporals.format(article.publishTime, 'yyyy-MM-dd HH:mm')}">2026-01-01 10:00</time>
-                <span th:if="${!#strings.isEmpty(article.authorName)}"
-                      th:text="'作者：' + ${article.authorName}">作者</span>
-                <span th:if="${!#strings.isEmpty(article.source)}"
-                      th:text="'来源：' + ${article.source}">来源</span>
-                <span th:text="'浏览量：' + ${article.viewCount}">浏览量</span>
-            </div>
-            <!-- 正文：入库前已经 jsoup 白名单清洗（方案 §8.5），此处允许 utext；
-                 其余字段一律 th:text 转义输出 -->
-            <div class="cz-article-content" th:utext="${article.content}">正文</div>
-        </article>
-
-        <nav class="cz-sibling" aria-label="上下篇导航">
-            <a th:if="${prevArticle != null}" class="cz-sib prev"
-               th:href="${url.article(prevArticle.id)}">
-                <span class="cz-sib-label">上一篇</span>
-                <span class="cz-sib-title" th:text="${prevArticle.title}">上一篇标题</span>
-            </a>
-            <span class="cz-sib-none prev" th:if="${prevArticle == null}">
-                <span class="cz-sib-label">上一篇</span>
-                <span class="cz-sib-title">已经是最早一篇</span>
-            </span>
-            <a th:if="${nextArticle != null}" class="cz-sib next"
-               th:href="${url.article(nextArticle.id)}">
-                <span class="cz-sib-label">下一篇</span>
-                <span class="cz-sib-title" th:text="${nextArticle.title}">下一篇标题</span>
-            </a>
-            <span class="cz-sib-none next" th:if="${nextArticle == null}">
-                <span class="cz-sib-label">下一篇</span>
-                <span class="cz-sib-title">已是最新一篇</span>
-            </span>
-        </nav>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/campus-azure/fragments/footer.html

@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- campus-azure 公共页脚：深蓝渐变底 + 同心圆环纹理(CSS 绘制) + 三栏(品牌/联系备案/友链分组) + 底条校名。
-     数据绑定与 default 契约一致（linkGroups/contact/copyright/beian/logo/schName），仅换皮。 -->
-<footer class="cz-footer" th:fragment="footer">
-    <i class="cz-ring cz-ring--1" aria-hidden="true"></i>
-    <i class="cz-ring cz-ring--2" aria-hidden="true"></i>
-    <i class="cz-ring cz-ring--3" aria-hidden="true"></i>
-
-    <div class="cz-footer-inner">
-        <!-- 品牌栏 -->
-        <div class="cz-footer-brand">
-            <span class="cz-footer-badge" th:if="${site.config['logo'] != null}">
-                <img class="cz-footer-logo" th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
-            </span>
-            <span class="cz-footer-badge cz-footer-badge--plain" th:if="${site.config['logo'] == null}" aria-hidden="true">
-                <svg viewBox="0 0 24 24" width="30" height="30" focusable="false">
-                    <path d="M12 2l2.4 4.9 5.4.8-3.9 3.8.9 5.4L12 14.4 7.2 16.9l.9-5.4L4.2 7.7l5.4-.8L12 2z"
-                          fill="currentColor"></path>
-                </svg>
-            </span>
-            <span class="cz-footer-site" th:text="${site.name}">站点名称</span>
-        </div>
-
-        <!-- 联系/版权/备案 -->
-        <div class="cz-footer-info">
-            <p class="cz-footer-line" th:if="${site.config['contact'] != null}">
-                <i class="cz-dot" aria-hidden="true"></i><span th:text="${site.config['contact']}">联系方式</span>
-            </p>
-            <p class="cz-footer-line" th:if="${site.config['copyright'] != null}">
-                <i class="cz-dot" aria-hidden="true"></i><span th:text="${site.config['copyright']}">版权信息</span>
-            </p>
-            <p class="cz-footer-line" th:if="${site.config['beian'] != null}">
-                <i class="cz-dot" aria-hidden="true"></i><span th:text="${site.config['beian']}">备案号</span>
-            </p>
-        </div>
-
-        <!-- 友情链接（分组渲染；无分组整栏不渲染） -->
-        <div class="cz-footer-links" th:if="${!#lists.isEmpty(site.linkGroups)}">
-            <div class="cz-links-group" th:each="group : ${site.linkGroups}"
-                 th:if="${!#lists.isEmpty(group.links)}">
-                <span class="cz-group-name" th:text="${group.groupName}">分组</span>
-                <p class="cz-links-row">
-                    <a th:each="link : ${group.links}" th:href="${link.linkUrl}" target="_blank" rel="noopener">
-                        <img th:if="${link.logoUrl != null and !#strings.isEmpty(link.logoUrl)}" class="link-logo"
-                             th:src="${url.upload(link.logoUrl)}" th:alt="${link.name}" loading="lazy">
-                        <span th:text="${link.name}">链接</span>
-                    </a>
-                </p>
-            </div>
-        </div>
-    </div>
-
-    <div class="cz-footer-bottom">
-        <p th:if="${site.schName != null and !#strings.isEmpty(site.schName)}"
-           th:text="${site.schName}">学校名称</p>
-    </div>
-</footer>
-</html>

src/main/resources/templates/themes/campus-azure/fragments/head.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<!-- campus-azure 公共 head 片段：与 default 契约一致（pageTitle/seo/canonical/og/themeVarsCss/favicon 兜底） -->
-<head th:fragment="head">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title th:text="${pageTitle}">页面标题</title>
-    <meta name="description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}"
-          th:content="${seoDescription}">
-    <link rel="canonical" th:if="${canonical != null}" th:href="${canonical}">
-    <meta property="og:title" th:if="${pageTitle != null}" th:content="${pageTitle}">
-    <meta property="og:description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}" th:content="${seoDescription}">
-    <meta property="og:image" th:if="${ogImage != null}" th:content="${ogImage}">
-    <link rel="stylesheet" th:href="${url.asset('css/main.css')}">
-    <style th:if="${not #strings.isEmpty(themeVarsCss)}" th:utext="${themeVarsCss}"></style>
-    <!-- 站点级自定义样式（B3）：位于皮肤 CSS 与微调变量之后层叠覆盖；内容经服务端黑名单强校验后直出 -->
-    <style th:if="${not #strings.isEmpty(customCss)}" th:utext="${customCss}"></style>
-    <link rel="icon" type="image/png"
-          th:href="${site.config['favicon'] != null ? url.upload(site.config['favicon']) : url.asset('favicon.png')}">
-</head>
-</html>

src/main/resources/templates/themes/campus-azure/fragments/header.html

@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- campus-azure 公共头部：深蓝顶栏(日期+院系切换) + 深蓝品牌行(徽标+站名+圆角搜索) + 白底主导航(吸顶反蓝、
-     主蓝半透明下拉面板)。数据绑定与 default 契约一致，仅换皮。 -->
-<header class="cz-header" th:fragment="header">
-    <a class="skip-link" href="#main-content">跳到主要内容</a>
-
-    <!-- 顶栏 -->
-    <div class="cz-topbar">
-        <div class="cz-topbar-inner">
-            <span class="cz-topbar-date" id="siteDate" th:aria-label="'今日日期'">加载日期…</span>
-            <div class="cz-topbar-side" th:if="${!site.colleges.isEmpty()}"
-                 th:with="collegesLabel=${site.config['colleges_label'] ?: '专业院系'}">
-                <div class="cz-colleges">
-                    <span class="cz-colleges-toggle">
-                        <a href="javascript:void(0)" th:text="${collegesLabel}">专业院系</a>
-                        <i class="cz-colleges-arrow" aria-hidden="true">▾</i>
-                    </span>
-                    <ul class="cz-colleges-menu">
-                        <li th:each="col : ${site.colleges}" th:classappend="${col.path == site.path} ? 'active'">
-                            <a th:href="${url.siteHome(col.path, col.publicBaseUrl)}"
-                               th:title="${col.name}" th:text="${col.name}">学院名称</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- 品牌行 -->
-    <div class="cz-brandbar">
-        <div class="cz-brandbar-inner">
-            <div class="cz-brand">
-                <span class="cz-brand-badge" th:if="${site.config['logo'] != null}">
-                    <img class="cz-logo" th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
-                </span>
-                <span class="cz-brand-badge cz-brand-badge--plain" th:if="${site.config['logo'] == null}" aria-hidden="true">
-                    <svg viewBox="0 0 24 24" width="26" height="26" focusable="false">
-                        <path d="M12 2l2.4 4.9 5.4.8-3.9 3.8.9 5.4L12 14.4 7.2 16.9l.9-5.4L4.2 7.7l5.4-.8L12 2z"
-                              fill="currentColor"></path>
-                    </svg>
-                </span>
-                <a class="cz-site-name" th:href="${url.home()}" th:text="${site.name}">站点名称</a>
-            </div>
-            <form class="cz-search" th:action="${url.search('', null)}" method="get" role="search">
-                <input type="text" name="q" placeholder="请输入关键字…" aria-label="站内搜索">
-                <button type="submit" aria-label="搜索">
-                    <svg viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
-                        <path d="M10.5 3a7.5 7.5 0 015.9 12.1l4.3 4.3-1.4 1.4-4.3-4.3A7.5 7.5 0 1110.5 3zm0 2a5.5 5.5 0 100 11 5.5 5.5 0 000-11z"
-                              fill="currentColor"></path>
-                    </svg>
-                </button>
-            </form>
-        </div>
-    </div>
-
-    <!-- 主导航：白底深蓝字；下拉为主蓝半透明面板（.cz-sub 展开动效见 main.css）；吸顶反蓝由 main.js 处理 -->
-    <nav class="cz-nav" id="czNav" aria-label="栏目导航">
-        <div class="cz-nav-inner">
-            <button class="cz-nav-toggle" type="button" aria-label="展开菜单" aria-expanded="false">
-                <span></span><span></span><span></span>
-            </button>
-            <ul class="cz-nav-list">
-                <li th:classappend="${currentCategoryId == null and navServiceActive == null} ? 'active'">
-                    <a th:href="${url.home()}">首页</a>
-                </li>
-                <li th:each="cat : ${navCategories}"
-                    th:classappend="${((currentCategoryId == cat.id or navTopId == cat.id) ? 'active' : '') + (!cat.children.isEmpty() ? ' has-sub' : '')}">
-                    <a th:if="${cat.type == 3}" th:href="${cat.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${cat.name}">栏目</a>
-                    <a th:unless="${cat.type == 3}" th:href="${url.category(cat.id)}"><span th:text="${cat.name}">栏目</span><i th:if="${!cat.children.isEmpty()}" class="cz-caret" aria-hidden="true">▾</i></a>
-                    <!-- 二级下拉：主蓝半透明面板，顶部亮线，项 hover 加深+左亮条 -->
-                    <ul class="cz-sub" th:if="${!cat.children.isEmpty()}">
-                        <li th:each="sub : ${cat.children}"
-                            th:classappend="${sub.id == currentCategoryId} ? 'active'">
-                            <a th:if="${sub.type == 3}" th:href="${sub.linkUrl}" target="_blank" rel="noopener"
-                               th:text="${sub.name}">子栏目</a>
-                            <a th:unless="${sub.type == 3}" th:href="${url.category(sub.id)}" th:text="${sub.name}">子栏目</a>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </div>
-    </nav>
-</header>
-</html>

src/main/resources/templates/themes/campus-azure/fragments/home-blocks.html

@@ -1,209 +0,0 @@
-<!--
-  campus-azure（青蓝校园）首页区块 fragment：站点配了 home_layout 时，区块正文必须由本文件渲染，
-  不能落到 themes/common 的通用骨架——否则换肤只换了页头页脚，首页正文仍是骨架内置蓝灰卡（线上事故根因）。
-  结构复用主题 main.css 第 7/9 节既有语汇（cz-block / cz-block-head / cz-block-item / cz-feat-* /
-  cz-top-badge / cz-empty），布局模式特有的排布（封面头条、圆点行、图墙、速递条、链接行）另起第 16 节。
-  与 academic-navy 的分野：区块头用居中双线（师范/农林官网语言）、要闻用全宽封面头条、列表用圆点密行。
-  契约：block 为渲染端装配的同构 Map（category.name/title/homeStyle/items/moreUrl/background）。
--->
-<!-- 形态一：图文要闻（homeStyle=news_grid）——全宽封面头条（遮罩标题）+ 双列密行 -->
-<section class="cz-section cz-container" th:fragment="news_grid(block)" aria-label="栏目区块"
-         th:with="newsBg=${block['background'] != null ? (block['background'] ? site.config['news_bg_image'] : null) : site.config['news_bg_image']}">
-    <div class="cz-sec-bg" th:if="${!#strings.isEmpty(newsBg)}"
-         th:style="|background-image:url(${url.upload(newsBg)})|"></div>
-    <div class="cz-block cz-block--flow"
-         th:with="lead=${!#lists.isEmpty(block.items) ? block.items[0] : null},
-                  rest=${#lists.size(block.items) > 1 ? block.items.subList(1, block.items.size()) : null}">
-        <div class="cz-block-head">
-            <h2 th:text="${block.category.name}">校园要闻</h2>
-            <i class="cz-block-tick" aria-hidden="true"></i>
-        </div>
-        <a class="cz-hero" th:if="${lead != null}" th:href="${url.article(lead.id)}">
-            <img th:if="${lead.coverImage != null}" th:src="${url.upload(lead.coverImage)}"
-                 th:alt="${lead.title}" loading="lazy">
-            <span class="cz-hero-plain" th:if="${lead.coverImage == null}" aria-hidden="true"></span>
-            <span class="cz-hero-mask">
-                <span class="cz-hero-title" th:text="${lead.title}">头条标题</span>
-                <span class="cz-hero-meta">
-                    <span class="cz-top-badge" th:if="${lead.topmost == 1}">置顶</span>
-                    <time th:if="${lead.publishTime != null}"
-                          th:text="${#temporals.format(lead.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                </span>
-            </span>
-        </a>
-        <ul class="cz-block-list cz-block-list--two" th:if="${rest != null}">
-            <li class="cz-block-item" th:each="item : ${rest}">
-                <i class="cz-item-bullet" aria-hidden="true"></i>
-                <a class="cz-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <span class="cz-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                <time class="cz-item-date" th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/campus-azure/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态二：默认卡（homeStyle 未设/未知）——左图文头条 + 右圆点密行 -->
-<section class="cz-section cz-container" th:fragment="card(block)" aria-label="栏目区块">
-    <div class="cz-block cz-block--flow">
-        <div class="cz-block-head">
-            <h2 th:text="${block.category.name}">栏目名</h2>
-            <a class="cz-more" th:href="${block.moreUrl}">更多 ›</a>
-            <i class="cz-block-tick" aria-hidden="true"></i>
-        </div>
-        <div class="cz-split" th:if="${!#lists.isEmpty(block.items)}"
-             th:with="feat=${block.items[0]}, rest=${#lists.size(block.items) > 1 ? block.items.subList(1, block.items.size()) : null}">
-            <div class="cz-block-featured">
-                <a th:href="${url.article(feat.id)}">
-                    <span class="cz-feat-cover" th:if="${feat.coverImage != null}">
-                        <img th:src="${url.upload(feat.coverImage)}" th:alt="${feat.title}" loading="lazy">
-                    </span>
-                    <span class="cz-feat-title" th:text="${feat.title}">头条标题</span>
-                    <span class="cz-feat-summary" th:if="${!#strings.isEmpty(feat.summary)}" th:text="${feat.summary}">摘要</span>
-                    <span class="cz-feat-meta">
-                        <span class="cz-top-badge" th:if="${feat.topmost == 1}">置顶</span>
-                        <time th:if="${feat.publishTime != null}"
-                              th:text="${#temporals.format(feat.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                    </span>
-                </a>
-            </div>
-            <ul class="cz-block-list" th:if="${rest != null}">
-                <li class="cz-block-item" th:each="item : ${rest}">
-                    <i class="cz-item-bullet" aria-hidden="true"></i>
-                    <a class="cz-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                    <span class="cz-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                    <time class="cz-item-date" th:if="${item.publishTime != null}"
-                          th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-                </li>
-            </ul>
-        </div>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/campus-azure/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态三：圆点密行（homeStyle=compact）——官网最密的「圆点 + 标题 + 右日期」单行 -->
-<section class="cz-section cz-container" th:fragment="compact(block)" aria-label="栏目区块">
-    <div class="cz-block cz-block--flow">
-        <div class="cz-block-head">
-            <h2 th:text="${block.category.name}">通知公告</h2>
-            <a class="cz-more" th:href="${block.moreUrl}">更多 ›</a>
-            <i class="cz-block-tick" aria-hidden="true"></i>
-        </div>
-        <ul class="cz-block-list" th:if="${!#lists.isEmpty(block.items)}">
-            <li class="cz-block-item" th:each="item : ${block.items}">
-                <i class="cz-item-bullet" aria-hidden="true"></i>
-                <a class="cz-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <span class="cz-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                <time class="cz-item-date" th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/campus-azure/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态四：媒体聚焦（homeStyle=media_focus）——来源徽标 + 双列密行 -->
-<section class="cz-section cz-container" th:fragment="media_focus(block)" aria-label="栏目区块">
-    <div class="cz-block cz-block--flow">
-        <div class="cz-block-head">
-            <h2 th:text="${block.category.name}">媒体聚焦</h2>
-            <a class="cz-more" th:href="${block.moreUrl}">更多 ›</a>
-            <i class="cz-block-tick" aria-hidden="true"></i>
-        </div>
-        <ul class="cz-block-list cz-block-list--two" th:if="${!#lists.isEmpty(block.items)}">
-            <li class="cz-block-item" th:each="item : ${block.items}">
-                <span class="cz-src" th:if="${!#strings.isEmpty(item.source)}" th:text="${item.source}">媒体来源</span>
-                <a class="cz-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                <time class="cz-item-date" th:if="${item.publishTime != null}"
-                      th:text="${#temporals.format(item.publishTime, 'MM-dd')}">01-01</time>
-            </li>
-        </ul>
-        <th:block th:if="${#lists.isEmpty(block.items)}">
-            <div th:replace="~{'themes/campus-azure/fragments/home-blocks' :: empty(${block})}"></div>
-        </th:block>
-    </div>
-</section>
-
-<!-- 形态五：图片墙（homeStyle=image_wall）——仅取有封面的条目，三列大格 -->
-<section class="cz-section cz-container" th:fragment="image_wall(block)" aria-label="栏目区块">
-    <div class="cz-block-head">
-        <h2 th:text="${block.category.name}">图片新闻</h2>
-        <a class="cz-more" th:href="${block.moreUrl}">更多 ›</a>
-        <i class="cz-block-tick" aria-hidden="true"></i>
-    </div>
-    <ul class="cz-wall" th:if="${!#lists.isEmpty(block.items)}">
-        <li class="cz-wall-item" th:each="item : ${block.items}" th:if="${item.coverImage != null}">
-            <a th:href="${url.article(item.id)}" th:title="${item.title}">
-                <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}" loading="lazy">
-                <span class="cz-wall-cap" th:text="${item.title}">图片标题</span>
-            </a>
-        </li>
-    </ul>
-    <th:block th:if="${#lists.isEmpty(block.items)}">
-        <div th:replace="~{'themes/campus-azure/fragments/home-blocks' :: empty(${block})}"></div>
-    </th:block>
-</section>
-
-<!-- 布局模式：要闻速递横条（block.items 由渲染端按置顶+最新装配；单行不换行，中文不塌列） -->
-<section class="cz-ticker" th:fragment="ticker(block)" aria-label="要闻速递"
-         th:if="${!#lists.isEmpty(block.items)}">
-    <div class="cz-container cz-ticker-inner">
-        <span class="cz-ticker-label" th:text="${block.title}">要闻速递</span>
-        <ul class="cz-ticker-list">
-            <li th:each="item : ${block.items}">
-                <a class="cz-ticker-item" th:href="${url.article(item.id)}" th:text="${item.title}">要闻标题</a>
-            </li>
-        </ul>
-    </div>
-</section>
-
-<!-- 布局模式：线上展厅（block.items = 轮播位 gallery） -->
-<section class="cz-section cz-container cz-gallery" th:fragment="gallery(block)" aria-label="线上展厅"
-         th:if="${!#lists.isEmpty(block.items)}">
-    <div class="cz-block-head">
-        <h2 th:text="${block.title}">线上展厅</h2>
-        <i class="cz-block-tick" aria-hidden="true"></i>
-    </div>
-    <p class="cz-gallery-sub" th:if="${!#strings.isEmpty(block.subtitle)}" th:text="${block.subtitle}">
-        Online Exhibition Hall
-    </p>
-    <ul class="cz-wall cz-wall--4">
-        <li class="cz-wall-item" th:each="g : ${block.items}">
-            <a th:href="${g.linkUrl}" th:title="${g.title}">
-                <img th:src="${g.imageUrl}" th:alt="${g.title}" loading="lazy">
-                <span class="cz-wall-cap" th:if="${!#strings.isEmpty(g.title)}" th:text="${g.title}">作品标题</span>
-            </a>
-        </li>
-    </ul>
-</section>
-
-<!-- 布局模式：友情链接分组（block.linkGroups 由渲染端按 group 过滤） -->
-<section class="cz-section cz-container" th:fragment="links(block)" aria-label="友情链接">
-    <div class="cz-block cz-block--flow">
-        <div class="cz-block-head">
-            <h2 th:text="${block.title}">友情链接</h2>
-            <i class="cz-block-tick" aria-hidden="true"></i>
-        </div>
-        <th:block th:each="grp : ${block.linkGroups}">
-            <p class="cz-links-group" th:if="${!#strings.isEmpty(grp.groupName)}" th:text="${grp.groupName}">分组</p>
-            <ul class="cz-links">
-                <li th:each="l : ${grp.links}">
-                    <a th:href="${l.linkUrl}" th:text="${l.name}" target="_blank" rel="noopener">链接名</a>
-                </li>
-            </ul>
-        </th:block>
-    </div>
-</section>
-
-<!-- 空态（各形态引用时守卫必须包在 th:block 外层：th:replace 优先级 100 先于 th:if 300 求值） -->
-<div class="cz-empty" th:fragment="empty(block)">
-    <p>栏目暂无内容</p>
-    <p class="cz-empty-hint">内容发布后将在此展示</p>
-</div>

src/main/resources/templates/themes/campus-azure/home.html

@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="cz-home" id="main-content">
-    <!-- 首页轮播位（cms_banner position=home；设计尺寸见 theme.json bannerSize） -->
-    <section class="cz-banner" th:if="${!#lists.isEmpty(banners)}" aria-label="焦点图片">
-        <div class="cz-banner-slides">
-            <a class="cz-banner-slide" th:each="b, stat : ${banners}"
-               th:classappend="${stat.first} ? 'active'"
-               th:href="${b.linkUrl}" th:title="${b.title}">
-                <img th:src="${b.imageUrl}" th:alt="${b.title}">
-                <span class="cz-banner-title" th:text="${b.title}">标题</span>
-            </a>
-        </div>
-        <button class="cz-banner-arrow prev" type="button" aria-label="上一张" th:if="${#lists.size(banners) > 1}">‹</button>
-        <button class="cz-banner-arrow next" type="button" aria-label="下一张" th:if="${#lists.size(banners) > 1}">›</button>
-        <div class="cz-banner-dots" th:if="${#lists.size(banners) > 1}">
-            <button th:each="b, stat : ${banners}" th:classappend="${stat.first} ? 'active'"
-                    th:aria-label="${'第' + (stat.count) + '张'}"></button>
-        </div>
-    </section>
-
-    <!-- 首页布局模式（docs/16 §4.4）：区块形态由本主题 fragments/home-blocks 承载——换肤必须连首页正文一起换，
-         只换页头页脚会被判「皮肤不生效」。未知类型仍回落 common 骨架（渲染端已过滤未知 type，正常不触发）。
-         注意：th:replace（优先级100）先于 th:case（300）执行——case 必须放父元素、replace 放子元素 -->
-    <th:block th:if="${layoutBlocks != null}">
-        <th:block th:each="block : ${layoutBlocks}">
-            <th:block th:switch="${block.type}">
-                <th:block th:case="'article_list'">
-                    <th:block th:switch="${block.homeStyle}">
-                        <th:block th:case="'news_grid'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: news_grid(${block})}" /></th:block>
-                        <th:block th:case="'media_focus'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: media_focus(${block})}" /></th:block>
-                        <th:block th:case="'compact'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: compact(${block})}" /></th:block>
-                        <th:block th:case="'image_wall'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: image_wall(${block})}" /></th:block>
-                        <th:block th:case="*"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: card(${block})}" /></th:block>
-                    </th:block>
-                </th:block>
-                <th:block th:case="'ticker'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: ticker(${block})}" /></th:block>
-                <th:block th:case="'gallery'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: gallery(${block})}" /></th:block>
-                <th:block th:case="'links'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: links(${block})}" /></th:block>
-                <th:block th:case="*"><th:block th:replace="~{'themes/common/fragments/home-blocks' :: render(${block})}" /></th:block>
-            </th:block>
-        </th:block>
-    </th:block>
-
-    <!-- 回落分支（docs/16 D2）：无 home_layout 时按现状渲染 -->
-    <th:block th:unless="${layoutBlocks != null}">
-    <section class="cz-section cz-container" aria-label="头条与图片新闻">
-        <div class="cz-headline">
-            <div class="cz-headline-card" th:if="${!#lists.isEmpty(topArticles)}">
-                <div class="cz-block-head">
-                    <h2>头条推荐</h2>
-                    <i class="cz-block-tick" aria-hidden="true"></i>
-                </div>
-                <ul class="cz-headline-list">
-                    <li class="cz-headline-lead" th:with="lead=${topArticles[0]}">
-                        <a class="cz-lead-title" th:href="${url.article(lead.id)}" th:text="${lead.title}">头条标题</a>
-                        <div class="cz-lead-meta">
-                            <span class="cz-top-badge" th:if="${lead.topmost == 1}">置顶</span>
-                            <time th:if="${lead.publishTime != null}"
-                                  th:text="${#temporals.format(lead.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                        </div>
-                    </li>
-                    <li th:each="item, stat : ${topArticles}" th:if="${stat.index > 0}">
-                        <span class="cz-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                        <a th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        <time th:if="${item.publishTime != null}"
-                              th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                    </li>
-                </ul>
-            </div>
-            <div class="cz-focus-card" th:if="${!#lists.isEmpty(focusArticles)}">
-                <div class="cz-block-head">
-                    <h2>图片新闻</h2>
-                    <i class="cz-block-tick" aria-hidden="true"></i>
-                </div>
-                <a class="cz-focus-lead" th:with="cover=${focusArticles[0]}"
-                   th:href="${url.article(cover.id)}">
-                    <span class="cz-focus-cover">
-                        <img th:src="${url.upload(cover.coverImage)}" th:alt="${cover.title}">
-                    </span>
-                    <span class="cz-focus-title" th:text="${cover.title}">图片新闻标题</span>
-                </a>
-                <ul class="cz-focus-rows">
-                    <li th:each="row, stat : ${focusArticles}" th:if="${stat.index > 0}">
-                        <a th:href="${url.article(row.id)}">
-                            <span class="cz-row-cover"><img th:src="${url.upload(row.coverImage)}" th:alt="${row.title}"></span>
-                            <span class="cz-row-title" th:text="${row.title}">图片新闻标题</span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </section>
-
-    <!-- 一级栏目区块（聚合列表型子孙栏目 top 8） -->
-    <section class="cz-section cz-container" aria-label="栏目区块">
-        <div class="cz-blocks">
-            <div class="cz-block" th:each="block : ${categoryBlocks}">
-                <div class="cz-block-head cz-block-head--bar">
-                    <h2 th:text="${block.category.name}">栏目名</h2>
-                    <a class="cz-more" th:href="${block.moreUrl}">更多 ›</a>
-                </div>
-                <ul class="cz-block-list" th:if="${!#lists.isEmpty(block.items)}">
-                    <!-- 区块头条：有封面则图文，无封面则带摘要纯文 -->
-                    <li class="cz-block-featured" th:with="feat=${block.items[0]}">
-                        <a th:href="${url.article(feat.id)}">
-                            <span class="cz-feat-cover" th:if="${feat.coverImage != null}">
-                                <img th:src="${url.upload(feat.coverImage)}" th:alt="${feat.title}">
-                            </span>
-                            <span class="cz-feat-body">
-                                <span class="cz-feat-title" th:text="${feat.title}">头条标题</span>
-                                <span class="cz-feat-summary" th:if="${!#strings.isEmpty(feat.summary)}"
-                                      th:text="${feat.summary}">摘要</span>
-                                <span class="cz-feat-meta">
-                                    <span class="cz-top-badge" th:if="${feat.topmost == 1}">置顶</span>
-                                    <time th:if="${feat.publishTime != null}"
-                                          th:text="${#temporals.format(feat.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                                </span>
-                            </span>
-                        </a>
-                    </li>
-                    <li class="cz-block-item" th:each="item, stat : ${block.items}" th:if="${stat.index > 0}">
-                        <span class="cz-date-chip" th:if="${item.publishTime != null}"
-                              th:with="d=${item.publishTime}">
-                            <b th:text="${#temporals.format(d, 'dd')}">01</b>
-                            <i th:text="${#temporals.format(d, 'yyyy-MM')}">2026-01</i>
-                        </span>
-                        <a class="cz-block-item-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        <span class="cz-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                    </li>
-                </ul>
-                <div class="cz-empty" th:if="${#lists.isEmpty(block.items)}">
-                    <p>栏目暂无内容</p>
-                    <p class="cz-empty-hint">内容发布后将在此展示</p>
-                </div>
-            </div>
-        </div>
-    </section>
-    </th:block>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/campus-azure/list.html

@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="cz-page cz-container" id="main-content">
-    <div class="cz-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="cz-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="cz-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="cz-side-nav-list">
-                <li class="cz-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="cz-page-card">
-            <nav class="cz-crumb" aria-label="面包屑" th:if="${searchMode != true}">
-                <a th:href="${url.home()}">首页</a>
-                <th:block th:each="node, st : ${categoryPath}">
-                    <span class="cz-crumb-sep" aria-hidden="true">/</span>
-                    <a th:if="${!st.last}" class="crumb-parent" th:href="${url.category(node.id)}"
-                       th:text="${node.name}">父栏目</a>
-                    <span class="cz-crumb-current" th:if="${st.last}" th:text="${node.name}">栏目</span>
-                </th:block>
-            </nav>
-        <nav class="cz-crumb" aria-label="面包屑" th:if="${searchMode == true}">
-            <a th:href="${url.home()}">首页</a>
-            <span class="cz-crumb-sep" aria-hidden="true">/</span>
-            <span class="cz-crumb-current">搜索结果</span>
-        </nav>
-
-        <h1 class="cz-page-title" th:if="${searchMode != true}" th:text="${category.name}">栏目名</h1>
-        <h1 class="cz-page-title" th:if="${searchMode == true}" th:text="'搜索：' + ${q}">搜索词</h1>
-
-        <ul class="cz-article-list">
-            <!-- 有封面：图文行；无封面：行式（符号 + 标题 + 右侧日期） -->
-            <li th:each="item : ${listData.items}">
-                <div class="cz-article-row" th:if="${item.coverImage != null}">
-                    <a class="cz-item-cover" th:href="${url.article(item.id)}">
-                        <img th:src="${url.upload(item.coverImage)}" th:alt="${item.title}">
-                    </a>
-                    <div class="cz-item-body">
-                        <div class="cz-item-title">
-                            <a th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        </div>
-                        <p class="cz-item-summary" th:if="${!#strings.isEmpty(item.summary)}"
-                           th:text="${item.summary}">摘要</p>
-                        <div class="cz-item-meta">
-                            <time th:if="${item.publishTime != null}"
-                                  th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                            <span class="cz-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                        </div>
-                    </div>
-                </div>
-                <div class="cz-article-line" th:if="${item.coverImage == null}">
-                    <i class="cz-line-tick" aria-hidden="true"></i>
-                    <div class="cz-line-main">
-                        <a class="cz-line-title" th:href="${url.article(item.id)}" th:text="${item.title}">文章标题</a>
-                        <p class="cz-item-summary" th:if="${!#strings.isEmpty(item.summary)}"
-                           th:text="${item.summary}">摘要</p>
-                    </div>
-                    <div class="cz-line-side">
-                        <span class="cz-top-badge" th:if="${item.topmost == 1}">置顶</span>
-                        <time th:if="${item.publishTime != null}"
-                              th:text="${#temporals.format(item.publishTime, 'yyyy-MM-dd')}">2026-01-01</time>
-                    </div>
-                </div>
-            </li>
-        </ul>
-        <div class="cz-empty" th:if="${#lists.isEmpty(listData.items)}">
-            <p th:if="${searchMode == true}">未找到相关内容</p>
-            <p th:if="${searchMode != true}">栏目暂无内容</p>
-            <p class="cz-empty-hint" th:if="${searchMode == true}">换个关键词试试</p>
-            <p class="cz-empty-hint" th:if="${searchMode != true}">内容发布后将在此展示</p>
-        </div>
-
-        <!-- 分页（列表页/搜索页共用） -->
-        <nav class="cz-pagination" th:if="${listData.totalPages > 1}"
-             th:with="cur=${listData.page}, total=${listData.totalPages}" aria-label="分页">
-            <a th:classappend="${cur <= 1} ? 'disabled'"
-               th:href="${searchMode == true} ? ${url.search(q, cur - 1)} : ${url.category(listData.categoryId) + '?page=' + (cur - 1)}"
-               th:aria-disabled="${cur <= 1}">上一页</a>
-            <a th:each="p : ${#numbers.sequence(1, total)}"
-               th:classappend="${p == cur} ? 'active'"
-               th:href="${searchMode == true} ? ${url.search(q, p)} : ${url.category(listData.categoryId) + '?page=' + p}"
-               th:aria-label="${'第' + p + '页'}"
-               th:text="${p}">1</a>
-            <a th:classappend="${cur >= total} ? 'disabled'"
-               th:href="${searchMode == true} ? ${url.search(q, cur + 1)} : ${url.category(listData.categoryId) + '?page=' + (cur + 1)}"
-               th:aria-disabled="${cur >= total}">下一页</a>
-        </nav>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/campus-azure/single.html

@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="cz-page cz-container" id="main-content">
-    <div class="cz-cols">
-        <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-        <aside class="cz-side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-            <div class="cz-side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-            <ul class="cz-side-nav-list">
-                <li class="cz-side-nav-item" th:each="item : ${sideNav.items}"
-                    th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                    <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                       th:text="${item.name}">子栏目</a>
-                    <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-                </li>
-            </ul>
-        </aside>
-
-        <div class="cz-page-card">
-        <nav class="cz-crumb" aria-label="面包屑">
-            <a th:href="${url.home()}">首页</a>
-            <th:block th:each="node, st : ${categoryPath}">
-                <span class="cz-crumb-sep" aria-hidden="true">/</span>
-                <a th:if="${!st.last}" class="crumb-parent" th:href="${url.category(node.id)}"
-                   th:text="${node.name}">父栏目</a>
-                <span class="cz-crumb-current" th:if="${st.last}" th:text="${node.name}">栏目</span>
-            </th:block>
-        </nav>
-
-        <article class="cz-article">
-            <h1 class="cz-article-title" th:text="${category.name}">栏目名</h1>
-            <!-- 单页栏目内容（type=2，入库前已 jsoup 清洗） -->
-            <div class="cz-article-content" th:if="${!#strings.isEmpty(category.content)}"
-                 th:utext="${category.content}">单页内容</div>
-            <div class="cz-empty" th:if="${#strings.isEmpty(category.content)}">
-                <p>页面暂无内容</p>
-                <p class="cz-empty-hint">内容编辑后将在此展示</p>
-            </div>
-        </article>
-        </div>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-<script th:src="${url.asset('js/main.js')}"></script>
-</body>
-</html>

src/main/resources/templates/themes/campus-azure/theme.json

@@ -1,23 +0,0 @@
-{
-  "specVersion": 1,
-  "name": "campus-azure",
-  "title": "青蓝校园（campus-azure）",
-  "version": "1.0.0",
-  "author": "yunhai",
-  "description": "青蓝校园·师范/农林类官网门户：青蓝顶栏+白底主导航+青绿描边标题+大日期数字列表+图文左列右栏+圆角卡片区块+深色页脚带二维码位。基座 scholar-blue，配色与首页区块形态按师范/农林类高校官网重做。",
-  "screenshot": "assets/screenshot.png",
-  "bannerSize": "1920x560",
-  "params": [
-    { "key": "primary",      "cssVar": "--cz-primary",      "label": "主色",       "type": "color", "default": "#0d6a9e" },
-    { "key": "primaryDark",  "cssVar": "--cz-primary-dark", "label": "主色加深",   "type": "color", "default": "#084c73" },
-    { "key": "primaryLight", "cssVar": "--cz-primary-light","label": "主色提亮",   "type": "color", "default": "#1d87bd" },
-    { "key": "accent",       "cssVar": "--cz-accent",       "label": "点缀青绿",   "type": "color", "default": "#2b9c8f" },
-    { "key": "navBg",        "cssVar": "--cz-nav-bg",       "label": "导航条底色", "type": "color", "default": "#ffffff" },
-    { "key": "footerBg",     "cssVar": "--cz-footer-bg",    "label": "页脚底色",   "type": "color", "default": "#0b3348" },
-    { "key": "text",         "cssVar": "--cz-text",         "label": "正文文字色", "type": "color", "default": "#303c46" },
-    { "key": "textLight",    "cssVar": "--cz-text-light",   "label": "次要文字色", "type": "color", "default": "#6e7d88" },
-    { "key": "bg",           "cssVar": "--cz-bg",           "label": "页面底色",   "type": "color", "default": "#eef3f6" },
-    { "key": "cardBg",       "cssVar": "--cz-card-bg",      "label": "卡片底色",   "type": "color", "default": "#ffffff" },
-    { "key": "border",       "cssVar": "--cz-border",       "label": "边框色",     "type": "color", "default": "#d9e5ec" }
-  ]
-}

src/main/resources/templates/themes/campus-glow/fragments/header.html

@@ -31,10 +31,19 @@
                  th:src="${url.upload(site.config['logo'])}" th:alt="${site.name}">
             <a class="cg-site-name" th:href="${url.home()}" th:text="${site.name}">站点名称</a>
         </div>
-        <form class="cg-site-search" th:action="${url.search('', null)}" method="get" role="search">
+        <!-- D-10（docs/20）：searchStyle=overlay 换全屏搜索浮层；none 隐藏；inline/缺省保留原表单。
+     坑④：th:replace 优先级(100)先于 th:if(300)——条件必须放外层 th:block，replace 放子元素 -->
+        <th:block th:if="${themeParams != null and themeParams['searchStyle'] == 'overlay'}">
+            <th:block th:replace="~{'themes/common/fragments/search' :: overlay(${url})}" />
+        </th:block>
+        <th:block th:if="${themeParams == null or themeParams['searchStyle'] == null or themeParams['searchStyle'] == 'inline'}">
+<form class="cg-site-search"
+             
+              th:action="${url.search('', null)}" method="get" role="search">
             <input type="text" name="q" placeholder="站内搜索" aria-label="站内搜索">
             <button type="submit">搜索</button>
         </form>
+        </th:block>
     </div>
 
     <nav class="cg-nav" aria-label="栏目导航">

src/main/resources/templates/themes/campus-glow/home.html

@@ -30,7 +30,11 @@
          注意坑④：th:replace（优先级 100）先于 th:case（300）执行——case 必须放父元素、replace 放子元素。 -->
     <th:block th:if="${layoutBlocks != null}">
         <th:block th:replace="~{'themes/common/fragments/home-blocks' :: style}" />
+        <th:block th:replace="~{'themes/common/fragments/home-blocks' :: previewScript}" />
+        <!-- D-8（docs/20）：骨架共享入场动效 + count-up；主题参数 animation=off 关闭 -->
+        <th:block th:if="${themeParams == null or themeParams['animation'] != 'off'}" th:replace="~{'themes/common/fragments/home-blocks' :: motionScript}" />
         <th:block th:each="block : ${layoutBlocks}">
+            <div class="plb-anchor" th:attr="data-plb-id=${block['id']}" style="display:contents">
             <th:block th:switch="${block.type}">
                 <th:block th:case="'article_list'">
                     <th:block th:switch="${block.homeStyle}">
@@ -48,6 +52,7 @@
                 <th:block th:case="'notice_bar'"><th:block th:replace="~{${themeBase} + '/fragments/home-blocks' :: notice_bar(${block})}" /></th:block>
                 <th:block th:case="*"><th:block th:replace="~{'themes/common/fragments/home-blocks' :: render(${block})}" /></th:block>
             </th:block>
+            </div>
         </th:block>
     </th:block>
 

src/main/resources/templates/themes/campus-glow/theme.json

@@ -8,19 +8,152 @@
   "screenshot": "assets/screenshot.png",
   "bannerSize": "1920x560",
   "params": [
-    { "key": "primary",     "cssVar": "--cg-primary",      "label": "主色",       "type": "color", "default": "#0e8a5f" },
-    { "key": "primaryDark", "cssVar": "--cg-primary-dark", "label": "主色加深",   "type": "color", "default": "#0a6244" },
-    { "key": "accent",      "cssVar": "--cg-accent",       "label": "强调色",     "type": "color", "default": "#ff7a1a" },
-    { "key": "text",        "cssVar": "--cg-text",         "label": "正文文字色", "type": "color", "default": "#2b2f33" },
-    { "key": "textLight",   "cssVar": "--cg-text-light",   "label": "次要文字色", "type": "color", "default": "#7a8288" },
-    { "key": "bg",          "cssVar": "--cg-bg",           "label": "页面底色",   "type": "color", "default": "#f4f7f5" },
-    { "key": "cardBg",      "cssVar": "--cg-card-bg",      "label": "卡片底色",   "type": "color", "default": "#ffffff" },
-    { "key": "border",      "cssVar": "--cg-border",       "label": "边框色",     "type": "color", "default": "#e3e8e4" },
-    { "key": "galleryCols", "label": "展厅每行列数", "type": "select", "default": "4",
+    {
+      "key": "primary",
+      "cssVar": "--cg-primary",
+      "label": "主色",
+      "type": "color",
+      "default": "#0e8a5f"
+    },
+    {
+      "key": "primaryDark",
+      "cssVar": "--cg-primary-dark",
+      "label": "主色加深",
+      "type": "color",
+      "default": "#0a6244"
+    },
+    {
+      "key": "accent",
+      "cssVar": "--cg-accent",
+      "label": "强调色",
+      "type": "color",
+      "default": "#ff7a1a"
+    },
+    {
+      "key": "text",
+      "cssVar": "--cg-text",
+      "label": "正文文字色",
+      "type": "color",
+      "default": "#2b2f33"
+    },
+    {
+      "key": "textLight",
+      "cssVar": "--cg-text-light",
+      "label": "次要文字色",
+      "type": "color",
+      "default": "#7a8288"
+    },
+    {
+      "key": "bg",
+      "cssVar": "--cg-bg",
+      "label": "页面底色",
+      "type": "color",
+      "default": "#f4f7f5"
+    },
+    {
+      "key": "cardBg",
+      "cssVar": "--cg-card-bg",
+      "label": "卡片底色",
+      "type": "color",
+      "default": "#ffffff"
+    },
+    {
+      "key": "border",
+      "cssVar": "--cg-border",
+      "label": "边框色",
+      "type": "color",
+      "default": "#e3e8e4"
+    },
+    {
+      "key": "galleryCols",
+      "label": "展厅每行列数",
+      "type": "select",
+      "default": "4",
       "options": [
-        { "value": "3", "label": "3 列" },
-        { "value": "4", "label": "4 列" },
-        { "value": "5", "label": "5 列" }
+        {
+          "value": "3",
+          "label": "3 列"
+        },
+        {
+          "value": "4",
+          "label": "4 列"
+        },
+        {
+          "value": "5",
+          "label": "5 列"
+        }
+      ]
+    },
+    {
+      "key": "animation",
+      "label": "首页动效",
+      "type": "select",
+      "default": "on",
+      "options": [
+        {
+          "value": "on",
+          "label": "开启（滚动入场 + 数字计数）"
+        },
+        {
+          "value": "off",
+          "label": "关闭（静态呈现）"
+        }
+      ]
+    },
+    {
+      "key": "titleStyle",
+      "label": "栏目标题语言",
+      "type": "select",
+      "default": "cn",
+      "options": [
+        {
+          "value": "cn",
+          "label": "仅中文"
+        },
+        {
+          "value": "bilingual",
+          "label": "中英双语（大中文 + 斜体英文副题）"
+        }
+      ]
+    },
+    {
+      "key": "iconShape",
+      "label": "图标形状语言",
+      "type": "select",
+      "default": "circle",
+      "options": [
+        {
+          "value": "circle",
+          "label": "圆形徽章"
+        },
+        {
+          "value": "hexagon",
+          "label": "六边形"
+        },
+        {
+          "value": "square",
+          "label": "圆角方形"
+        }
+      ]
+    },
+    {
+      "key": "searchStyle",
+      "label": "门户搜索样式",
+      "type": "select",
+      "default": "inline",
+      "options": [
+        {
+          "value": "none",
+          "label": "不显示搜索"
+        },
+        {
+          "value": "inline",
+          "label": "通栏搜索条（banner 下方白色大搜索条）"
+        },
+        {
+          "value": "overlay",
+          "label": "全屏搜索浮层（右上放大镜唤起）"
+        }
       ]
     }
   ]

src/main/resources/templates/themes/classic-red/README.md

@@ -1,23 +0,0 @@
-# classic-red 皮肤包
-
-由 default 派生的演示皮肤（方案 §7）。**升级随版本发布，不在站点间复制目录**。
-
-## 数据契约（模板可取用的 model 属性全集，§4.3）
-
-| 页面 | 属性 |
-| --- | --- |
-| 全部 | `site`（快照：config/分类树/轮播/友链组/院系子站）、`url`（PortalUrlHelper：home/category/article/asset/search/siteHome）、`themeBase`（=`themes/classic-red`）、`navCategories`、`pageTitle`、`seoDescription`、`canonical`、`themeParams`（微调参数，仅 theme.json 声明过的 key）、`themeVarsCss`（服务端预构建 `:root{}` 覆盖串，无参数为空） |
-| home | `banners`（时间窗内 home 位）、`topArticles`（置顶+最新 6）、`categoryBlocks`（LIST 型根栏目块，各 top 8） |
-| list / search | `listData`（分页）、`category`（list）、`q` + `searchMode`（search） |
-| detail | `article`、`prevArticle`、`nextArticle`、`currentCategoryId` |
-| single | `category`（含 `content`）、`currentCategoryId` |
-
-原则：皮肤不得假设"首页一定有轮播"，对空集合优雅降级。
-
-## 轮播图尺寸约定（bannerSize）
-
-1920x560（管理端上传端按此引导裁剪，D2 决策点）。
-
-## 可调参数
-
-见 `theme.json` 的 `params`（color 进 CSS 变量；select 供模板 `th:if` 分支布局）。

src/main/resources/templates/themes/classic-red/assets/css/main.css

@@ -1,372 +0,0 @@
-/* ============================================================
- * classic-red 皮肤包样式（default 派生）（方案 §8.2）
- * 换肤 = 拷贝 default 目录改 CSS 变量与布局，零后端代码。
- * 轮播图设计尺寸约定：1920×560（管理端上传端按此引导裁剪，D2 决策点确认）。
- * ============================================================ */
-:root {
-  --primary: #b01a2e;
-  --primary-dark: #7f1224;
-  --text: #333;
-  --text-light: #777;
-  --bg: #f7f5f2;
-  --card-bg: #fff;
-  --border: #e5e6eb;
-  --max-width: 1200px;
-}
-
-* { box-sizing: border-box; }
-body {
-  margin: 0;
-  font-family: "PingFang SC", "Microsoft YaHei", "Helvetica Neue", Arial, sans-serif;
-  color: var(--text);
-  background: var(--bg);
-}
-a { color: inherit; text-decoration: none; }
-a:hover { color: var(--primary); }
-img { max-width: 100%; }
-time, .item-meta { color: var(--text-light); font-size: 13px; }
-.empty { color: var(--text-light); text-align: center; padding: 32px 0; }
-
-/* ===== 头部 ===== */
-.site-header { background: var(--card-bg); border-bottom: 1px solid var(--border); }
-.header-inner {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 18px 16px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-}
-.site-brand { display: flex; align-items: center; gap: 12px; }
-.site-logo { height: 44px; }
-.site-name { font-size: 26px; font-weight: 700; color: var(--primary); }
-.site-search { display: flex; }
-.site-search input {
-  border: 1px solid var(--border);
-  border-right: none;
-  padding: 8px 12px;
-  width: 220px;
-  outline: none;
-}
-.site-search button {
-  border: none;
-  background: var(--primary);
-  color: #fff;
-  padding: 8px 18px;
-  cursor: pointer;
-}
-
-/* ===== 专业院系下拉（院系子站切换，《院系子站方案》） ===== */
-/* 悬停展开白底纵向列表，右对齐 + 超高滚动（院系数十个子站场景） */
-.site-colleges { position: relative; }
-.site-colleges .colleges-toggle {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  border: 1px solid var(--border);
-  padding: 8px 14px;
-  cursor: pointer;
-  color: var(--primary);
-  font-weight: 600;
-  white-space: nowrap;
-}
-.site-colleges .colleges-arrow { font-style: normal; font-size: 12px; color: var(--text-light); }
-.site-colleges .colleges-menu {
-  display: none;
-  position: absolute;
-  top: 100%;
-  right: 0;
-  min-width: 200px;
-  max-height: 420px;
-  overflow-y: auto;
-  margin: 0;
-  padding: 6px 0;
-  list-style: none;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-  border-top: 2px solid var(--primary);
-  box-shadow: 0 6px 16px rgba(0, 0, 0, .12);
-  z-index: 110;
-}
-.site-colleges:hover .colleges-menu { display: block; }
-.site-colleges .colleges-menu li a {
-  display: block;
-  padding: 9px 16px;
-  color: var(--text);
-  white-space: nowrap;
-}
-.site-colleges .colleges-menu li a:hover { background: #f2f6fc; color: var(--primary); }
-.site-colleges .colleges-menu li.active a { color: var(--primary); font-weight: 600; }
-.site-nav { background: var(--primary); }
-.site-nav ul {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 0 16px;
-  list-style: none;
-  display: flex;
-  flex-wrap: wrap;
-}
-.site-nav li a {
-  display: block;
-  padding: 12px 22px;
-  color: #fff;
-}
-.site-nav li:hover a, .site-nav li.active a { background: var(--primary-dark); }
-
-/* ===== 二级下拉导航 ===== */
-/* 面板为白底纵向列表：需整体覆盖 .site-nav ul 的横向 flex 与内边距 */
-.site-nav > ul > li { position: relative; }
-.site-nav li.has-sub > a::after { content: " ▾"; font-size: 12px; opacity: .85; }
-.site-nav ul.sub-nav {
-  display: none;
-  position: absolute;
-  top: 100%;
-  left: 0;
-  min-width: 168px;
-  max-width: none;
-  margin: 0;
-  padding: 6px 0;
-  list-style: none;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-  border-top: 2px solid var(--primary);
-  box-shadow: 0 6px 16px rgba(0, 0, 0, .12);
-  z-index: 100;
-}
-.site-nav li:hover > .sub-nav { display: block; }
-.site-nav .sub-nav li a {
-  padding: 9px 16px;
-  color: var(--text);
-  white-space: nowrap;
-  background: none;
-}
-.site-nav .sub-nav li a:hover { background: #f2f6fc; color: var(--primary); }
-.site-nav .sub-nav li.active a { color: var(--primary); font-weight: 600; }
-
-/* ===== 首页轮播 ===== */
-.banner { position: relative; max-width: var(--max-width); margin: 16px auto; overflow: hidden; }
-.banner-slides { position: relative; height: 420px; }
-.banner-slide { display: none; position: absolute; inset: 0; }
-.banner-slide.active { display: block; }
-.banner-slide img { width: 100%; height: 100%; object-fit: cover; }
-.banner-title {
-  position: absolute;
-  left: 0; right: 0; bottom: 0;
-  padding: 12px 20px;
-  color: #fff;
-  background: linear-gradient(transparent, rgba(0, 0, 0, .6));
-}
-.banner-dots {
-  position: absolute;
-  bottom: 12px; right: 20px;
-  display: flex; gap: 8px;
-}
-.banner-dots button {
-  width: 10px; height: 10px;
-  border-radius: 50%;
-  border: none;
-  background: rgba(255, 255, 255, .6);
-  cursor: pointer;
-}
-.banner-dots button.active { background: #fff; }
-
-/* ===== 通用区块 ===== */
-.top-strip, .category-block {
-  max-width: var(--max-width);
-  margin: 16px auto;
-  padding: 20px;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-}
-.section-title, .block-head h2 {
-  margin: 0 0 12px;
-  font-size: 20px;
-  border-left: 4px solid var(--primary);
-  padding-left: 10px;
-}
-.block-head { display: flex; align-items: baseline; justify-content: space-between; }
-.more { font-size: 13px; color: var(--text-light); }
-.top-strip ul, .block-list { list-style: none; margin: 0; padding: 0; }
-.top-strip li, .block-list li {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 12px;
-  padding: 9px 0;
-  border-bottom: 1px dashed var(--border);
-}
-.top-strip li:last-child, .block-list li:last-child { border-bottom: none; }
-.top-strip li a, .block-list li a {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.top-badge {
-  flex: none;
-  color: #fff;
-  background: var(--primary);
-  font-size: 12px;
-  padding: 1px 6px;
-  border-radius: 2px;
-}
-
-/* ===== 列表页 ===== */
-.list-main {
-  max-width: var(--max-width);
-  margin: 16px auto;
-  padding: 24px;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-}
-.breadcrumb { color: var(--text-light); font-size: 13px; margin-bottom: 16px; }
-.breadcrumb a { margin-right: 8px; }
-.breadcrumb span { margin-left: 8px; }
-.page-title {
-  font-size: 22px;
-  border-left: 4px solid var(--primary);
-  padding-left: 10px;
-  margin: 0 0 18px;
-}
-.article-list { list-style: none; margin: 0; padding: 0; }
-.article-list li { padding: 14px 0; border-bottom: 1px dashed var(--border); }
-.item-title { font-size: 17px; }
-.item-summary {
-  color: var(--text-light);
-  font-size: 14px;
-  margin: 6px 0;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-.item-meta { display: flex; gap: 10px; align-items: center; }
-
-/* ===== 分页 ===== */
-.pagination { display: flex; gap: 6px; justify-content: center; padding: 24px 0 4px; }
-.pagination a {
-  min-width: 34px;
-  text-align: center;
-  padding: 6px 10px;
-  border: 1px solid var(--border);
-  background: var(--card-bg);
-}
-.pagination a.active { background: var(--primary); color: #fff; border-color: var(--primary); }
-
-/* ===== 详情/单页 ===== */
-.detail-main {
-  max-width: var(--max-width);
-  margin: 16px auto;
-  padding: 32px;
-  background: var(--card-bg);
-  border: 1px solid var(--border);
-}
-.article-title { margin: 8px 0 12px; font-size: 26px; text-align: center; }
-.article-meta {
-  display: flex;
-  gap: 18px;
-  justify-content: center;
-  flex-wrap: wrap;
-  color: var(--text-light);
-  font-size: 13px;
-  padding-bottom: 18px;
-  border-bottom: 1px solid var(--border);
-}
-.article-content { line-height: 1.9; font-size: 16px; padding-top: 20px; word-break: break-word; }
-.article-content img { height: auto; }
-.article-content table { border-collapse: collapse; width: 100%; }
-.article-content table td, .article-content table th { border: 1px solid var(--border); padding: 6px 10px; }
-.article-sibling { display: flex; flex-direction: column; gap: 8px; margin-top: 28px; font-size: 14px; }
-
-/* ===== 页脚 ===== */
-.site-footer { margin-top: 32px; background: var(--primary-dark); color: rgba(255, 255, 255, .85); }
-.footer-links {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 18px 16px 0;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-.links-group { display: flex; flex-wrap: wrap; gap: 14px; align-items: center; font-size: 13px; }
-.group-name { font-weight: 600; margin-right: 4px; }
-.footer-info {
-  max-width: var(--max-width);
-  margin: 0 auto;
-  padding: 12px 16px 20px;
-  text-align: center;
-  font-size: 13px;
-}
-.footer-info p { margin: 4px 0; }
-
-/* ===== 移动端适配 ===== */
-@media (max-width: 768px) {
-  .header-inner { flex-direction: column; align-items: stretch; }
-  .site-search input { flex: 1; width: auto; }
-  .site-colleges { align-self: flex-start; }
-  .site-colleges .colleges-menu { left: 0; right: auto; min-width: 100%; }
-  .banner-slides { height: 200px; }
-  .detail-main, .list-main { padding: 18px 14px; }
-  .article-title { font-size: 22px; }
-  /* 触屏无 hover：子菜单静态平铺（缩进列表），不做浮层 */
-  .site-nav ul.sub-nav {
-    display: block;
-    position: static;
-    border: none;
-    box-shadow: none;
-    background: transparent;
-    min-width: 0;
-    padding: 0 0 6px;
-  }
-  .site-nav .sub-nav li a { color: rgba(255, 255, 255, .9); padding: 8px 16px 8px 34px; }
-  .site-nav .sub-nav li a:hover { background: var(--primary-dark); color: #fff; }
-}
-
-
-/* ===== classic-red 主题差异层（方案 §7：差异仅限 CSS + fragments）===== */
-/* 宋体标题（中小学/党政风） */
-.site-name, .banner-title, .page-title, .section-title, .article-title, .item-title {
-  font-family: "SimSun", "STSong", "Songti SC", serif;
-}
-/* 头部样式参数（theme.json headerStyle=plain → 简洁顶栏） */
-.site-header.header-plain { background: #fff; border-bottom: 2px solid var(--primary); }
-.site-header.header-plain .site-name { color: var(--primary-dark); }
-
-/* B4 友链 Logo：与名称并排小图（高度 ~20px，垂直居中；过宽截断不撑破页脚） */
-.links-group a .link-logo,
-.sp-links-row a .link-logo {
-    height: 20px;
-    width: auto;
-    max-width: 64px;
-    object-fit: contain;
-    vertical-align: middle;
-    margin-right: 4px;
-    border-radius: 2px;
-}
-
-
-/* ===== 左侧栏目导航（docs/11）：有二级节点的模块，栏目/文章页左侧展示兄弟目录 ===== */
-.list-main.has-sidenav, .detail-main.has-sidenav { display: flex; align-items: flex-start; gap: 24px; }
-.has-sidenav .list-body { flex: 1; min-width: 0; }
-.side-nav { flex: none; width: 220px; background: var(--card-bg, #fff); border: 1px solid var(--border); overflow: hidden; }
-.side-nav-head { background: var(--primary); color: #fff; font-size: 20px; font-weight: 700; text-align: center; padding: 18px 12px; letter-spacing: 2px; }
-.side-nav-list { list-style: none; margin: 0; padding: 0; }
-.side-nav-item + .side-nav-item { border-top: 1px dashed var(--border); }
-.side-nav-item a { display: block; padding: 12px 16px; color: var(--text); text-decoration: none; font-size: 15px; transition: background .15s ease, color .15s ease; }
-.side-nav-item a:hover { color: var(--primary); background: var(--bg); }
-.side-nav-item.active a { background: var(--primary); color: #fff; font-weight: 600; text-decoration: none; }
-/* 顶导航二级下拉当前项高亮（docs/11 顺带） */
-.site-nav ul.sub-nav li.active a { color: var(--primary); }
-@media (max-width: 768px) {
-  .list-main.has-sidenav, .detail-main.has-sidenav { flex-direction: column; gap: 12px; }
-  .side-nav { width: 100%; }
-  .side-nav-list { display: flex; overflow-x: auto; -webkit-overflow-scrolling: touch; }
-  .side-nav-item { flex: none; }
-  .side-nav-item + .side-nav-item { border-top: none; border-left: 1px dashed var(--border); }
-  .side-nav-item a { white-space: nowrap; }
-}
-@media print {
-  .side-nav { display: none; }
-  .list-main.has-sidenav, .detail-main.has-sidenav { display: block; }
-}

src/main/resources/templates/themes/classic-red/assets/favicon.svg

@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <defs><linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
-    <stop offset="0" stop-color="#be4354"/><stop offset="1" stop-color="#7b1220"/>
-  </linearGradient></defs>
-  <rect width="64" height="64" fill="url(#bg)"/>
-  <circle cx="32" cy="25" r="10" fill="#ffffff"/>
-  <path d="M 16 49.3 Q 32 30.7 48 49.3 Z" fill="#ffffff" opacity="0.92"/>
-</svg>

src/main/resources/templates/themes/classic-red/assets/js/main.js

@@ -1,40 +0,0 @@
-/* default 皮肤包脚本：仅首页轮播自动播放与圆点切换，无任何外部依赖 */
-(function () {
-  var slides = document.querySelectorAll('.banner-slide');
-  var dots = document.querySelectorAll('.banner-dots button');
-  if (!slides.length) {
-    return;
-  }
-  var current = 0;
-  var timer = null;
-
-  function show(index) {
-    slides[current].classList.remove('active');
-    if (dots[current]) {
-      dots[current].classList.remove('active');
-    }
-    current = (index + slides.length) % slides.length;
-    slides[current].classList.add('active');
-    if (dots[current]) {
-      dots[current].classList.add('active');
-    }
-  }
-
-  function start() {
-    if (slides.length > 1) {
-      timer = window.setInterval(function () {
-        show(current + 1);
-      }, 5000);
-    }
-  }
-
-  dots.forEach(function (dot, index) {
-    dot.addEventListener('click', function () {
-      window.clearInterval(timer);
-      show(index);
-      start();
-    });
-  });
-
-  start();
-})();

src/main/resources/templates/themes/classic-red/detail.html

@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<head th:replace="~{${themeBase} + '/fragments/head' :: head}"></head>
-<body>
-<header th:replace="~{${themeBase} + '/fragments/header' :: header}"></header>
-
-<main class="detail-main" th:classappend="${sideNav != null} ? 'has-sidenav'">
-    <!-- 左侧栏目导航（docs/11）：模块有二级子栏目时展示"模块名 + 全部兄弟" -->
-    <aside class="side-nav" th:if="${sideNav != null}" aria-label="栏目导航">
-        <div class="side-nav-head" th:text="${sideNav.top.name}">模块名</div>
-        <ul class="side-nav-list">
-            <li class="side-nav-item" th:each="item : ${sideNav.items}"
-                th:classappend="${item.id == sideNav.activeId} ? 'active'">
-                <a th:if="${item.type == 3}" th:href="${item.linkUrl}" target="_blank" rel="noopener"
-                   th:text="${item.name}">子栏目</a>
-                <a th:unless="${item.type == 3}" th:href="${url.category(item.id)}" th:text="${item.name}">子栏目</a>
-            </li>
-        </ul>
-    </aside>
-    <div class="list-body">
-    <nav class="breadcrumb">
-        <a th:href="${url.home()}">首页</a>
-        <th:block th:each="node : ${categoryPath}">
-            <a class="crumb-parent" th:href="${url.category(node.id)}" th:text="${node.name}">栏目</a>
-        </th:block>
-        <span>正文</span>
-    </nav>
-
-    <article class="article">
-        <h1 class="article-title" th:text="${article.title}">文章标题</h1>
-        <div class="article-meta">
-            <time th:if="${article.publishTime != null}"
-                  th:text="${'发布时间：' + #temporals.format(article.publishTime, 'yyyy-MM-dd HH:mm')}">2026-01-01 10:00</time>
-            <span th:if="${!#strings.isEmpty(article.authorName)}"
-                  th:text="'作者：' + ${article.authorName}">作者</span>
-            <span th:if="${!#strings.isEmpty(article.source)}"
-                  th:text="'来源：' + ${article.source}">来源</span>
-            <span th:text="'浏览量：' + ${article.viewCount}">浏览量</span>
-        </div>
-        <!-- 正文：入库前已经 jsoup 白名单清洗（方案 §8.5），此处允许 utext；
-             其余字段一律 th:text 转义输出 -->
-        <div class="article-content" th:utext="${article.content}">正文</div>
-    </article>
-
-    <nav class="article-sibling">
-        <a th:if="${prevArticle != null}" class="prev"
-           th:href="${url.article(prevArticle.id)}"
-           th:text="'上一篇：' + ${prevArticle.title}">上一篇</a>
-        <a th:if="${nextArticle != null}" class="next"
-           th:href="${url.article(nextArticle.id)}"
-           th:text="'下一篇：' + ${nextArticle.title}">下一篇</a>
-    </nav>
-    </div>
-</main>
-
-<footer th:replace="~{${themeBase} + '/fragments/footer' :: footer}"></footer>
-</body>
-</html>

src/main/resources/templates/themes/classic-red/fragments/footer.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<!-- 公共页脚：联系信息 + 友情链接（分组渲染，方案 §8.1：友链不设独立路由） -->
-<footer class="site-footer" th:fragment="footer">
-    <div class="footer-links" th:if="${!#lists.isEmpty(site.linkGroups)}">
-        <div class="links-group" th:each="group : ${site.linkGroups}">
-            <span class="group-name" th:text="${group.groupName}">分组</span>
-            <a th:each="link : ${group.links}" th:href="${link.linkUrl}" target="_blank" rel="noopener">
-                    <img th:if="${link.logoUrl != null and !#strings.isEmpty(link.logoUrl)}" class="link-logo"
-                         th:src="${url.upload(link.logoUrl)}" th:alt="${link.name}" loading="lazy">
-                    <span th:text="${link.name}">链接</span>
-                </a>
-        </div>
-    </div>
-    <div class="footer-info">
-        <p th:if="${site.config['contact'] != null}" th:text="${site.config['contact']}">联系方式</p>
-        <p th:if="${site.config['copyright'] != null}" th:text="${site.config['copyright']}">版权信息</p>
-        <p th:if="${site.config['beian'] != null}" th:text="${site.config['beian']}">备案号</p>
-    </div>
-</footer>
-</html>

src/main/resources/templates/themes/classic-red/fragments/head.html

@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
-<!-- 公共 head 片段：SEO（title/description/canonical）+ 主题资产（方案 §8.3/§8.6） -->
-<head th:fragment="head">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title th:text="${pageTitle}">页面标题</title>
-    <meta name="description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}"
-          th:content="${seoDescription}">
-    <link rel="canonical" th:if="${canonical != null}" th:href="${canonical}">
-    <!-- og 标签基本三件（C-7，方案 §8.6 canonical/og 同基准） -->
-    <meta property="og:title" th:if="${pageTitle != null}" th:content="${pageTitle}">
-    <meta property="og:description" th:if="${seoDescription != null and !#strings.isEmpty(seoDescription)}" th:content="${seoDescription}">
-    <meta property="og:image" th:if="${ogImage != null}" th:content="${ogImage}">
-    <link rel="stylesheet" th:href="${url.asset('css/main.css')}">
-    <!-- 微调参数 CSS 变量覆盖（方案 §5.3）：位于皮肤 CSS 之后层叠覆盖；值由服务端预构建并校验 -->
-    <style th:if="${not #strings.isEmpty(themeVarsCss)}" th:utext="${themeVarsCss}"></style>
-    <!-- 站点级自定义样式（B3）：位于皮肤 CSS 与微调变量之后层叠覆盖；内容经服务端黑名单强校验后直出 -->
-    <style th:if="${not #strings.isEmpty(customCss)}" th:utext="${customCss}"></style>
-    <!-- favicon：管理端配置了 favicon 键用上传图，未配置输出主题内置兜底 icon（assets/favicon.png） -->
-    <link rel="icon" type="image/png"
-          th:href="${site.config['favicon'] != null ? url.upload(site.config['favicon']) : url.asset('favicon.png')}">
-</head>
-</html>