From 3daa0273a487ba9b4258ec94fe2ec97e3c37bec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= <wangwenhao_2026@163.com>
Date: Tue, 5 May 2026 15:09:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(news):=20=E6=94=AF=E6=8C=81=E6=96=B0?=
 =?UTF-8?q?=E9=97=BB=E4=B8=AD=E5=BF=83=E5=A4=9A=E7=AB=99=E7=82=B9=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增站点编码配置，支持新闻分类与文章按站点隔离。主要变更包括：
- 数据库表增加 site_code 字段及索引
- 后台管理界面支持按站点筛选
- 前台接口支持通过查询参数或请求头指定站点
- 新增站点配置与解析逻辑
---
 .idea/vcs.xml                                 |   6 +
 client/env.d.ts                               |   4 +
 client/src/api/index.ts                       |  15 +-
 client/src/config/portalSite.ts               |   8 +
 client/src/views/admin/NewsPage.vue           |  61 ++++++-
 database/sql/migration_news_multisite.sql     |  37 +++++
 .../server/WuhanSagaApplication.java          |   3 +
 .../server/config/PortalSiteProperties.java   |  31 ++++
 .../server/config/PortalSiteResolver.java     |  54 +++++++
 .../wuhansaga/server/constant/SiteCodes.java  |  15 ++
 .../controller/admin/AdminNewsController.java |  13 +-
 .../portal/PortalNewsController.java          |  27 ++--
 .../com/wuhansaga/server/entity/News.java     |   2 +
 .../wuhansaga/server/entity/NewsCategory.java |   2 +
 .../server/mapper/NewsCategoryMapper.java     |   5 +-
 .../wuhansaga/server/mapper/NewsMapper.java   |  13 +-
 .../server/service/NewsCategoryService.java   |  18 ++-
 .../wuhansaga/server/service/NewsService.java |  55 ++++++-
 server/src/main/resources/application.yml     |   6 +
 server/src/main/resources/data.sql            |  17 +-
 .../resources/mapper/NewsCategoryMapper.xml   |  13 +-
 .../src/main/resources/mapper/NewsMapper.xml  |  43 ++++-
 server/src/main/resources/schema.sql          |   7 +-
 server/target/classes/application.yml         |   6 +
 .../server/WuhanSagaApplication.class         | Bin 851 -> 994 bytes
 .../server/common/BizException.class          | Bin 673 -> 673 bytes
 .../wuhansaga/server/common/PageQuery.class   | Bin 2148 -> 2144 bytes
 .../wuhansaga/server/common/PageResult.class  | Bin 4112 -> 4024 bytes
 .../server/config/OpenApiConfig.class         | Bin 2256 -> 2248 bytes
 .../server/config/PortalSiteProperties.class  | Bin 0 -> 4153 bytes
 .../server/config/PortalSiteResolver.class    | Bin 0 -> 2739 bytes
 .../wuhansaga/server/config/RedisConfig.class | Bin 3674 -> 3674 bytes
 .../server/config/SaTokenConfig.class         | Bin 2185 -> 2190 bytes
 .../server/config/WebMvcConfig.class          | Bin 3404 -> 3404 bytes
 .../wuhansaga/server/constant/SiteCodes.class | Bin 0 -> 446 bytes
 .../admin/AdminNewsController.class           | Bin 4688 -> 5034 bytes
 .../admin/AdminProductLineController.class    | Bin 4997 -> 4997 bytes
 .../portal/PortalNewsController.class         | Bin 2771 -> 3707 bytes
 .../portal/PortalProductController.class      | Bin 5011 -> 5011 bytes
 .../server/entity/MediaLibrary.class          | Bin 12007 -> 12102 bytes
 .../com/wuhansaga/server/entity/News.class    | Bin 15858 -> 16466 bytes
 .../server/entity/NewsCategory.class          | Bin 7166 -> 7684 bytes
 .../server/entity/ProductCategory.class       | Bin 9582 -> 9678 bytes
 .../wuhansaga/server/entity/ProductLine.class | Bin 30608 -> 30706 bytes
 .../server/entity/SingleEquipment.class       | Bin 20999 -> 21090 bytes
 .../wuhansaga/server/entity/SparePart.class   | Bin 20422 -> 20513 bytes
 .../server/mapper/CaseCategoryMapper.class    | Bin 672 -> 672 bytes
 .../server/mapper/CompanyInfoMapper.class     | Bin 426 -> 426 bytes
 .../server/mapper/ContactMapper.class         | Bin 506 -> 506 bytes
 .../server/mapper/CoreTechnologyMapper.class  | Bin 682 -> 682 bytes
 .../server/mapper/NewsCategoryMapper.class    | Bin 672 -> 862 bytes
 .../wuhansaga/server/mapper/NewsMapper.class  | Bin 1291 -> 1685 bytes
 .../server/mapper/ProductCategoryMapper.class | Bin 976 -> 976 bytes
 .../mapper/ProductLineEquipmentMapper.class   | Bin 1138 -> 1138 bytes
 .../server/mapper/SingleEquipmentMapper.class | Bin 1249 -> 1249 bytes
 .../server/service/AboutService.class         | Bin 2099 -> 2099 bytes
 .../server/service/AuthService.class          | Bin 2693 -> 2693 bytes
 .../server/service/BannerService.class        | Bin 2260 -> 2260 bytes
 .../server/service/CaseCategoryService.class  | Bin 1984 -> 1984 bytes
 .../server/service/CaseStudyService.class     | Bin 3106 -> 3106 bytes
 .../server/service/CompanyInfoService.class   | Bin 2336 -> 2336 bytes
 .../service/CoreTechnologyService.class       | Bin 2010 -> 2010 bytes
 .../server/service/MediaLibraryService.class  | Bin 6068 -> 6080 bytes
 .../server/service/NewsCategoryService.class  | Bin 1984 -> 2508 bytes
 .../server/service/NewsService.class          | Bin 3285 -> 5341 bytes
 .../service/ProductCategoryService.class      | Bin 3732 -> 3797 bytes
 .../server/service/ProductLineService.class   | Bin 4591 -> 4591 bytes
 .../service/SingleEquipmentService.class      | Bin 3142 -> 3142 bytes
 .../server/service/SparePartService.class     | Bin 3052 -> 3052 bytes
 .../server/service/WorkshopService.class      | Bin 2199 -> 2199 bytes
 server/target/classes/data.sql                | 153 +++++++++++++-----
 .../classes/mapper/NewsCategoryMapper.xml     |  13 +-
 server/target/classes/mapper/NewsMapper.xml   |  43 ++++-
 server/target/classes/schema.sql              |  29 +++-
 .../compile/default-compile/createdFiles.lst  |   3 +
 .../compile/default-compile/inputFiles.lst    |   4 +
 76 files changed, 592 insertions(+), 114 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 client/src/config/portalSite.ts
 create mode 100644 database/sql/migration_news_multisite.sql
 create mode 100644 server/src/main/java/com/wuhansaga/server/config/PortalSiteProperties.java
 create mode 100644 server/src/main/java/com/wuhansaga/server/config/PortalSiteResolver.java
 create mode 100644 server/src/main/java/com/wuhansaga/server/constant/SiteCodes.java
 create mode 100644 server/target/classes/com/wuhansaga/server/config/PortalSiteProperties.class
 create mode 100644 server/target/classes/com/wuhansaga/server/config/PortalSiteResolver.class
 create mode 100644 server/target/classes/com/wuhansaga/server/constant/SiteCodes.class

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/client/env.d.ts b/client/env.d.ts
index 323c78a6..65d697c5 100644
--- a/client/env.d.ts
+++ b/client/env.d.ts
@@ -1,5 +1,9 @@
 /// <reference types="vite/client" />
 
+interface ImportMetaEnv {
+  readonly VITE_PORTAL_SITE_CODE?: string
+}
+
 declare module '*.vue' {
   import type { DefineComponent } from 'vue'
   const component: DefineComponent<{}, {}, any>
diff --git a/client/src/api/index.ts b/client/src/api/index.ts
index c4d63a99..05554048 100644
--- a/client/src/api/index.ts
+++ b/client/src/api/index.ts
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { portalSiteQueryParams } from '@/config/portalSite'
 
 export const portalApi = {
   getCompanyInfo: () => request.get('/portal/company'),
@@ -17,9 +18,12 @@ export const portalApi = {
   getCaseCategories: () => request.get('/portal/case/category'),
   getCases: (params?: any) => request.get('/portal/case', { params }),
   getCaseById: (id: number) => request.get(`/portal/case/${id}`),
-  getNewsCategories: () => request.get('/portal/news/category'),
-  getNewsList: (params?: any) => request.get('/portal/news', { params }),
-  getNewsById: (id: number) => request.get(`/portal/news/${id}`),
+  getNewsCategories: () =>
+    request.get('/portal/news/category', { params: { ...portalSiteQueryParams() } }),
+  getNewsList: (params?: any) =>
+    request.get('/portal/news', { params: { ...portalSiteQueryParams(), ...params } }),
+  getNewsById: (id: number) =>
+    request.get(`/portal/news/${id}`, { params: { ...portalSiteQueryParams() } }),
 }
 
 export const adminApi = {
@@ -85,11 +89,12 @@ export const adminApi = {
   addCaseCategory: (data: any) => request.post('/admin/case/category', data),
   deleteCaseCategory: (id: number) => request.delete(`/admin/case/category/${id}`),
 
-  getNewsList: (params?: any) => request.get('/admin/news', { params }),
+  getNewsList: (params?: any) => request.get('/admin/news', { params: { ...params } }),
   addNews: (data: any) => request.post('/admin/news', data),
   updateNews: (data: any) => request.put('/admin/news', data),
   deleteNews: (id: number) => request.delete(`/admin/news/${id}`),
-  getNewsCategories: () => request.get('/admin/news/category'),
+  getNewsCategories: (params?: any) =>
+    request.get('/admin/news/category', { params: { ...params } }),
   addNewsCategory: (data: any) => request.post('/admin/news/category', data),
   deleteNewsCategory: (id: number) => request.delete(`/admin/news/category/${id}`),
 
diff --git a/client/src/config/portalSite.ts b/client/src/config/portalSite.ts
new file mode 100644
index 00000000..388a2c99
--- /dev/null
+++ b/client/src/config/portalSite.ts
@@ -0,0 +1,8 @@
+/** 前台新闻等接口按站点隔离；与后端 app.portal.allowed-site-codes 一致。不设则走后端默认 site-code。 */
+export function portalSiteQueryParams(): Record<string, string> {
+  const code = import.meta.env.VITE_PORTAL_SITE_CODE as string | undefined
+  if (code && String(code).trim() !== '') {
+    return { siteCode: String(code).trim().toLowerCase() }
+  }
+  return {}
+}
diff --git a/client/src/views/admin/NewsPage.vue b/client/src/views/admin/NewsPage.vue
index 2f5ac55b..d3d68eeb 100644
--- a/client/src/views/admin/NewsPage.vue
+++ b/client/src/views/admin/NewsPage.vue
@@ -2,10 +2,19 @@
   <div class="admin-crud-page">
     <div class="page-header">
       <h2>新闻管理</h2>
-      <el-button type="primary" @click="openDialog()">新增新闻</el-button>
+      <div class="page-header-filters">
+        <span style="margin-right:8px">站点</span>
+        <el-select v-model="filterSiteCode" placeholder="全部站点" clearable style="width:180px" @change="loadList">
+          <el-option label="全部站点" value="" />
+          <el-option label="主站 wuhansaga" value="wuhansaga" />
+          <el-option label="第二站点 saga-secondary" value="saga-secondary" />
+        </el-select>
+        <el-button type="primary" style="margin-left:12px" @click="openDialog()">新增新闻</el-button>
+      </div>
     </div>
     <el-table :data="list" border stripe v-loading="loading">
       <el-table-column prop="newsId" label="ID" width="80" />
+      <el-table-column prop="siteCode" label="站点" width="130" />
       <el-table-column label="封面" width="140">
         <template #default="{ row }">
           <el-image v-if="row.coverImage" :src="uploadPublicUrl(row.coverImage)" style="width:100px;height:50px;" fit="cover" />
@@ -31,7 +40,17 @@
       <el-form :model="form" label-width="120px">
         <el-form-item label="标题(中)"><el-input v-model="form.titleZh" /></el-form-item>
         <el-form-item label="标题(英)"><el-input v-model="form.titleEn" /></el-form-item>
-        <el-form-item label="分类ID"><el-input-number v-model="form.categoryId" :min="1" /></el-form-item>
+        <el-form-item label="站点">
+          <el-select v-model="form.siteCode" placeholder="请选择" style="width:100%" @change="onFormSiteChange">
+            <el-option label="主站 wuhansaga" value="wuhansaga" />
+            <el-option label="第二站点 saga-secondary" value="saga-secondary" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分类">
+          <el-select v-model="form.categoryId" placeholder="请选择分类" style="width:100%">
+            <el-option v-for="cat in categoryOptions" :key="cat.newsCategoryId" :label="cat.nameZh" :value="cat.newsCategoryId" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="摘要(中)"><el-input v-model="form.excerptZh" type="textarea" :rows="2" /></el-form-item>
         <el-form-item label="摘要(英)"><el-input v-model="form.excerptEn" type="textarea" :rows="2" /></el-form-item>
         <el-form-item label="内容(中)"><el-input v-model="form.contentZh" type="textarea" :rows="6" /></el-form-item>
@@ -59,14 +78,37 @@ import { uploadPublicUrl } from '@/utils/uploadUrl'
 const loading = ref(false)
 const saving = ref(false)
 const list = ref<any[]>([])
+const categoryOptions = ref<any[]>([])
+const filterSiteCode = ref('')
 const dialogVisible = ref(false)
 const editingId = ref<number | null>(null)
 const form = ref<any>({})
 
+async function loadCategoriesForForm() {
+  const site = form.value.siteCode
+  if (!site) {
+    categoryOptions.value = []
+    return
+  }
+  try {
+    const res = await adminApi.getNewsCategories({ siteCode: site })
+    categoryOptions.value = res.data ?? []
+  } catch {
+    categoryOptions.value = []
+  }
+}
+
+function onFormSiteChange() {
+  form.value.categoryId = undefined
+  loadCategoriesForForm()
+}
+
 async function loadList() {
   loading.value = true
   try {
-    const res = await adminApi.getNewsList()
+    const params: Record<string, string> = {}
+    if (filterSiteCode.value) params.siteCode = filterSiteCode.value
+    const res = await adminApi.getNewsList(params)
     list.value = res.data ?? []
   } catch {
     list.value = []
@@ -76,9 +118,16 @@ async function loadList() {
 }
 
 function openDialog(row?: any) {
-  if (row) { editingId.value = row.newsId; form.value = { ...row } }
-  else { editingId.value = null; form.value = { sortOrder: 0, isPublished: 0, isFeatured: 0, categoryId: 1 } }
+  if (row) {
+    editingId.value = row.newsId
+    form.value = { ...row }
+  } else {
+    editingId.value = null
+    const defaultSite = filterSiteCode.value || 'wuhansaga'
+    form.value = { sortOrder: 0, isPublished: 0, isFeatured: 0, siteCode: defaultSite, categoryId: undefined }
+  }
   dialogVisible.value = true
+  loadCategoriesForForm()
 }
 
 async function handleSave() {
@@ -100,5 +149,5 @@ onMounted(loadList)
 </script>
 
 <style scoped lang="less">
-.admin-crud-page { .page-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; h2 { font-size: 20px; color: @gray-800; } } }
+.admin-crud-page { .page-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; flex-wrap: wrap; gap: 12px; h2 { font-size: 20px; color: @gray-800; } .page-header-filters { display: flex; align-items: center; flex-wrap: wrap; } } }
 </style>
diff --git a/database/sql/migration_news_multisite.sql b/database/sql/migration_news_multisite.sql
new file mode 100644
index 00000000..6f278c11
--- /dev/null
+++ b/database/sql/migration_news_multisite.sql
@@ -0,0 +1,37 @@
+-- =============================================================================
+-- 新闻中心多站点：为 f_news / f_news_category 增加 site_code
+-- 执行前请备份数据库。可与 schema 增量部署，适合在 Gitea 发版后由运维一次性执行。
+-- 固定站点编码示例：wuhansaga（主站）、saga-secondary（第二站点，可按品牌改名）
+-- =============================================================================
+
+SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- 新闻分类：站点维度的栏目互相独立（不同站点可有各自一套分类及排序）
+ALTER TABLE f_news_category
+  ADD COLUMN site_code VARCHAR(32) NOT NULL DEFAULT 'wuhansaga'
+    COMMENT '站点编码：小写英文短码，如 wuhansaga、saga-secondary，扩展新站时仅增编码不改结构'
+    AFTER category_id;
+
+ALTER TABLE f_news_category
+  ADD KEY idx_f_news_category_site (site_code, del_flag, is_published, sort_order);
+
+-- 新闻正文：与分类 site_code 逻辑上一致；保存时业务侧校验 category 与 news 同属一站
+ALTER TABLE f_news
+  ADD COLUMN site_code VARCHAR(32) NOT NULL DEFAULT 'wuhansaga'
+    COMMENT '站点编码，与 f_news_category.site_code 取值域一致'
+    AFTER category_id;
+
+ALTER TABLE f_news
+  ADD KEY idx_f_news_site_list (site_code, del_flag, is_published, category_id),
+  ADD KEY idx_f_news_site_time (site_code, del_flag, is_published, create_time);
+
+-- 旧数据：全部归入主站（若第二站需相同栏目结构，可复制分类再批量改 site_code / 或导数据）
+UPDATE f_news_category SET site_code = 'wuhansaga' WHERE site_code = '' OR site_code IS NULL;
+UPDATE f_news SET site_code = 'wuhansaga' WHERE site_code = '' OR site_code IS NULL;
+
+-- ---------------------------------------------------------------------------
+-- 【可选】第二站点初始化分类骨架（与主站相同名称时仍需独立 category_id）
+-- ---------------------------------------------------------------------------
+-- INSERT INTO f_news_category (site_code, name_zh, name_en, sort_order, is_published)
+-- SELECT 'saga-secondary', name_zh, name_en, sort_order, is_published
+-- FROM f_news_category WHERE site_code = 'wuhansaga' AND del_flag = 0;
diff --git a/server/src/main/java/com/wuhansaga/server/WuhanSagaApplication.java b/server/src/main/java/com/wuhansaga/server/WuhanSagaApplication.java
index e056c6f0..94c211da 100644
--- a/server/src/main/java/com/wuhansaga/server/WuhanSagaApplication.java
+++ b/server/src/main/java/com/wuhansaga/server/WuhanSagaApplication.java
@@ -1,11 +1,14 @@
 package com.wuhansaga.server;
 
+import com.wuhansaga.server.config.PortalSiteProperties;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
 @SpringBootApplication
 @MapperScan("com.wuhansaga.server.mapper")
+@EnableConfigurationProperties(PortalSiteProperties.class)
 public class WuhanSagaApplication {
 
     public static void main(String[] args) {
diff --git a/server/src/main/java/com/wuhansaga/server/config/PortalSiteProperties.java b/server/src/main/java/com/wuhansaga/server/config/PortalSiteProperties.java
new file mode 100644
index 00000000..1307ce1a
--- /dev/null
+++ b/server/src/main/java/com/wuhansaga/server/config/PortalSiteProperties.java
@@ -0,0 +1,31 @@
+package com.wuhansaga.server.config;
+
+import com.wuhansaga.server.constant.SiteCodes;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+@ConfigurationProperties(prefix = "app.portal")
+public class PortalSiteProperties {
+
+    /**
+     * 本实例默认站点（单域名单部署时一般不设查询参数，仅用此值）
+     */
+    private String siteCode = SiteCodes.WUHAN_SAGA;
+
+    /**
+     * 逗号分隔允许列表；请求中的 siteCode 参数或 X-Portal-Site 头必须命中此值之一
+     */
+    private String allowedSiteCodes = SiteCodes.WUHAN_SAGA + "," + SiteCodes.SAGA_SECONDARY;
+
+    public List<String> allowedCodesList() {
+        return Arrays.stream(allowedSiteCodes.split(","))
+            .map(String::trim)
+            .filter(s -> !s.isEmpty())
+            .map(s -> s.toLowerCase())
+            .toList();
+    }
+}
diff --git a/server/src/main/java/com/wuhansaga/server/config/PortalSiteResolver.java b/server/src/main/java/com/wuhansaga/server/config/PortalSiteResolver.java
new file mode 100644
index 00000000..5135c526
--- /dev/null
+++ b/server/src/main/java/com/wuhansaga/server/config/PortalSiteResolver.java
@@ -0,0 +1,54 @@
+package com.wuhansaga.server.config;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 解析前台站点：优先级为 查询参数 siteCode &gt; 请求头 X-Portal-Site &gt; 配置文件 app.portal.site-code。
+ * 非法编码回退到默认站点并打 WARN，避免扫库枚举。
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class PortalSiteResolver {
+
+    private static final String HEADER_PORTAL_SITE = "X-Portal-Site";
+
+    private final PortalSiteProperties portalSiteProperties;
+
+    public String resolve(HttpServletRequest request) {
+        List<String> allowed = portalSiteProperties.allowedCodesList();
+        String candidate = firstNonBlank(
+            request.getParameter("siteCode"),
+            request.getHeader(HEADER_PORTAL_SITE)
+        );
+        if (StringUtils.hasText(candidate)) {
+            String normalized = candidate.trim().toLowerCase(Locale.ROOT);
+            if (allowed.contains(normalized)) {
+                return normalized;
+            }
+            log.warn("[portal] 无效站点编码 [{}]，将使用默认 [{}]", candidate, portalSiteProperties.getSiteCode());
+        }
+        String fallback = portalSiteProperties.getSiteCode().trim().toLowerCase(Locale.ROOT);
+        if (!allowed.contains(fallback)) {
+            log.warn("[portal] 默认站点 [{}] 不在 app.portal.allowed-site-codes 中，仍使用该值查询", fallback);
+        }
+        return fallback;
+    }
+
+    private static String firstNonBlank(String a, String b) {
+        if (StringUtils.hasText(a)) {
+            return a;
+        }
+        if (StringUtils.hasText(b)) {
+            return b;
+        }
+        return null;
+    }
+}
diff --git a/server/src/main/java/com/wuhansaga/server/constant/SiteCodes.java b/server/src/main/java/com/wuhansaga/server/constant/SiteCodes.java
new file mode 100644
index 00000000..964fd0ad
--- /dev/null
+++ b/server/src/main/java/com/wuhansaga/server/constant/SiteCodes.java
@@ -0,0 +1,15 @@
+package com.wuhansaga.server.constant;
+
+/**
+ * 站点编码常量：与库中 f_news.site_code / f_news_category.site_code 一致，扩展新站时在此与配置中同步增加。
+ */
+public final class SiteCodes {
+
+    private SiteCodes() {}
+
+    /** 武汉萨格主站 */
+    public static final String WUHAN_SAGA = "wuhansaga";
+
+    /** 第二站点（可按实际品牌改名，并同步改 application.yml 与库内数据） */
+    public static final String SAGA_SECONDARY = "saga-secondary";
+}
diff --git a/server/src/main/java/com/wuhansaga/server/controller/admin/AdminNewsController.java b/server/src/main/java/com/wuhansaga/server/controller/admin/AdminNewsController.java
index 946d08c5..97055dfe 100644
--- a/server/src/main/java/com/wuhansaga/server/controller/admin/AdminNewsController.java
+++ b/server/src/main/java/com/wuhansaga/server/controller/admin/AdminNewsController.java
@@ -21,11 +21,12 @@ public class AdminNewsController {
     private final NewsService newsService;
     private final NewsCategoryService newsCategoryService;
 
-    @Operation(summary = "新闻列表")
+    @Operation(summary = "新闻列表（可选 siteCode 过滤站点，不传则全部站点）")
     @GetMapping
     public R<List<News>> list(@RequestParam(required = false) Long categoryId,
-                               @RequestParam(required = false) Integer isFeatured) {
-        return R.ok(newsService.listPublished(categoryId, isFeatured));
+                               @RequestParam(required = false) Integer isFeatured,
+                               @RequestParam(required = false) String siteCode) {
+        return R.ok(newsService.listForAdmin(categoryId, isFeatured, null, siteCode));
     }
 
     @Operation(summary = "新闻详情")
@@ -55,10 +56,10 @@ public class AdminNewsController {
         return R.ok();
     }
 
-    @Operation(summary = "新闻分类列表")
+    @Operation(summary = "新闻分类列表（可选 siteCode 过滤）")
     @GetMapping("/category")
-    public R<List<NewsCategory>> listCategory() {
-        return R.ok(newsCategoryService.listAll());
+    public R<List<NewsCategory>> listCategory(@RequestParam(required = false) String siteCode) {
+        return R.ok(newsCategoryService.listAll(siteCode));
     }
 
     @Operation(summary = "新增新闻分类")
diff --git a/server/src/main/java/com/wuhansaga/server/controller/portal/PortalNewsController.java b/server/src/main/java/com/wuhansaga/server/controller/portal/PortalNewsController.java
index 73f83c34..d1be6292 100644
--- a/server/src/main/java/com/wuhansaga/server/controller/portal/PortalNewsController.java
+++ b/server/src/main/java/com/wuhansaga/server/controller/portal/PortalNewsController.java
@@ -1,12 +1,14 @@
 package com.wuhansaga.server.controller.portal;
 
 import com.wuhansaga.server.common.R;
+import com.wuhansaga.server.config.PortalSiteResolver;
 import com.wuhansaga.server.entity.News;
 import com.wuhansaga.server.entity.NewsCategory;
 import com.wuhansaga.server.service.NewsCategoryService;
 import com.wuhansaga.server.service.NewsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,23 +22,28 @@ public class PortalNewsController {
 
     private final NewsService newsService;
     private final NewsCategoryService newsCategoryService;
+    private final PortalSiteResolver portalSiteResolver;
 
-    @Operation(summary = "新闻分类列表")
+    @Operation(summary = "新闻分类列表（按站点隔离）")
     @GetMapping("/category")
-    public R<List<NewsCategory>> listCategory() {
-        return R.ok(newsCategoryService.listPublished());
+    public R<List<NewsCategory>> listCategory(HttpServletRequest request) {
+        String siteCode = portalSiteResolver.resolve(request);
+        return R.ok(newsCategoryService.listPublished(siteCode));
     }
 
-    @Operation(summary = "新闻列表")
+    @Operation(summary = "新闻列表（按站点隔离；可选 ?siteCode=、请求头 X-Portal-Site）")
     @GetMapping
-    public R<List<News>> list(@RequestParam(required = false) Long categoryId,
-                               @RequestParam(required = false) Integer isFeatured) {
-        return R.ok(newsService.listPublished(categoryId, isFeatured));
+    public R<List<News>> list(HttpServletRequest request,
+                              @RequestParam(required = false) Long categoryId,
+                              @RequestParam(required = false) Integer isFeatured) {
+        String siteCode = portalSiteResolver.resolve(request);
+        return R.ok(newsService.listPublished(categoryId, isFeatured, siteCode));
     }
 
-    @Operation(summary = "新闻详情")
+    @Operation(summary = "新闻详情（仅返回当前站点已发布稿件）")
     @GetMapping("/{id}")
-    public R<News> getById(@PathVariable Long id) {
-        return R.ok(newsService.getPublishedById(id));
+    public R<News> getById(HttpServletRequest request, @PathVariable Long id) {
+        String siteCode = portalSiteResolver.resolve(request);
+        return R.ok(newsService.getPublishedById(id, siteCode));
     }
 }
diff --git a/server/src/main/java/com/wuhansaga/server/entity/News.java b/server/src/main/java/com/wuhansaga/server/entity/News.java
index c35fdf8d..b3039479 100644
--- a/server/src/main/java/com/wuhansaga/server/entity/News.java
+++ b/server/src/main/java/com/wuhansaga/server/entity/News.java
@@ -9,6 +9,8 @@ public class News {
 
     private Long newsId;
     private Long categoryId;
+    /** 站点编码：与新闻分类 siteCode 一致 */
+    private String siteCode;
     private String titleZh;
     private String titleEn;
     private String excerptZh;
diff --git a/server/src/main/java/com/wuhansaga/server/entity/NewsCategory.java b/server/src/main/java/com/wuhansaga/server/entity/NewsCategory.java
index 5ca44d48..b918ddcb 100644
--- a/server/src/main/java/com/wuhansaga/server/entity/NewsCategory.java
+++ b/server/src/main/java/com/wuhansaga/server/entity/NewsCategory.java
@@ -8,6 +8,8 @@ import java.time.LocalDateTime;
 public class NewsCategory {
 
     private Long newsCategoryId;
+    /** 站点编码：同站新闻、分类共用一套取值域 */
+    private String siteCode;
     private String nameZh;
     private String nameEn;
     private Integer sortOrder;
diff --git a/server/src/main/java/com/wuhansaga/server/mapper/NewsCategoryMapper.java b/server/src/main/java/com/wuhansaga/server/mapper/NewsCategoryMapper.java
index 785c5cb9..5ee29550 100644
--- a/server/src/main/java/com/wuhansaga/server/mapper/NewsCategoryMapper.java
+++ b/server/src/main/java/com/wuhansaga/server/mapper/NewsCategoryMapper.java
@@ -2,13 +2,14 @@ package com.wuhansaga.server.mapper;
 
 import com.wuhansaga.server.entity.NewsCategory;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface NewsCategoryMapper {
 
-    List<NewsCategory> selectAll();
+    List<NewsCategory> selectAll(@Param("siteCode") String siteCode);
 
     NewsCategory selectById(Long id);
 
@@ -18,5 +19,5 @@ public interface NewsCategoryMapper {
 
     int deleteById(Long id);
 
-    List<NewsCategory> selectPublished();
+    List<NewsCategory> selectPublished(@Param("siteCode") String siteCode);
 }
diff --git a/server/src/main/java/com/wuhansaga/server/mapper/NewsMapper.java b/server/src/main/java/com/wuhansaga/server/mapper/NewsMapper.java
index 31c055c9..55dd5ceb 100644
--- a/server/src/main/java/com/wuhansaga/server/mapper/NewsMapper.java
+++ b/server/src/main/java/com/wuhansaga/server/mapper/NewsMapper.java
@@ -11,11 +11,15 @@ public interface NewsMapper {
 
     List<News> selectList(@Param("categoryId") Long categoryId,
                            @Param("isFeatured") Integer isFeatured,
-                           @Param("keyword") String keyword);
+                           @Param("keyword") String keyword,
+                           @Param("isPublished") Integer isPublished,
+                           @Param("siteCode") String siteCode);
 
     long selectCount(@Param("categoryId") Long categoryId,
                      @Param("isFeatured") Integer isFeatured,
-                     @Param("keyword") String keyword);
+                     @Param("keyword") String keyword,
+                     @Param("isPublished") Integer isPublished,
+                     @Param("siteCode") String siteCode);
 
     News selectById(Long id);
 
@@ -26,7 +30,10 @@ public interface NewsMapper {
     int deleteById(Long id);
 
     List<News> selectPublished(@Param("categoryId") Long categoryId,
-                                @Param("isFeatured") Integer isFeatured);
+                                @Param("isFeatured") Integer isFeatured,
+                                @Param("siteCode") String siteCode);
+
+    News selectPublishedById(@Param("id") Long id, @Param("siteCode") String siteCode);
 
     int incrementViewCount(Long id);
 }
diff --git a/server/src/main/java/com/wuhansaga/server/service/NewsCategoryService.java b/server/src/main/java/com/wuhansaga/server/service/NewsCategoryService.java
index 388c54e3..ee7cc805 100644
--- a/server/src/main/java/com/wuhansaga/server/service/NewsCategoryService.java
+++ b/server/src/main/java/com/wuhansaga/server/service/NewsCategoryService.java
@@ -1,9 +1,11 @@
 package com.wuhansaga.server.service;
 
+import com.wuhansaga.server.constant.SiteCodes;
 import com.wuhansaga.server.entity.NewsCategory;
 import com.wuhansaga.server.mapper.NewsCategoryMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -13,12 +15,13 @@ public class NewsCategoryService {
 
     private final NewsCategoryMapper newsCategoryMapper;
 
-    public List<NewsCategory> listAll() {
-        return newsCategoryMapper.selectAll();
+    /** siteCode 为空时不过滤站点（后台全量） */
+    public List<NewsCategory> listAll(String siteCode) {
+        return newsCategoryMapper.selectAll(siteCode);
     }
 
-    public List<NewsCategory> listPublished() {
-        return newsCategoryMapper.selectPublished();
+    public List<NewsCategory> listPublished(String siteCode) {
+        return newsCategoryMapper.selectPublished(siteCode);
     }
 
     public NewsCategory getById(Long id) {
@@ -26,11 +29,18 @@ public class NewsCategoryService {
     }
 
     public void add(NewsCategory entity) {
+        if (!StringUtils.hasText(entity.getSiteCode())) {
+            entity.setSiteCode(SiteCodes.WUHAN_SAGA);
+        }
+        entity.setSiteCode(entity.getSiteCode().trim().toLowerCase());
         entity.setIsPublished(1);
         newsCategoryMapper.insert(entity);
     }
 
     public void update(NewsCategory entity) {
+        if (StringUtils.hasText(entity.getSiteCode())) {
+            entity.setSiteCode(entity.getSiteCode().trim().toLowerCase());
+        }
         newsCategoryMapper.update(entity);
     }
 
diff --git a/server/src/main/java/com/wuhansaga/server/service/NewsService.java b/server/src/main/java/com/wuhansaga/server/service/NewsService.java
index 1cb6315f..34b7f682 100644
--- a/server/src/main/java/com/wuhansaga/server/service/NewsService.java
+++ b/server/src/main/java/com/wuhansaga/server/service/NewsService.java
@@ -2,10 +2,14 @@ package com.wuhansaga.server.service;
 
 import com.wuhansaga.server.common.PageQuery;
 import com.wuhansaga.server.common.PageResult;
+import com.wuhansaga.server.constant.SiteCodes;
 import com.wuhansaga.server.entity.News;
+import com.wuhansaga.server.entity.NewsCategory;
+import com.wuhansaga.server.mapper.NewsCategoryMapper;
 import com.wuhansaga.server.mapper.NewsMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -14,40 +18,75 @@ import java.util.List;
 public class NewsService {
 
     private final NewsMapper newsMapper;
+    private final NewsCategoryMapper newsCategoryMapper;
 
     public PageResult<News> page(Long categoryId, Integer isFeatured, String keyword, PageQuery query) {
-        List<News> records = newsMapper.selectList(categoryId, isFeatured, keyword);
+        List<News> records = newsMapper.selectList(categoryId, isFeatured, keyword, null, null);
         return new PageResult<>(records, records.size(), query.getPage(), query.getSize());
     }
 
-    public List<News> listPublished(Long categoryId, Integer isFeatured) {
-        return newsMapper.selectPublished(categoryId, isFeatured);
+    public List<News> listPublished(Long categoryId, Integer isFeatured, String siteCode) {
+        return newsMapper.selectPublished(categoryId, isFeatured, siteCode);
+    }
+
+    /** 后台列表：siteCode 为空则跨站点查询 */
+    public List<News> listForAdmin(Long categoryId, Integer isFeatured, String keyword, String siteCode) {
+        return newsMapper.selectList(categoryId, isFeatured, keyword, null, siteCode);
     }
 
     public News getById(Long id) {
         return newsMapper.selectById(id);
     }
 
-    public News getPublishedById(Long id) {
-        News news = newsMapper.selectById(id);
-        if (news != null && news.getIsPublished() == 1) {
+    public News getPublishedById(Long id, String siteCode) {
+        News news = newsMapper.selectPublishedById(id, siteCode);
+        if (news != null) {
             newsMapper.incrementViewCount(id);
-            return news;
         }
-        return null;
+        return news;
     }
 
     public void add(News entity) {
+        if (!StringUtils.hasText(entity.getSiteCode())) {
+            entity.setSiteCode(SiteCodes.WUHAN_SAGA);
+        }
+        entity.setSiteCode(entity.getSiteCode().trim().toLowerCase());
+        ensureNewsCategorySite(entity);
         entity.setIsPublished(1);
         entity.setViewCount(0);
         newsMapper.insert(entity);
     }
 
     public void update(News entity) {
+        if (StringUtils.hasText(entity.getSiteCode())) {
+            entity.setSiteCode(entity.getSiteCode().trim().toLowerCase());
+        }
+        News existing = entity.getNewsId() != null ? newsMapper.selectById(entity.getNewsId()) : null;
+        Long categoryId = entity.getCategoryId() != null ? entity.getCategoryId() : (existing != null ? existing.getCategoryId() : null);
+        String siteCode = StringUtils.hasText(entity.getSiteCode())
+            ? entity.getSiteCode()
+            : (existing != null ? existing.getSiteCode() : null);
+        News probe = new News();
+        probe.setCategoryId(categoryId);
+        probe.setSiteCode(siteCode);
+        ensureNewsCategorySite(probe);
         newsMapper.update(entity);
     }
 
     public void delete(Long id) {
         newsMapper.deleteById(id);
     }
+
+    private void ensureNewsCategorySite(News entity) {
+        if (!StringUtils.hasText(entity.getSiteCode()) || entity.getCategoryId() == null) {
+            return;
+        }
+        NewsCategory cat = newsCategoryMapper.selectById(entity.getCategoryId());
+        if (cat == null) {
+            throw new IllegalArgumentException("新闻分类不存在");
+        }
+        if (!entity.getSiteCode().equals(cat.getSiteCode())) {
+            throw new IllegalArgumentException("新闻站点与分类站点不一致");
+        }
+    }
 }
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index c5ca9bbf..838b6190 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -60,3 +60,9 @@ upload:
   path: uploads/
   allowed-types: image/jpeg,image/png,image/gif,image/webp,image/svg+xml,video/mp4,video/webm
   max-size: 52428800
+
+# 新闻中心多站点：单部署实例默认站点；扩展编码时改 allowed-site-codes 与库内数据
+app:
+  portal:
+    site-code: wuhansaga
+    allowed-site-codes: wuhansaga,saga-secondary
diff --git a/server/src/main/resources/data.sql b/server/src/main/resources/data.sql
index c1cdc715..3bc6b3d6 100644
--- a/server/src/main/resources/data.sql
+++ b/server/src/main/resources/data.sql
@@ -106,30 +106,31 @@ ON DUPLICATE KEY UPDATE
 -- ================================================================
 -- 新闻分类
 -- ================================================================
-INSERT INTO f_news_category (name_zh, name_en, sort_order) VALUES
-  ('公司新闻', 'Company News', 10),
-  ('行业动态', 'Industry News', 20),
-  ('技术文章', 'Technical Articles', 30)
+INSERT INTO f_news_category (site_code, name_zh, name_en, sort_order) VALUES
+  ('wuhansaga', '公司新闻', 'Company News', 10),
+  ('wuhansaga', '行业动态', 'Industry News', 20),
+  ('wuhansaga', '技术文章', 'Technical Articles', 30)
 ON DUPLICATE KEY UPDATE 
+  site_code = VALUES(site_code),
   name_zh = VALUES(name_zh), name_en = VALUES(name_en), sort_order = VALUES(sort_order);
 
 -- ================================================================
 -- 新闻文章（示例；生产环境可替换为正式稿件）
 -- ================================================================
-INSERT INTO f_news (category_id, title_zh, title_en, excerpt_zh, excerpt_en, content_zh, content_en, is_featured, is_published, sort_order) VALUES
-  (1, '武汉萨格官网更新上线', 'Wuhan Saga Website Refresh',
+INSERT INTO f_news (category_id, site_code, title_zh, title_en, excerpt_zh, excerpt_en, content_zh, content_en, is_featured, is_published, sort_order) VALUES
+  (1, 'wuhansaga', '武汉萨格官网更新上线', 'Wuhan Saga Website Refresh',
    '集中展示连续板带处理产线、单体设备及工程案例。',
    'Highlighting strip processing lines, equipment and engineering cases.',
    '<p>武汉萨格工程技术有限公司官网已升级，客户可通过产品中心了解热镀锌、退火、酸洗及感应加热等成套装备与单体设备，并查阅成功案例与新闻资讯。</p>',
    '<p>Wuhan Saga Engineering has refreshed its website for strip galvanizing, annealing, pickling, induction heating solutions, case studies and news.</p>',
    1, 1, 10),
-  (2, '板带处理装备市场观察', 'Strip Processing Equipment Market Notes',
+  (2, 'wuhansaga', '板带处理装备市场观察', 'Strip Processing Equipment Market Notes',
    '节能与智能化连续处理机组需求持续增长。',
    'Growing demand for energy-efficient intelligent continuous lines.',
    '<p>国内外钢铁及加工企业持续投资连续镀锌、退火与酸洗机组。武汉萨格团队在设计与改造项目中注重节能环保与自动化控制。</p>',
    '<p>Steel and processing firms continue to invest in continuous galvanizing, annealing and pickling lines with emphasis on energy saving and automation.</p>',
    0, 1, 20),
-  (3, '感应加热在涂层干燥中的应用', 'Induction Heating in Coating Drying',
+  (3, 'wuhansaga', '感应加热在涂层干燥中的应用', 'Induction Heating in Coating Drying',
    '非接触加热可提高涂层烘干效率并降低能耗。',
    'Non-contact heating can improve drying efficiency and save energy.',
    '<p>感应加热适用于涂层干燥等工艺环节，可与产线控制深度集成，实现分区温控与节能运行。</p>',
diff --git a/server/src/main/resources/mapper/NewsCategoryMapper.xml b/server/src/main/resources/mapper/NewsCategoryMapper.xml
index 125430ff..57bb83bb 100644
--- a/server/src/main/resources/mapper/NewsCategoryMapper.xml
+++ b/server/src/main/resources/mapper/NewsCategoryMapper.xml
@@ -7,11 +7,15 @@
     </resultMap>
 
     <select id="selectAll" resultMap="newsCategoryResult">
-        SELECT * FROM f_news_category WHERE del_flag = 0 ORDER BY sort_order ASC
+        SELECT * FROM f_news_category WHERE del_flag = 0
+        <if test="siteCode != null and siteCode != ''">AND site_code = #{siteCode}</if>
+        ORDER BY sort_order ASC
     </select>
 
     <select id="selectPublished" resultMap="newsCategoryResult">
-        SELECT * FROM f_news_category WHERE del_flag = 0 AND is_published = 1 ORDER BY sort_order ASC
+        SELECT * FROM f_news_category WHERE del_flag = 0 AND is_published = 1
+        <if test="siteCode != null and siteCode != ''">AND site_code = #{siteCode}</if>
+        ORDER BY sort_order ASC
     </select>
 
     <select id="selectById" resultMap="newsCategoryResult">
@@ -19,13 +23,14 @@
     </select>
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="newsCategoryId" keyColumn="category_id">
-        INSERT INTO f_news_category (name_zh, name_en, sort_order, is_published, create_by, remark)
-        VALUES (#{nameZh}, #{nameEn}, #{sortOrder}, #{isPublished}, #{createBy}, #{remark})
+        INSERT INTO f_news_category (site_code, name_zh, name_en, sort_order, is_published, create_by, remark)
+        VALUES (#{siteCode}, #{nameZh}, #{nameEn}, #{sortOrder}, #{isPublished}, #{createBy}, #{remark})
     </insert>
 
     <update id="update" parameterType="com.wuhansaga.server.entity.NewsCategory">
         UPDATE f_news_category
         <set>
+            <if test="siteCode != null">site_code = #{siteCode},</if>
             <if test="nameZh != null">name_zh = #{nameZh},</if>
             <if test="nameEn != null">name_en = #{nameEn},</if>
             <if test="sortOrder != null">sort_order = #{sortOrder},</if>
diff --git a/server/src/main/resources/mapper/NewsMapper.xml b/server/src/main/resources/mapper/NewsMapper.xml
index 065a5653..3927f612 100644
--- a/server/src/main/resources/mapper/NewsMapper.xml
+++ b/server/src/main/resources/mapper/NewsMapper.xml
@@ -5,6 +5,7 @@
     <resultMap id="newsResult" type="com.wuhansaga.server.entity.News">
         <id property="newsId" column="news_id"/>
         <result property="categoryId" column="category_id"/>
+        <result property="siteCode" column="site_code"/>
         <result property="titleZh" column="title_zh"/>
         <result property="titleEn" column="title_en"/>
         <result property="excerptZh" column="excerpt_zh"/>
@@ -12,11 +13,21 @@
         <result property="contentZh" column="content_zh"/>
         <result property="contentEn" column="content_en"/>
         <result property="coverImage" column="cover_image"/>
+        <result property="metaTitleZh" column="meta_title_zh"/>
+        <result property="metaTitleEn" column="meta_title_en"/>
+        <result property="metaDescriptionZh" column="meta_description_zh"/>
+        <result property="metaDescriptionEn" column="meta_description_en"/>
+        <result property="metaKeywords" column="meta_keywords"/>
         <result property="isFeatured" column="is_featured"/>
         <result property="isPublished" column="is_published"/>
         <result property="viewCount" column="view_count"/>
         <result property="sortOrder" column="sort_order"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
         <result property="categoryNameZh" column="category_name_zh"/>
         <result property="categoryNameEn" column="category_name_en"/>
     </resultMap>
@@ -26,8 +37,10 @@
         FROM f_news n
         LEFT JOIN f_news_category nc ON n.category_id = nc.category_id
         WHERE n.del_flag = 0
+        <if test="siteCode != null and siteCode != ''">AND n.site_code = #{siteCode}</if>
         <if test="categoryId != null">AND n.category_id = #{categoryId}</if>
         <if test="isFeatured != null">AND n.is_featured = #{isFeatured}</if>
+        <if test="isPublished != null">AND n.is_published = #{isPublished}</if>
         <if test="keyword != null and keyword != ''">
             AND (n.title_zh LIKE CONCAT('%',#{keyword},'%') OR n.title_en LIKE CONCAT('%',#{keyword},'%'))
         </if>
@@ -35,11 +48,14 @@
     </select>
 
     <select id="selectCount" resultType="long">
-        SELECT COUNT(*) FROM f_news WHERE del_flag = 0
-        <if test="categoryId != null">AND category_id = #{categoryId}</if>
-        <if test="isFeatured != null">AND is_featured = #{isFeatured}</if>
+        SELECT COUNT(*) FROM f_news n
+        WHERE n.del_flag = 0
+        <if test="siteCode != null and siteCode != ''">AND n.site_code = #{siteCode}</if>
+        <if test="categoryId != null">AND n.category_id = #{categoryId}</if>
+        <if test="isFeatured != null">AND n.is_featured = #{isFeatured}</if>
+        <if test="isPublished != null">AND n.is_published = #{isPublished}</if>
         <if test="keyword != null and keyword != ''">
-            AND (title_zh LIKE CONCAT('%',#{keyword},'%') OR title_en LIKE CONCAT('%',#{keyword},'%'))
+            AND (n.title_zh LIKE CONCAT('%',#{keyword},'%') OR n.title_en LIKE CONCAT('%',#{keyword},'%'))
         </if>
     </select>
 
@@ -48,6 +64,7 @@
         FROM f_news n
         LEFT JOIN f_news_category nc ON n.category_id = nc.category_id
         WHERE n.del_flag = 0 AND n.is_published = 1
+          AND n.site_code = #{siteCode}
         <if test="categoryId != null">AND n.category_id = #{categoryId}</if>
         <if test="isFeatured != null">AND n.is_featured = #{isFeatured}</if>
         ORDER BY n.sort_order ASC, n.create_time DESC
@@ -60,11 +77,19 @@
         WHERE n.news_id = #{id} AND n.del_flag = 0
     </select>
 
+    <select id="selectPublishedById" resultMap="newsResult">
+        SELECT n.*, nc.name_zh AS category_name_zh, nc.name_en AS category_name_en
+        FROM f_news n
+        LEFT JOIN f_news_category nc ON n.category_id = nc.category_id
+        WHERE n.news_id = #{id} AND n.del_flag = 0 AND n.is_published = 1
+          AND n.site_code = #{siteCode}
+    </select>
+
     <insert id="insert" useGeneratedKeys="true" keyProperty="newsId">
-        INSERT INTO f_news (category_id, title_zh, title_en, excerpt_zh, excerpt_en, content_zh, content_en,
+        INSERT INTO f_news (category_id, site_code, title_zh, title_en, excerpt_zh, excerpt_en, content_zh, content_en,
                             cover_image, meta_title_zh, meta_title_en, meta_description_zh, meta_description_en,
                             meta_keywords, is_featured, is_published, sort_order, create_by, remark)
-        VALUES (#{categoryId}, #{titleZh}, #{titleEn}, #{excerptZh}, #{excerptEn}, #{contentZh}, #{contentEn},
+        VALUES (#{categoryId}, #{siteCode}, #{titleZh}, #{titleEn}, #{excerptZh}, #{excerptEn}, #{contentZh}, #{contentEn},
                 #{coverImage}, #{metaTitleZh}, #{metaTitleEn}, #{metaDescriptionZh}, #{metaDescriptionEn},
                 #{metaKeywords}, #{isFeatured}, #{isPublished}, #{sortOrder}, #{createBy}, #{remark})
     </insert>
@@ -73,6 +98,7 @@
         UPDATE f_news
         <set>
             <if test="categoryId != null">category_id = #{categoryId},</if>
+            <if test="siteCode != null">site_code = #{siteCode},</if>
             <if test="titleZh != null">title_zh = #{titleZh},</if>
             <if test="titleEn != null">title_en = #{titleEn},</if>
             <if test="excerptZh != null">excerpt_zh = #{excerptZh},</if>
@@ -80,6 +106,11 @@
             <if test="contentZh != null">content_zh = #{contentZh},</if>
             <if test="contentEn != null">content_en = #{contentEn},</if>
             <if test="coverImage != null">cover_image = #{coverImage},</if>
+            <if test="metaTitleZh != null">meta_title_zh = #{metaTitleZh},</if>
+            <if test="metaTitleEn != null">meta_title_en = #{metaTitleEn},</if>
+            <if test="metaDescriptionZh != null">meta_description_zh = #{metaDescriptionZh},</if>
+            <if test="metaDescriptionEn != null">meta_description_en = #{metaDescriptionEn},</if>
+            <if test="metaKeywords != null">meta_keywords = #{metaKeywords},</if>
             <if test="isFeatured != null">is_featured = #{isFeatured},</if>
             <if test="isPublished != null">is_published = #{isPublished},</if>
             <if test="sortOrder != null">sort_order = #{sortOrder},</if>
diff --git a/server/src/main/resources/schema.sql b/server/src/main/resources/schema.sql
index cd9ab816..3dd85322 100644
--- a/server/src/main/resources/schema.sql
+++ b/server/src/main/resources/schema.sql
@@ -380,6 +380,7 @@ CREATE TABLE IF NOT EXISTS f_case_study (
 -- ================================================================
 CREATE TABLE IF NOT EXISTS f_news_category (
   category_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
+  site_code VARCHAR(32) NOT NULL DEFAULT 'wuhansaga' COMMENT '站点编码：小写英文短码，与 f_news.site_code 取值域一致',
   name_zh VARCHAR(100) NOT NULL COMMENT '分类名称（中文）',
   name_en VARCHAR(100) NOT NULL COMMENT '分类名称（英文）',
   sort_order INT NOT NULL DEFAULT 0 COMMENT '排序',
@@ -390,7 +391,8 @@ CREATE TABLE IF NOT EXISTS f_news_category (
   update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   remark VARCHAR(500) DEFAULT NULL COMMENT '备注',
   del_flag TINYINT(1) NOT NULL DEFAULT 0 COMMENT '删除标志：0正常 1删除',
-  PRIMARY KEY (category_id)
+  PRIMARY KEY (category_id),
+  KEY idx_f_news_category_site (site_code, del_flag, is_published, sort_order)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='新闻分类';
 
 -- ================================================================
@@ -399,6 +401,7 @@ CREATE TABLE IF NOT EXISTS f_news_category (
 CREATE TABLE IF NOT EXISTS f_news (
   news_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
   category_id BIGINT NOT NULL COMMENT '所属分类',
+  site_code VARCHAR(32) NOT NULL DEFAULT 'wuhansaga' COMMENT '站点编码：与分类 site_code 一致，用于多站点数据隔离',
   title_zh VARCHAR(200) NOT NULL COMMENT '标题（中文）',
   title_en VARCHAR(200) NOT NULL COMMENT '标题（英文）',
   excerpt_zh TEXT COMMENT '摘要（中文）',
@@ -422,6 +425,8 @@ CREATE TABLE IF NOT EXISTS f_news (
   remark VARCHAR(500) DEFAULT NULL COMMENT '备注',
   del_flag TINYINT(1) NOT NULL DEFAULT 0 COMMENT '删除标志：0正常 1删除',
   PRIMARY KEY (news_id),
+  KEY idx_f_news_site_list (site_code, del_flag, is_published, category_id),
+  KEY idx_f_news_site_time (site_code, del_flag, is_published, create_time),
   KEY idx_f_news_category (category_id),
   KEY idx_f_news_create_time (create_time)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='新闻文章';
diff --git a/server/target/classes/application.yml b/server/target/classes/application.yml
index c5ca9bbf..838b6190 100644
--- a/server/target/classes/application.yml
+++ b/server/target/classes/application.yml
@@ -60,3 +60,9 @@ upload:
   path: uploads/
   allowed-types: image/jpeg,image/png,image/gif,image/webp,image/svg+xml,video/mp4,video/webm
   max-size: 52428800
+
+# 新闻中心多站点：单部署实例默认站点；扩展编码时改 allowed-site-codes 与库内数据
+app:
+  portal:
+    site-code: wuhansaga
+    allowed-site-codes: wuhansaga,saga-secondary
diff --git a/server/target/classes/com/wuhansaga/server/WuhanSagaApplication.class b/server/target/classes/com/wuhansaga/server/WuhanSagaApplication.class
index a23e582621fb714208cd30631258d2c67cc1aeeb..67441d3df97f3d151303e79ad072dfac792f7be8 100644
GIT binary patch
delta 194
zcmcc2_K02J)W2Q(7#J9A8I;%=m>3x}Coa_7Xqmti$jIRBlV6msUtCa>nU|hcl$e`Z
zo?n!$pOl|pqMw|fSCU#$qF+#yUyxc<l9^hp@0ypGl#}Y5pO==IURsn`l9`_u0GG99
zWH6ezKuiXx4=Al4kY7}im=l~?l8U5c@=PW(MxMzRnCw~k8Q2*FCW|oZ$jdP>Gspm)
XC(FRdAQ#QRSj-^Lpa5kjGbjQ8D_uG}

delta 68
zcmaFFewj_+)W2Q(7#J9A85GzVm>3x}Coa_7Xqmt?S%%q+k#lk|vpp*h13Lrn<mt>h
X!a@v83^G8)vJ8w2a?uQo#SHQQPjwAX

diff --git a/server/target/classes/com/wuhansaga/server/common/BizException.class b/server/target/classes/com/wuhansaga/server/common/BizException.class
index 1b5464898bec18709b46880ba2a396e7ab38adb7..b5c17f4a18b2fef6b05e51d99cdcaa5f16785dcb 100644
GIT binary patch
delta 230
zcmXYqI|{;J5QOJX{Ec~muNY9oHbh0mM)1+3vb6I6TG(ili-a6N>@5|+!UNdZdJb!G
z7HoEAcfXxI>5~qh-}?i=98CuXObZ1M8pUkdaf`FvewQv3f+!!Udf7$^wgtz73r``+
zUQxF8bs;%yw%PGLE-?U5tlZO?^o(Nfvs+SS@5kL6R9sP?E3EvilD0<hXI4~`j2ria
mX$j#O!-?c6nWKstnL52KZ@_`PY#?NnHv_7mI==8YHTpkHQyd=v

delta 238
zcmXYqzYf7*6vfZ|+Nx5Czikk)HboGN0gI`lXTV@#@gj`}5WA5`3?9H{^&Dn#Zesb)
zx##=cdrr>DDL%jV2Y@LWE{q^bUy<d)PQ!L!FL$f8KoUV_ve|C-GeIpn3?-=BbAIJu
zA@9RQ)`Otn!$BrJzDL3wOpFF}7Cj-(9;bwAsD-$5LoP1K=L-LDmU+uX?awTzdLtiq
nm1!#Bo55J`iRLJyLZ(XZX$=@?Wq^>c*7T{0I`M_ed(-;?s3{!k

diff --git a/server/target/classes/com/wuhansaga/server/common/PageQuery.class b/server/target/classes/com/wuhansaga/server/common/PageQuery.class
index 3d9324ca1ba09ec01c04b8c0a4eb823e214d92f4..63067bec4e3208987c9e135044957d68bfe8efdd 100644
GIT binary patch
literal 2144
zcma)8-%lJ>6#nk+4g=d|SrDjDY(c5rU68G{+SY|?!P2rWEtUooeetr~vQu_vaAp?M
zCMG7n_~M%n>L1_}CN;5|^ug$>f0HqOXJ-lvY#K>s?yqyd^PTUUGt1xqKKlc}0`Bx7
zfuxO81{Qi0&eyzV>5EofyMf-;rNH=m#xHTR>A9sfy=^{f8UK+&YL{~bRgwF>8T85J
zRNy=|X`DjFMt=rb3@GFt>OEa*Xm`7Gck`jCg$h0Mj_ZWi6_WYFhD93kmrfJtr3{8K
zqR?B@?#<6zx}h+VuO3Gz7d{c=(;2*sF$H_ugu<+iSCNx58B9DsStq3-;-Agn93~Y`
zH}#HL^4yvZKX$@8XF;glFi;rHS1N@LXX~NwxZ7nLuPO|;IXGTv-T01fIFI#agAV)X
z`tE}VfnijsC2xyc169X0cUsL&<KK^rhN@moH#Rgc@>0B+3hNGiUa0;ry~_$`?zP;|
zX_^&x&j}m?-Edtm)S<%w6o#q|ues^%lx`W<_&PLOyke7ABupw_DQqwot0t^_TWi|a
zO%ocQ7sW;-Vpfa@&MoB$-U-naEHA7ZU!i|J)U};ey&K2UTh{@Fl<1k!6&kMHTUotH
zB+h$$6SNxC$C{2x#+sHYVU9yDQkd%IyXdZvUiVsl%`7`2bygy27vG#vV=#-J7Y3oP
zccZ9+fgapQV-ZU>K9FRS!1Q4hj=SgWm{R02%Kx&ig`O1i_nkEs8%ChFwY$|Y!F1L0
zc3QjT4prjn=-4@O@&2P-)5ZML4*RGb%AKLd5KFqzSa(8G?!_&Iv4hC-qTqs>ofHKZ
zR6!xL;xgY$4IKm~uu)+Hp9r~IBsQuFXJ2f}+(ltyiam7-sy!y;JHdWRNXtv#a{o1q
z@jcDeJ4kT`WQxB+r48S<^K;w!Jl{R-vn*a0i^vWakmri|#Q-q{V+qOj*<kT^q>JgN
zP{m>7p2GfxhY1K!mL>qdT6Et>YKMS>F<^n`;;zV1$#)_KFL4xtmJmG7EZqTQbp_&Q
zr3;XK9H^5~cc2-}G6o6vU5*k>Pw^Z>J&Z9D%WhK|rBjI~5=&;11cf&w61Em{I2!O=
zclZtoUkop~J%H~!0bjyM%>G;EK-e$L6n}!1+MoFgi63Dl_h<e@Vs*Co8;06TPDW?>
zeD{MKay8D?c(h9G6Cl}6Y$vP92>2lA1zg0NWHrKyxx^=dw|I}gTXye1$l6Hs_dgfp
z;xWc4`B{k>Un7L5X$e*F9F<h3=Sc47iK8j~iRW1EOUKX^F5_*&NH)KsvCVNVSDsHT
zNYslHxpI9fH~Hn%*WY|5JL6X@*&4ODH)_e|M0XmOiAAJXfFx$vUROxNVzRGtmSFWy
z;~G<y#48wNB}rWzErc@WV`f+5*31eiq4A8D@T98%QFCUyv_O*oGl*o@@gB!svU#7+
QGH!DvpMn*9h*gaJ2eP(-yZ`_I

literal 2148
zcma)6T~ixX7=BKYWkXm(K%k<u1r2QykoZyim8Mz{C>UC7Iyj>@9>OWvlI-H{28Yf#
z<BT`nc;|)s1H8hSI%9RF7mnWgn;ggI?4}_?w2;~5J@3BzywCG~?4N%>{S81FcTB_t
zW@>J;_*tti9bfLqqOZJt<rV2{x=wLJ?x+u1$~!QT5Xd}~`?A=O&Q9^})<abbO!Nti
zhF;q(R+VSVhW$uxHIzVNkM9bIHJZNth-Uwe3hq95;Hy9&p3Cb8i|)4Shd|nbiKMnN
z7W$DC7^>Kgy3=ZIDery+I8t$Ivau<dgbCWtL{PVVfs2(>sVE7UB%xIaynL_a1a?!c
zI{UV76Y`ehxPc68*CFCarQtTW+}+}ea+D_nwcUQX8fr1AB7#Ze*7BR=y{>|~yS*Vj
z*;Ik@2%%%5=sxvnOE%~l%T<oou$2EOMcq>trg2UnS(DC^j@HgsEsSA6TQe43!~o0b
zYHBAi1PnK*D^Fms8pzu2y4-6QC|Q?&U6(nm`6>f9?yasb5s7x6r~Fof?J%-Yw~TDm
zs$}3+1J8DL*xp>eD_`U-jc|Z2S$G?l1<o|(u3B`RnhZX)1Lku4Kso`{j_20adc4fM
zH*CiaZibXLQ;6fbg)6vf5LN%B1X5ME<<-=(tw$-XD;<vEyjIR)FSu^t2cF!Es_v(7
z3yUTe1hPl9v7LQ)R}~}55y53y3taC&Gk;Iu+wN|(qa(oE(%Eh(KU;C#-PT^|WC6N7
z|9bKM!Jg_7{&81)v^u5k!n7e4WusBG163O8!@EhW2uyU8=X8V0Vs1(|s4VgV)~dtF
zTx>|+SH20Z)65C&z0{bf2%P)>P_`(N&Y@(Nco~TC$0cQdVtPe&pXg6vfOm_h%Sg}y
ztisP2Oex-n>>tDEVcz?~XKCokv7$J<fKi^f6~u^Pyd8BWi~x%CX*@&Y9S1VIfQ$|h
zSL8WBL#G3pz)MtpoY8gq;+kdQ{1XiRL@S0PZ4sq$`n1|eo3?b#__fhW_)S2Dhso!|
z51kfXx1s~zAHtu-xgPAlW`8vM@@(M;7>UE#KOnw`5kH*$9b$d1@C(j|M;fop@%rXF
z{g9_DPub{{I3z&)gy^XVxFfoZ3%E#DW61G0%97;yo(029{)My&F*x|FAQ#9up+9{+
z7+)iVuBM@>>dgOD?q?IgQ0CK_+vU!M^(bJLuO9E_7h!LJ`Aq3XqO4UfOlC^;>FLbW
z=U;yHiS}f#7}_;%j2ms|WN#Xmn3zcI0>qhb4zH1hLE-bXV%(D~Cpt-$XIZ}2X&HR}
z2Hxz!>}q?H(wdZ}@f2?Xk9!s%+NE@71^5~5fw;oFdY6U^zv5aU#px}KqVxn^Q#Qh+
r;Cv=XwV!*Gp?$Qh!yRemkj72C!~c5nmUu1WHc$F<u!{Gwj){K&imH7M

diff --git a/server/target/classes/com/wuhansaga/server/common/PageResult.class b/server/target/classes/com/wuhansaga/server/common/PageResult.class
index a05ecffb43de125b4532e8078e5782bbdb1507b3..76bc18a9bb599fa893a93bd574a570c3e1722569 100644
GIT binary patch
literal 4024
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
X=MG1MdUyG_3=tR<h4<m3iK+hsw-vOn

literal 4112
zcmbVPT~iz96@C`&Y6UC?e;|k0jv>Yl2s>&%S`rIrF~I~ZY!|50CTZ(MY+#MFOSCIe
z+wE0v@&kI&_6H<4PN$g(P9_(b<R+fUZ)%e~=Y1EnNFHD;vD$Oa`|kOC&Uu#~e*F3y
z0F(HujSd5sDq*eoQDegmB6r;_MqYi}s~0J(g+cMQyY4M{QKK5$Fb(wGbGO}M)eY8*
zw^r|Y6-u)PPARD$7MH!c?^gW>?rPODVAs7$SYM0ySXu38#D29{_M^CDpmW(@58Sv>
z=f?h)<%yM*(iHbtaTvQ*1IB^@bBmtv7Wof&vxKAK?1Ufq@sxqg$mkue&V*}T7cw~I
zpby6l^p^d=yV<C%di53U)QNIfajSP+I!Y%Kp&4)Z)HYH+S}N#Te!rUgTf3^R98t$^
zjQNq4;7bb&3lhtj)&>29TJ3~^7aZ8g2{q`T8;(#fI_S~Vu!Ccoy5yi24r{RJ#T((;
zZMW{$yx6NV-mY~oUfQkEiILG(PYj%H6YlzbW~mXxe$AT?w*AOwDyM^h)r$Qvpym_h
zYFJwhH;Z##;MLvOTVu|0G`FHF%5t%$HU$DOO)aa+$|jMCdr`{0ldb6}Ns^vxm1_57
zDaWT1Yvzc`s7*;?j#OeUk<nb%`>^3wN%SX5Q!p=$zT3t8PCA%^L{f2sS=lYZ-#EB}
zmxa3Kps1<09Q;C4*B!i~ska@BU{uh#;NYsLF+#~yYfEv#3gZp0Zom;-4)3*5j}kZe
zv7=(GAl=ln9J`gxMRzL!eQv{zHl$%x_sol9zjLsJW!k^JG`~1Y2j`iVx@vzC!$~_@
z!_s}+HLRO4t9T|Z*K{oxhs$x@57s#yb}^*#simbZxTx4z-8WM7nu9e6B(~jZ!@KnX
z2h`K*kxE;l@&sqvx`Pe)#BI&p^k%}K;>PdzF{2Ek*bQR(SV${No@7rgB;Zf`NCYm2
zje5nq?#npq73}C)__EZ@z|_Rb)s!E4B9^AwMOxA_AX$>WYhf5iaoye0%^7te#D_Mv
z3=B76;RoB{rdQO?>Y%Q>l{l>5muLx-f2Lzfc58)iyTMx3i-yZ#xY^h$r94YQPf7MY
zxWb9{l<n`O_9x+{6PKu%ajVs3KlVz!Sp+#W42(B(H<G}4(zraR040O~O6~%vT|SyL
zM%e=M0Vl{z)r}%Avhf!K7uz!Pv{-FC;EX(YD>1DTgCTZrhL^=}hs;&doy1cIx_EKA
zDw?xZ-8os+opY7<KJMjV!(Tz*H17uQR^dyW{G3Dv{rt@;;c?_iJ9-07<2iBz`y|hk
z6Ln|!oOa->Qu`k|mgCxps4a}`;9OyF2j>fUa|c6(e0B#H3WNEq+vVl6wH;h+T7H4y
z04HJM6gBqqSjdw)jpu3oC0ZAcUZ-~IPCODyr$8tPzC*1__@<&H0a@jFK3Nle@{uQH
z6uw0IxT#EclkDMjj2F*XjP8Y2z!+tcn#;WJ&)yd}_g@Or*~=X<dz{Afs$F#l4M}0X
z!1>RfQ8mZ=A*zR-RW;9xLsVaQR@FR!4pDvaSyjJ^*N6#?)Ysc`euriSJ6VO;CMI<^
z=z3}dW%sa`O|U0@(OlE$lC@oQSv(?C@BI?LB1~G#U8XFfOrK|;9M!ad-AJ{hxFx0q
z&NSGq42~aeaOkK8rKb)s*rN=-ak#+?M>Qy|dw{`X%HW%a8%#}@gR3b+@&JRq${=5d
z+G}X!2rU^*5623hz%n0=eFx*;uriOvzJ;-Px$qbhiY4*u%e?;aFIglvO>TORn;|!|
z$IX(P-Q(tNlAXJ1UU`D<0rPtt{}j%Z0rN5Dm1gr1&6}wSt}(0U<-<M9KEw@_8D&2{
zz#`{r2j0hd+@vgnRl?~ODKj-M<w=2+-hZ3>e@kuvU3Tt&IA+7>;phLz+sN=Qr^hMr
zcZ10?<rTC&SzI$zuUV2Mal3tV>UOgB+_vbfxZQpPC3s&{#o;R<HMcaFafyRlj=!j{
zG+|Ck39g;(D{Tx7^$q^*?;qb4$@I7-qP&&2n!=fJTM6yF-4xD_cPe3LzOyNuyV@<n
zf$k^B^^JXs+(7qZtlXVE`}CqLsRJ@fqRU_lckm9Qvk>6-q~t93@drAc!8xwIOUlBl
zJh9&+Wn+$~(EFr1`Fk3FWM;ZknGwBGGAYy;I)1`E<X9-fF!^DTNdCmy?3Z;I@-pxz
z{JA}UbVUAR0}pZn@GIPv3`)*;&G4H2npna?N8q_6(q{EUB0idQPTpNMlfhg?jl8_m
SM7&~blan#}5$@w527U&SCb*IS

diff --git a/server/target/classes/com/wuhansaga/server/config/OpenApiConfig.class b/server/target/classes/com/wuhansaga/server/config/OpenApiConfig.class
index 265d7ff531b26078d77651adc5a56f1e9b10fbf0..db9d4720c02a4b9bb6d655bfd1e27bd817b04ddf 100644
GIT binary patch
delta 719
zcmYLGOK(z95dO~P!iCGBkK2|4S_P~R`naX7XccO~mfEXDE8?T|kr+#269WxYjV9W)
z8zY{LJ2fW8jmCCyn~1tJMib-KA0WE)7g*<Dq9-}?W#*fi^UayB?H}8_KmC659>6#*
z=}_R%pmI3js->bX4Q__8U|QI#LzA4BAxeHwY%)*34jm3RS{VF|m(Lq(_kKQj(RlLq
z`>RJk-qpgHIZGzAakRq_A6S-k3a*Sy=<suN!(i|(7OPh(OUo-u<&qmg2IsIDH{-Hu
z3&&QOqTMJ~szl4@w{dJIHFuN(i;9doC^i*eI3gA7WbkFKuUsuxmTq5`-E>5-n_~}R
zV!*NB*3i!}fI)HJQDH-Zsfjid4i82!s$nlj0{f`pn7FHE-6qC34&b2ptln%%VO+x@
zjtQh0Mw^5GQUfhkiNQ6K%}izU42g$YNKn*gm6AG49OjtBl=$MTQm<)_BbX7ED^DVh
zavZ~~c;;HApFPeHt38cr4C-Wgu~;jA6H)Ejs#>_UTx3wJ5{;0fg~+3T{su0xC&(Kj
zWQ5MX4Y0K)Jx5m3fEOpp^1lhl;}m%e1)QcPviLF7CYP&2o8N$^4xNA-J{zq@hrNm}
zBVZ$Bqo<AtF*}T28@p`u8NGFw6o{{5*v9^KByD6QnYCfPrp^ka3X>E7t!SgIcfmji
z9q1u1hE62mM}}5EjQ}iSXDRQ$+MHCIqT(}j<uGRn9XLl;!Ti7I0{Q3Z8WbI&=Psm!
KND*F42mb)6*n0>7

delta 743
zcmYLG%}*0i5dXdHcDLKULU*B*qLotdgAYrKf)up0LWL?QR{Q`z5+hA)Vp>vAqaJ$p
zX7fCF^rT)i!eN_O)T{Aeyn6B^dc;3K<Gez2Uv}oro0;GIX6B>$#q@pp^Y%S}<G8Lv
zVdxPLwH}8KwHk<+4C+K_Der~@28R=x$ZB6T9W4xDkyeA^v!;98uwdwDV~EJN>Xy;x
zh98CtL58-?SI;-s9{qg$a`V~7_t#H<ysL)Ob6FX%i(@xJ)mnyiR(}tU`_aV_L5RV#
zlwY}7E-bGWN<|mC8JzKGEE<zJ`#BEC5dChxyh3hSyN9C}eWJ+b)k6$J#GzMgF>knE
zQiw5l(|1;HmCA(&Hzc4N{TSppj3XkXEV?WVa~#Eps3>K1lp#jxF`pX=7zWK`Tt{*n
zGj7b^U(R!+kQOCJ#+ASX$0Rah!*NfWLRQDLNUFmo$0?j<(55r#$xKe>{&IGRZ_E^(
z4y~y>TO5<%vm9q|R(w!b2<RL~4(G+FGe>kTa9qSC@x)mX5&d>W$rfn|vNXEDXb<vJ
z=tj#RsgpH8nvr()*5F!exZNbB8}QHp_;vtkFIfytXeJQfPLxSn0=<CRh?}j$TBxD5
z4u6Goz-qVAVePRIw)WcCXX9WU{p5&R12*C|hOB`)67(>(j$<}XtmCAO8R?v}G5>~;
z6-Y+Ijq1%*%SQ}Mw9xX}NruP{qm>%*V+3tTB0!UEM;87`%n;T8EzIt;;K1bu?83h$
X7RkOszeUBSXu?-hLE2ve*HXd1MRtCQ

diff --git a/server/target/classes/com/wuhansaga/server/config/PortalSiteProperties.class b/server/target/classes/com/wuhansaga/server/config/PortalSiteProperties.class
new file mode 100644
index 0000000000000000000000000000000000000000..016eaee30ed174685c9494a9ad7059c057f7e4af
GIT binary patch
literal 4153
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
Q1%1_r{V(xr{1&<Y0*Q{hNB{r;

literal 0
HcmV?d00001

diff --git a/server/target/classes/com/wuhansaga/server/config/PortalSiteResolver.class b/server/target/classes/com/wuhansaga/server/config/PortalSiteResolver.class
new file mode 100644
index 0000000000000000000000000000000000000000..c9129e370137177e4f16197bdc318940aececcf5
GIT binary patch
literal 2739
zcmb7F+jA3D82_ClWs`KvC6<<!Vv7{$g>(VA_oAf~il!IaQjv=FG&xPT-Ry?lO$##4
zs1J@0^5zZ485u`rm~oVfimjl&`*#4vC*K{1@jJU|h;1Hf9&*l}^Id=6@B7XlPk#9g
zKqsy!2r#rIt&BFGo93p&(_C|eJtu4}X_-@cS{t%#mm4FxD~5$*8FZr{#ISjW&vDJ*
zW?CDZoDoTvA!t}>hFHR~)0$&U9h%V+Ryr;0c82Z4In&iM;;cERJNl#{x=qt^xvN{I
zBUKD5Gil9gXM`zi?urzt#QJ)>PxTH@3=IyCb|)rA&W`p<$)|2dTw6EOBw5izR$Okn
zW8BDzFe>QieB6&aE(2$%%oeg3vaPJJU0smlgNgNJ{#1wDg*%dlZt89qW!%&}#t`bU
zQX+~<R4LfXP`x_;(>&=~_7xS?*v1e^3)jbmVRuteK0O9^oc89m@I}B-tD+1W7&awz
zQw-!XlfoY5grkRdk{e^(*5!BpP_g}5F?327vz%(^)zuKLHto7ut&jdjsL*sUEH34Q
z<C5z&;7ZpGDmG$M6wjei!7hgV{}(eAyRnBD!wtil7b%IBlh7SvOspyIGw14tCePZ#
zXd;Lms+yE5M+^2TXl2;D&MZ{K(Z-+>%0t}d8Q}_>VNWs8dE%5vSGwD;;()Xu>(nQB
zO4v~X;dvE@aF~cSrQ41>V3{Y0`m+qjN*G=XV+mJL9K~@3#~2ztzGNktr)0qMmOZO^
zfcSx)BWxTMCqUd&rnxgJE)#THOE_-65T%}eK><;-s6Tx(Dqci4k(Ih8Lk+Qlyw|~b
zL?Y-xuYyx6+J03mqL)x{8fQp*cyMsE(1u0#?b7pE6))jshH}?RP^Il2?hrv&urHP_
z0Z2LeF{ogGVWUSwUz{kRVhFDgCuknIT$l6WKe_wUr@i??7$Xcv$Nf&f*zoAn8;?Hz
zVELQt%kM2M-~VL!#=8yUSKq$)*ZmJ4F1-KX*WZ^vy7lM1&mMpGwRbG(eNM%ggs7Y<
zFUN*Y!1K7E;5C9|bz7?#$Lj>iJhx4T<0a}*M1*{lYfqZT!gzyWyb!k^lpnVjTEm0I
zYY)G;)xfjaHb1$xd?&?ao5Yi{pGfFiO6|eDYkq2vZ{K|Q&izMU-h6!ft8$#jn=)EX
zZM3d1y{YC->xA|Gb&klD$3c?R_6G`sEc5zi4{7C-BBXtk3IrgNkt8=$dWxO~hNx-T
z8E)uri4?J7iqs}~l3KAUA(>hjgjcdF!?1Ccy^f+P<eA?^J}O3BveVDA`5C&oU%1m&
zsxU<e3`PjDNrnv_`3K-|(>mcPdO@1Uq6mU$eF<AAn-ME#C&g)9&hqM^!ZWpkXPayW
zhMN2XI#%NOZ1JCrRTIRa!6z)2V9<K3Ox7}m>9%7h&9Wdp{Xx{q2Zg>A`jTsy)>=d$
zr(HSi15go@lb`k>y4{Q|bQ7bmIIZ#*iLpgI^8;$Wr;h-((|?p!kZ2fNQRkh4gm>Us
zIww_jgiMvu`PG&mQGXXZ`&(msm(UzQYfN2&7QiA74#XF6<T|wYU3A>R$-C$~5!zQ1
zT0$a#>)22eTDXIn*l^r8F}j3TL&)z-Xnc-MQv9McFcAc4llzbt>=9JZzLtWmqmXxC
z8=cmn9=p&0jgUG)GocfW7{nfM?1h0QT&5R7Ce}rmQ5u*;l2*A(K~Sn;IG943(yhY;
zrU{TB*=m4JyAWBa#f-O`B^|XOZ;*V3PO1@nf=&hfiu~{V8(aQC6K!D9Wf>zM5@LFY
zd^pKFqa9G$;z3r{ve4>pS{IniGw9`6<w4#?mDZ@f2PoHrRE$Gj9#y_REV3(qmB`YL
zdC`Orh=e`YkpKyRu4FYY!6w7Sw2`FfB11BiXv@!VT3UZX{Zm#*dVyR@;CzSC0&r1}
XVr(VDjTBt~IT8$D4)e51<;%do3Dx7R

literal 0
HcmV?d00001

diff --git a/server/target/classes/com/wuhansaga/server/config/RedisConfig.class b/server/target/classes/com/wuhansaga/server/config/RedisConfig.class
index a1fdbae5dbcd33b74a9cae5e4ad7e5aa950d4b5d..d8ca2d0b99b95ad69b4f9b3134810af134034be4 100644
GIT binary patch
delta 798
zcmX|9%Tg0T6g@qU^vt9)Mj#1+$V-$M5&=PlQAm&=f&tMW5%B@aLy(8h1uM#O<4&pm
z0>3~FRYR32Ew}m!d;l9)Zd|H&63VISd;8pb?w!-Odq1`xi~RWW`73~aJhz}g<<JCl
z_;#EYABVxvCBIpXazm*JaHtkI`~m_2`Bs@{N8~T1v)YDgq6*a<H3A`oy_z{5mVV7I
zC)J?IpbqA84BhgT)*|1j)pjkS9CZTqh%q>a<W~7p9WiV)2sENeI@+$?g5w;m0w-{i
zVU&1{GNdPDR-d)wIK`0=Xh)KvPX?`ayEVJGH2-q##njf5m5pV2py#ODX@L%OO2_wI
zJHyaJJ?dmLj|IBC!`L`0a1Q6?7+=%+7>4Pr3HipVw=MMIf;WhZ41;kJ9+4k>A=zhy
z*?^ohvVs1}Fa`xKVMx9=rVWl^fy)H`8c_mQ1V#xonGph41#$$^W<3pcLg1R5Gb1$X
z>pOu2XV8W=7Z!Kc4|ccAO-1I}Z+YPVvOP)n;e862cOztP5b7Y$$m@wcuutW5o~)M!
zf|w#JDg@lbG$DopZb9>kS(v<!Vyh+anLU`}$#xf32{wV?M5>6RMMPX2E6{elxrjCw
zsY0rRF3NYi=qZ%YJCmwX_TV^L3H=mKJ9;vzyU3JnHW}4ijFjzI(#3f4BmGWAUcL^b
zw>@zK6#<9hND5|fn?xFTfLYw3(}pN_7x$=Y2yM8JITD>i1LldL<01736RW~spk0Nv
yNUSBw>5Liz%d`|c!U}nBHml@QDjt`^YyZRRgg0na5xEwdc$$eKPVeGbCi)K;@`I)T

delta 771
zcmX|9%T7~K6kVtHae6QJB9A_-MV=y1S_@iyRDmK?1PkH=DxxR~J`g472UI_yIYSeT
zf1r?D5}P>J4{(4ZC&rnM92(bciIcte+G}N>b@n-XEqg8Qm%krB0T{*$iGW&{2~9#T
zM>`t@^zqHrH5(c%2L?>_TK-VK?LVeOSYS}SvfIkbAvXleMhFKT#BiuwS`jVf?*nyl
zSQgsQA<?cnM5f+BC%Oc*u|h%MgxU&ps+XeK>_(5oQT0X)8xDHWr@o2FU>yApl1QmU
zV8=>hP+~w}O1%>i^;Wl(ttBWv&M6sf$r{2biIW0n_W3Syr-{C51r9pv;2efkLjSCf
z3S_Dp*JyV~eA989cQB3#l{Gf>3j%pwDPM0RkBk0=rv%1&=`_ky!>Z4Wh)XJGPPo&x
z3(q>Zj5$>{7lI*Nb#RT~ml-3Ncd$UvAfp5~94r!~W!wy5$-yl(C!;&1;8sBWtgDo`
z5^f&|K=?amltgJ}!E7XU5&Tf4ZAPC48c@gR)C9~fkw85TKqu#qYD5#WuWn}MKoKEl
zvR<zsw784NOtRlYw1Sm5(c#(DHd?oF#6zOU^4K;q9<s$$1tX+$9>$6l<QG#-+Ab!u
zdIi&L7qUh&W_XyX#w*E~?%{eh7Ly)sCg1Zo4Yt~JM@zopk(z;h!?c3iSf<4w?%@vZ
z(smg0SRvB*C_T83RhllK6>E6F-8|%s2vs%xBUUxlW2)B48G-}-BcCt^u<?HfPx&$N
UjLjytyRnI_Tns~e{pY#ZKajF~O8@`>

diff --git a/server/target/classes/com/wuhansaga/server/config/SaTokenConfig.class b/server/target/classes/com/wuhansaga/server/config/SaTokenConfig.class
index b24329421cb1f91cbf4fb1f03470033862cbe65d..84f76de43221cf77ff7fd586b1d0f01deef710e5 100644
GIT binary patch
delta 728
zcmYjOOHUI~6#i~!rc;KY^uenLJ}E+>9ihHKV=SmB3R)lO@-j1_Q_4)!8PLQ9OXJ1_
z@4~;}!VQT51JNJgf6%RK|A6saA;HBx=bn4N^L^*bd7FNhp8fu3{~LfCcxoU9MTcra
zL!2Si;G5iPa(~rYT4}g;#1NnLd@s7mpp1<_*O3q#Y$|S;=!7Xgv2sF3QZ{#sU#yf&
zBcmg0q6fVU^I}Pz7xmZ&*8g7V9nLXySln6ne5+6}Z~{X*hE1HrDTW1t&S^aI0$;pV
zUT&RXNFQPOMpU<&!K&vcaE>AS|Fg|okzMDKEN@~|GG*OYc5}mVmw8mD6S-|aG%$v7
z9R(8;(&UisTaLR~E?Xgwf;HE-!l-3cqt>&?Ycd#iz0<YV7Nw+);&xX_wHR*Ggwxw^
zGMZWm9Cv%~K-^Lr{R2(DzT)r^?l=oRY1wWo3fiIAQ3r*peN1=9F=t>NcXZq}agTg{
z*7D+~_G2`K8Two_Fo}mIu49J5T=0FjU1{<#bVD7>40-We%hP(Eh?HL3nxtJZlxT4Z
zW!e|T3shN@8D*`o2ew0(7^W!7Z@|DbMe`7VGA>fZa0!<QC7S~xicz*E4xrce(E;qC
zYZoc?EBb0mW}v!@K~3Jbl+5XBP0gI8mys98IvJ?cpF|GbC?G`x_WaZAJLEmmlw)4O
zRnopjXpK>Ulp&4NlN?0)k^`$>aQ>M5&_q%aib|rGtC08mctGb7VGZh7!edmC`wPf~
BgYN(U

delta 717
zcmY*WO-~b16g{sq(>IKRv?JCQ3nEgWMfxmN6h#*l&?<^r(Xbra2~1mN2pu4<Si3PH
zZ{bhSm5CcL5cvTnF8l%f2X*Pfc*l|u7w_GVckem(p7%EXCLa6x=imsyT`Y1$7_#z*
zl1+1{46(YsWs9cmt%!x?x>F4}q72irppMJ;iq#jLay>V=$DoX4UoxmAzvdWFaK;3O
zE{~K$h2z}rR3UoaL;@FfTSeVMDtztP{h04aqmQGPVU`eQH4~T6F9my-ANY^D5^T8M
zijF~s4q?~UTu<b328J-gG0ae=<{85dT;DU1MNUpfwv$&G;wQECX0R%n{)+4A$jk4M
zq&|deCJI#fGm?<6)jHRk_S$mImcP}WNdvcVn`4q8UG+rG*(w%A%MSd8<B3+VE-JzL
zV&FDS+=0$uR9Bs9V?IQe-P#A;zzpU%E%Z&x&_eg|K>pH>$GV~@#V}!jVcx_IOi<zx
zB^b=I=Q$gtrrl~eEskdl8QIVKjKO)|Z)~n}RAet7+aZamSEFwVEs0Ba2StJ`Bdg{1
zVSFMd0+a6Ozodaq^38Su&Z3JVQWkNl3Y)hHFhW+09>Q8WKsT_D<Q^`nUvPOzv9471
zkkLYaN3ljLOR6<S8S(0rr-zt8$O*z8AlzYC$Pq)HutM%c8~=nm9CsW=n&CRVX^aBI
uj8G0rg#+d3gxjc}ar2afmT9we$~j%6$|S)<JjN3&P-!UXQ#{8Dr2Yc)DR}w-

diff --git a/server/target/classes/com/wuhansaga/server/config/WebMvcConfig.class b/server/target/classes/com/wuhansaga/server/config/WebMvcConfig.class
index 7ff84fef250033943f7ab779a2a018272231bb4e..765b61d778940622d67fbaba8014987c45c3c8a2 100644
GIT binary patch
delta 1222
zcmY*X+jA3D82_EkW_ObwO1p;ARxCxJZPJz~cmaiuZ3&RtHjxdjp;6p+*RnNaYj)F$
z7XoteIu4yPc1C#N**7l}oH{r@G7dB9ll&3B_~rxS`0b{n@Nmv||9-#oedk{Hz3#SO
z{@M5mz!9vgkQfHUHFaQz3Ynp8$y_nhWwWxF&do2`3%&}4VNCoc?H6|yU7U&Ziu=lH
zk8;?lIQ|GjWFR@iAdkD29Y+N199z&T3hH<58oDT)PNm{_98aj&v6dT+a`a&5+V!Qr
zU5{WHe$}ZgYS_)dD1R^dRrED+$EaoiNwLUQ>Vwqqc&4CXm>}~xgS0fc@~237nn5|5
znamV28V)e1xqKm;n>K=G&vHD6BtxrNF1xF?HD&u}UCRqX2RRNs96Di}mR$`)FLE5l
z5uzDZjaO|;l%$fj7o!|w7#BZFhETP;Nfi?eJe-^3rjI#gI|hbH4i#D)Sxg5b$uVqO
zyOo%n2|TZGoP@y;cf8Sg&n?${I~?R`4W}5inrBz{Sxz;MSrk>g`sk$2d%k^+<22^P
zpOHga7Ow^UUl+sj5E*Z9n3xx)JlK<k#bHBZh<Wz1Sv7r^TJ~a*<18HUwcM|~#ZksN
z@rOLy?J~5aYs+QVw7hU<Z^KhjWyprRuSd7j9(>fqdh}xZYEU;9$9cS`;$4QR&76*1
zrti2Fj`vYxNSKy&()Qe1b-|u=7s8Mye%1b>v3!J2RD3LckM&dAGCmc5$8O476<iY{
zexXj&pb<vtNWm0I#^}4Ykc`u5@xa3b`e|ftrBIqABN<KIM%y=}NYLq4LMO*#r1NG1
z64*u-LkG4~R#3c7ND|43LA|qqZuw3fy~T+Bq|v}0?M|qtjH0X$8O5l+&nPPTQ$|tM
z_fz~Cxfu^~pO+hWA%T$wUYh-%LJvIvM1T`;CqW-1;1PlzBP)xpkXlC*ev=wdpTJRM
zh~qITjWRL<!pCu9lkj~aER(PFBeKQR_jvg>rly7($lpLBaOs5~Fw^vx0{@xm;cv0f
zz?(O)CD1mo1WXTZa<35g<)%Koffc}LY2cmk2@&YxE55s)M<3?UACgTqq5mUWB6=SX
zJ&rsspiUH%IDm_^wFoW|$yP`Yut!Dq0XkLseh<A##)p(3;c~d%U|CnlzS=CpXJmgK
S-tAxDIyr;guR-8Tbo~nuCFN59

delta 1221
zcmY*Y+fy4=82_DQlU<g>ErbwIK}&^@KqHN<T1qRnDGdS%T}n)gmxZh}m}YTzL&Zze
zs%^cEW9E#E_Q}7%884G6PJQk;o$<*T$2T8+^u6Qw?S`@T;e5CAU4Gy9opZPUZh!Wd
ze|CQcFohizKKNxw903FwIydw!Jz3T(>&fiuhOy=_1do;~CFdA}KQ_9oKp`O+kE>A8
zDuZ*hp<Q(OrbXVj5$k*)gXUPJ%DRFO1EYX2dSpa6dJ(NJ9ui;sI>iD1)>J<woJlV!
zc$h)TWi^rp$do%v!lP9FWO^>Wlvc2hLC)ruGT8;q&9$H7aYV(R{_deLMmS=KGPLXE
zvU$lUo;LKNVcD)<oFjoT(JNh0!gzvX0tdwnNgI^$Bm?)_Et$zvrLxh2!+1)@(;Uy>
zNWCpl-`Q7Fk-|}THd72evAO%xY4$cby6k!!=Xe&=3~I@qUbW3~)iJzrol|gvL8;n?
zb)Z<XRHSiA#tg@4WFDN<w(S@f8Cus3Cuf<PhUIKC49CP&a70Prc^AQ)C<n(#S>VVb
zC%y_M22wb~q2UNai*0P`mhPBTqyuL;mXQ~K1xJDfj&nFKB65E4MarM7ZkA2GXnPxc
z8L!CDIaaa8kP#EoLGh#9D}Ix&L<~19qhcKwWRy5IT$lMhm&l;*l*|f4ST7dO7`9op
z){HrG&9mAv%Js#W`ffEKoiK}rm}lRKKcqY2SLN@njv#KR_y8Zu_{gpBvAEMRA~Ads
z6BBAwbgDHW)XTNQ^e7o#qvLaTLHr`U)>h&bI;M?H_(`A_OZ0WRN)l(p1Myp6-;m&g
zMby0pIBbu44scK<jbRIy$jc4hp+r97vx$)0K#O#{hK_<i)TK4ht=#tHKCK{y9?}Yd
z&?8zQ7#h?Ha_BL-ACj8)uJ5qaz-Sob4J7mTAq+sK)ZMg{Frn<hBqBIYUm%SrGU)T5
zMVjUJpaHd6yn$`P_$Gx07%48`xA68J;NJ<bM7EWmkSfH#$Dv!8oF8l8*iD38Q|P%L
zaI$Hib?x&D<KJSjfu);hbERFp04yZ-u&)sImzwhUE{cHG+Q6$`3w~JQOFmS~V;JW#
z;(?7fOaBLUh2XtI@Hld~j2b~4r5|yHw&urG0@)7VJ?xi}x`(JtWB6ZB65b^TAKvrU
e>n`hk(yujxaGmr|JlgdsJ|m+_hB^d3N8i8r-st!M

diff --git a/server/target/classes/com/wuhansaga/server/constant/SiteCodes.class b/server/target/classes/com/wuhansaga/server/constant/SiteCodes.class
new file mode 100644
index 0000000000000000000000000000000000000000..1f331a1743c22bebc4ff035c172c8ccff4126ec8
GIT binary patch
literal 446
zcma)&$xg#C5QcxJTN=7i_9uWMLByFwipqAVT8Tgrr^-#O)>Z0Aj#I>AaYEw21MpCY
zaj6PNE;IVaGrzx?&#(6n0O!~(!C}~sl9~UUO}I+=nER>FbD{kxQK{j|_@OkSos2|U
zLY|>9<#X=GT#fzSa4I6h;5|Ov2Himz+yo5G&Tm6#v{d6$hH86h*5`31T$CBgs}C7!
zc61P4wR_#m;O@yqg=&`NC>4Y;;`)W5cqWxJ7Yw<BR-Yknkv!zEUO^Q#hI&UT(amN<
zq3`)H78WImc--e&TD>gh%|xaQt<FD}CVDSSG98I)X-#XZa~#`6aRMTuV>;MF0Yy@!
xg>p%IfAku?IF^)hojQEVjB?@d4UN~uNRy&909<TPto$@!6I-MhwkbN;`360oW#Iq-

literal 0
HcmV?d00001

diff --git a/server/target/classes/com/wuhansaga/server/controller/admin/AdminNewsController.class b/server/target/classes/com/wuhansaga/server/controller/admin/AdminNewsController.class
index 93bdf597be4a6694ddacafb90df190da97b22873..2ba8543e001633d7b519b35c1cdbd46d333d461f 100644
GIT binary patch
literal 5034
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

delta 1418
zcmb7^*-ukJ6vn@~O?$iC($Xe01ml8B7b+mKRYi*wK^A3EkVVT@0j(gksNlkr#wQJ#
z1YUg6#AtkiRM2Q*Vl*-F37>s+eK7t9#51>0D&CNork!)onLEF4&NtI%?&V$fk1Ma<
z0I0w%84^Q)kC|LE?hh<9^LrP6YtFTrT89TmdgBx05r(N`avQ&AD&n76hh6zLJO6X;
z_1C*|KOR11DCR-g%b!T^Gp*6#SiEVXkA|Vh07D7AnRuu3v4mBxW2RCC`6v@Fg!LZ2
z%#=i<!Osjq1p!p@Y1wb6Qm_*tz92s~)GMf=Y`5`&p;<u#TKJ05ErmTKPbjG@cC4wm
z^L-(u#Z=JW8;=Z*j!&Ava7KX)qZys(meIvf$a|GSr-HLM#~=%_mC-1J!^7j|FUC#`
z2qh8TW4TQa7leQa|78j2I?>F%$|FNu!6+sYpOhezToT`!k>jX`jy{0Z_Z+S~{}QtK
zj!ftD7VM$q_GAfec<6~H!3!Vh5>X!fkg%6xlSFAy0#wRJ0rap?ETNF50WOL%sA7v@
zA2KN@>H>>lKO9t)86}D-$f9qMW=b?FK3RxaLW$7Aa`}CmD_E|Q1y9dVP6OGF11Z))
zm1SFJ9ir2Lb;e;Hwz;y8yu{IYN=w*Hzh;%@fe~I6QH^7?>MEjIMbvDDsKxPr5p^1f
z0zwoDM6Cv*A+2ML8#{IaCp9~!?xsltRZ6HbfojocSSv#0XwsZh8&Rjz%xP2oC?T{k
z+d^lfeF+`v$*53IhLS9-o(zUCdQw*OZd|#KtXQ+XEzJ^ITG$>U8<MsYhFtI0*j5#7
zD<sIA+nm$YI8O`yWz^ti0*1(_{}3>&A)t-~)T>+10-v?nwKQDZ%*kk)lb6<;uy*!0
zHep0VLo;b;Nz<TpCq{9ZEFPn_8feSot1WJ%28&y6^SwaKm$wL)&%cOv9&nZiL>uV}
j>tUxq8#_(BLJ0|1RTp#UwQID{WDHZdPK6t(M&A4b`Pa#z

diff --git a/server/target/classes/com/wuhansaga/server/controller/admin/AdminProductLineController.class b/server/target/classes/com/wuhansaga/server/controller/admin/AdminProductLineController.class
index 4954035d10319fa01ec240ef0033c4fecae467d1..27b793560ea9854bb9a2f8c82d7c3aebb5608967 100644
GIT binary patch
delta 1801
zcma)6OLLP|7=F%|%a^1lZA>h&TxzIb+q9UZSOfyK1*8^JunH9cFM-6G64I2UAl@QM
zg^iA#GcFumxOP<s2-O)K*X-Om?3~e!3rGKe<8w~ZL_<5e_|A9EdwtIPKJQuVUF;3q
z{p;KB0qn;O8<xPRx@w2jug?CBHk<;1+4QA!ET1mS#EzYv&7La@1dB^QhL+}s)TCp|
zC*aKIN|a8kKfGb}m1{&KZ(egPi?H+HTqf&<z(W!)xP91&%{DeIEe{1HwxC<U)}CYe
zyufhX*{?z(<c^@n##WUO5tqax*rujLQhnk4t<9dvmJeK+$Ot4<!H!dU-u}*~Bkz`o
zV~_e$jI;|_Ia)Z<8LmgvpJG7$<mq-M1<uqDRpW9%B8h|Qcae}0Jf#yI7TDUS0=^z~
z*)wdr7mAs5IjcVQri}fh#02f{c~7cee0O3V92bz;`Gs8ZLbgzz$duYJjgvNB5b&F#
zEtGTl*krmW@gh#CkF3PzGXm{RRf@OQ*k6`-1+S`m)~Jg6ZrSckHlJnQ&)YtYXmws<
z1{VZEeW_+IQgelwWdF2^%e$Sr#w7_G9v>EP*~TS-o$O+#syMn?!7X@0{p{E-1>E~`
zg<N?=Aje9CsrD>=5>he$Y`_Nx-j%q53M<#wKYjBvzZ7~;W>^U7267kFN%;3LqZd9(
z+l*eq&wmFk+o|a&A%F*rInd*vB*gE*Q|Mf0yMeYRn99k&KY9z{fx#-eR#16(nGy@z
zxw`2KbmLL3(V8WC(Z>^g&`+7x`!Rq)dg$E_JjR$Yy?4+6RDnX!Fpfk6`;fsNZerg_
z>;jLUhNzS<%sT_Npkx;}8tEuabp~mWR`J9N?!&pw;M`ENYv7dFYjA2zF2RGwlEl6S
zmi-1xqmIl!f+uO!z%a^##&D<w!`KQAHEZQFd82I8z&bd_@ibG{af~ydAh++sQDK~V
zLyzDYTKy-E)EYPv#4+^$aU8|5)p}I$Y-@9-h@;k=5}q@7{1yeeH+;Id>gp`kxzsfn
zeEu7pu<!#;A2r?DQN>Gjhz>)mcEj-9kk~_d?)?Y7y3kvx^Q)`gH=qk?oMlxs;g91S
zoiiq<=7ZK{8@ku(-1Azd&uJP6&T*4>ueV+;huOx}YP75Ti+8O(Kfgw;M_KE!b!xo^
z_X;>nn6(+6YsFJUWpxlrm^X#p#p~%Y)6~Bxswl5P{c)3C*6ixk7kpUWWTv<1s|WdQ
z{&k}!8Bf139nm{@CpvH&;ppIPT>P3MJ@vWOu@9M;k(zB|oI1#p+OyDM-X+Trngw_9
i{jvF3c+W(-YOc14?(Z}C2PIr1MSu@^&|_Z0^}hk{*5hmd

delta 1757
zcmbu9OK?+F7{~u7x5-V?dy|;Z#saCOqAf`v1f)CyC8br2wp4sn1Vq#3Qd8PeOp4+w
zB39Wk^^6N=+&bgR7gEp}9mXXy?%ld|T)1)T_&?`fQcUT}#eIFR^E?0VJ9nvXsV{lw
zpC5k)a0pjJ@WC+AX2FlZvOT<fwiF8^h>(e}g?3m1IoV^UmOqcnGsZ|Hf~bj@g$EE9
zNXeK#C4V&vNtLp}LI*kp%xR~7<Wi|3P>^|lzw8Ml63YLeg)VFqFv=DBvT`VpiB5zO
z!Ddx1C9tJm{%$7aZ6i2bPzeuN=uruQ#f3__?gY^*U^y2Ss|$0^e7#huwPPzDG4ZH{
zKJ*LNGv$lr++w{tn;R=H$S*_r&1r$is&%wltE<9U3)`_n{v9f6u$>n2*u`}!&a6{+
z<hAzBu+rr*3wtoI{Pl4=jD6T|;($`5ATL`3hCnYjml*tSabh3Bpozm4iWm}zY4>b-
zemXZkIpa*#xyZrle6>DE8Tz+Pd?F_OZNuj)jtsW_aeY#JB}ATOcLoXqzG_A8@c$$S
z1LN{HbB{Pp!Af#ps6+l4xFR<MN99cLgxnkcPW}?SDgO$8D!*vIL#`_0lJc;zQFhzs
zu774*qTwSIxS_aeGT-8AUwj53a0J7&j_~UR7--|uPJa)P$*#b>1^XKse0ZGq0E2;U
zJi&X~4a8AA$uFj$gr~IM#?u&OhO&*}7)y?$!4HEGpbxYH&+zi$IG*J*%D3m3`+SWA
z6EwWYtJk3A1h1D);^exo9XRE&7g<CtYH9WrB<@9Tc<fs>d#4-NWVdiyvyU^~FZgj6
z?`4gbT*W&>Jb_nELDcZ7#xw;DWo8JD_N2!$(!!E#+`^_+9m9J4G{w)X!!v~n3wk_L
zO&+IJuCth?Q^}<{Ueg>sYdIR8DBbtr$dhB&|KzA*W-Z4#%zAn(HN3&<%Eq_+fQNm!
zjcvy?)Aki)JSamCS%jhBVY9HGKa&F*%pJC_X2ZI?hJl*TVV-hY9JXGZXYK;C-3BY)
z1=rW0^L0ImK**;%JjXb92y3lfu5&kcyS%8?wSCPlyBg=4bJyDI+<hc2HmLE?IvTGt
zdly@&-oTqpsx`BB2`O$*o#6rQSRGS!4t9$b>{aK0=a1&qGkjFDSZ<&vt1HG^t;@cB
z&&a>Sgd*PcRvKeT)vIXwCJv@EHz3m48`%AA%UTJpRR#a!I=0!vC}+d{p+xn+$fw7h
o&G92fLk#b+jtX$u-`7<yYr0J=^#MIsYWNUKbbQ1Q_fUTPFEqR4GXMYp

diff --git a/server/target/classes/com/wuhansaga/server/controller/portal/PortalNewsController.class b/server/target/classes/com/wuhansaga/server/controller/portal/PortalNewsController.class
index b95e686c2f2206118989beabfb8c374174c26f96..d2accee0676783d326fba4b3ec4140a77c0be36c 100644
GIT binary patch
literal 3707
zcmcgv|8G-O6hF7?C@n>B46q_H5M?Xd9s(lLZ3vT%VfV!q2ZG;jyG!?2``&!-b<1Kj
z2*I#Kvlxj)Nlc7}kQf6P80b)b_ur6i<0t+D<LAEDc8~e$I-{m}@7{O6obx&7e$F|!
zzy0y^uSC>JsQ~#H#Zr1!8OsfE&E#pWn8FwphLX}X%g{3!bVqc<;u)pSZhFL+*<P9p
zke|`&(|nXG8Lp+3-sEYKvKXz<uq**dYDzGQ#ywR?O_*1t$imtfqcw7CJGVqyH^xgM
zb}lYr!5)aJagZleOY{p<&%iE5JG>>q-cxG2V5EBo<b*S-X%)pYI#M4$&4)RhVmm7%
zEM>^DMwG*NNx&HB7w_eSX~i1KDa&ScP3ed1U_wo6+{zj7(}jOca0?LPOmdc*QQ`pK
z;*CRSmTHaL2T(LG)`lOWNPiA<SuvoRYBD1ZXqs+uOVu@#QA1qS6?2TI(;&y_E=A|2
z!siz#y(7Y~*FsLf%w@CO7-zI?=8NkOE=}hzd^~#t?@M#vTzz==!ptWVv)_L?d-kUX
zUtOHNGX3!G1f$(?-AF6uh@oofQwGn9G2Iwe#zay{s@kASmC`A!Zay-Cbx>73$}>55
zF{q>p>|x|@*9S$A7(EfDAcaEoBs~?N4UC#S8CjMDVcJMf!y3b(5u?_n9Myb$BrIuE
zOd_faQ-GF-XbWu(&@<qrCn9%@6pyG76k&Rno@2C9lCv+DL^C7?8Euuwit$*`*RX&N
zu@Kc$G(ZiEHhQYXpiR&)ZKp;?K7E+cF1KJO&@15gs<^6&o?JF5jH4V(LR7}}6weHB
zLzUl!LBBPmf?BQKJgqDlNxB(M;7O8J8l#Mso5&E7DH7aYoQDM0EvzAZu#ZbJTEYNO
zzw|nzY~?g?36AUFfa|+UL$(t}1>XGj|J1kiBvMEoy~R*37vz`olh+=cnW)=ebbRaY
zXFi&{c6;W=+5C4m>y9@$wWdktVLK&kc{ClBPU4Zgw5Q^{QAp3W7_er!WQ}Tw!77wR
z<OxRm!&FVnLUe%I19Xs4y=RoTgVPn1uQ2L#$4a^5b}^t_oH7a(lUWyHd$nteEfw>s
z*&*!uf%!GA`68(h6lq}{9GCk~{B!y&UdcZE&x9{tz3iH`$D!TawJS5{&ZD;6pFTf#
z?_&P)*ZE&Q&rf{n)S3M4AM=x+<?o!Ey?XEd^pwr6YUO=(@B>Db6R3|{L&Xe+WO{)5
z!t@&T<AmVrQZja&-tl)_C>^{f!CdtjH1(-C!euS0rdn-`ChNU(r3Wcvi?3WzTgvPx
zTOVT$1B^Blg0xE;^|&?E#4~y}sSl%QYw~^|2I06WdLv9n=>(&ydMP55&~rvgbf~gW
zM7(aC%`!hDAQ!oVSUhbiN4dNg_%&p0#0DskpS<4WkmUZIAM*FkG1|L?oPj%F>Ea8y
zOWA7Q2IsFT;o_ZI-gRj+5{}F~Ra7Ih4th26YGAjxw4n84#R>|eU5PIrJw~h0u19Y*
zW*#@OVGTO9CyAM~meyhN7$&9Awb7fje)|+fy3yIxI7OT9(6;NglqS4GSVr_TlHMk2
zMz7A<L<;S|7q-*$v=gF((7uayWAzIdt!5Y|4DX>A0oehy*9Ns}9@I+!MYIo3L?XdI
z4LmI;@W;c|l~{EcRxOtmvF`Ju*Vfn+@lVmq9(cC_cfE~wx3jT?H&Vb0VRVQ(Z0jP_
zNrz!q2mqxGe%pqXRkjU>ptsXT*F{H4w!FH~!Eu*^yKS3-(s7J>@Rl|tp};TuMH_k?
z6Q-!w!+>TuRIv?+I=e~+tScF?juN&3LHJj~uCif6t#o|?4@2a<j^P3Hm*MM}RFCIP
zSS_K{MsL&c==NLG7Hzymo1#s(X#EY0`$(R=+<`SN5Va)`wQxjnUNTXdS_{ZBVCDJ4
mch#U?08bE)k4|FH2gQ<>8?fjt2!Gq8cj#RVaC|t_O#TVAEpV~`

delta 993
zcmZuvO-~b16g_X+nduC#^vhDUMLrZM1uQL8MMM!0MLty^Mi-<;f*2AFEhf0BiP5-m
z(Y!>W3llfS#04};C7SpH+`8A5h`+(ac;5^Rgt&Nf?|t{3d(Jy={=~k8&98qyeF4yo
z$)foq#OLR7`Mzv^X7=vF5<^|QX}IW*h*6Iro-yv8c4|$;wX_H;*-&uf`RecG&p)3&
z`BkFt^5*Ne;*~NLsN&G!F|i*9bsS)5EBeFYyTQe}E6^TAjKM3(#usl=xIJ@=AxP8j
zWbbE_i}|_v<S;e6OdLY3jv9t)TZg7{)S+Iqx!-x*63@^t?in%hQ1^%zYCU`4REBoV
z%eTc@vP#-QWgCYI%|sd<I@(1_Z`Gp6Fk~FuOMObD)DYKaXY##EgCr~!7Y&}YGATn+
zlst{wb2nGsY&?1_d`4eQ8oeBS=x6W~&bgI6phF@X#hAuL+3>rj<K(I|V?a!po!St`
z0EXWSQ)LAOL8*^kBq;5p=mvuU6E0LxrGUdrF+y1-b$mJa5uhY^11yIS_E9rKHKSOO
z_<(R3k#$tBTG+$%)vQ(&M=0m^F*M*PRSb;<#EIS}YO;uYJ46X00-9+>6gu2OtMxjL
z?M@~85J`1W^b&irxuuNMfB5Sy{#yIs7C%7>IF1uEkW!pPCvl&m+)!v6v>`Qi;j|;M
zd#@K~c6o8ulB!E9dI%|{_0T|tBDbWKac-}&0yX27v?}|cBaP#{rA+Ek85L5?04~rC
zE>bRC9i%8(MhGem@FhOtQlfbc$wbQ<!X?^Lu=51LT^9JZct!|iy}z`;XZ-<=1uDI?
ePD>#IIce0oe3Yohh<rSU%eX>~t5n!O!^A(6ik&?G

diff --git a/server/target/classes/com/wuhansaga/server/controller/portal/PortalProductController.class b/server/target/classes/com/wuhansaga/server/controller/portal/PortalProductController.class
index c9a5f397c760a1b4eabe1363399efe62e11ac113..f3fe82e020fa7211ace8ed9dd40157ae60c7f32c 100644
GIT binary patch
literal 5011
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

delta 1741
zcmai!-&0dZ6vw}t+~nq7HV|k@G#ZO21``k!{K*e3fdc-fRuqZ~Ek6umK!f<B)mvJt
zcBV5Wvwdl2I`+-!n+}FLeduE!oKBxR)0x&k!GECIvwK74PUdF%kbBPVIcN8i@9rKE
z7x5!6UjOndfKGg6!UL}kjl%~&Luh7valB=AJTu*Ldf{3+GtHo<v%Od57j7|l8@G=b
z2*A)`a#VmbbcrP`l8eVRhVZ<|@!H&-{UH;TsL~PQs74J#Yi_Ak{Oj$gcpJ4k!W<E-
z6Nj`qF`;z^DiP(_fQ{lOt-+LwZ{m0db-DaN&_q49=-4Xb4Px29+sm*=y!34oul!Y}
zjK(<{v0Y3B`c-L?qY2Hq*MmgRf}J{c$<p15ASS*x!s4;fK!q)6lZAW4oY}1k_i^mU
z0dbP`228Ze$__DBv6Bee(Irz4F$(`}G>VuJ5To3n$h+v)k>cn<Z*H(Q=<i5p(hFTm
zq#^Mw>+@-;xrs^fhxUBsFZLr7_kF{H=_&D#?~&-%`~05t1j8sTdP4lE-xDi=$KrS6
zJMq-~K`d8%vy$OnCYFM4tN`r<XsD5blUF0<QI`IzvV=}H0EYL_N5|MtqiH%;583+U
zZwMz>!M;aT;u&;ugU|8S6X~yFy>uzdivjvpk_9%?KJ|1&TXBR&Var|yM{$gXv>=Y-
z1Z{Pad@oo8r^xX!ngs^w=fV3pO*TT_2b6aviy@pP=iG;2Sqx)@f^=~hXpGSjoF{Vu
z7Yp1+X;DcLB*0j*X%*Jy0;5MU`Y9VoDz-X1vxpYN7{*mRh>!3w0Z2B(L(`y%HNJ^b
zzDWn)l;VqcXc?Q&Qh*NDX<RC>9;O|n#$2(kVw(%;E?Y%AuSm*~R-^^((nYqJQnt&M
z18!Eq=~BEaRKk#PWl7K>?{Hz+SBAw_t-vx?WSLVemg6Aj9V}N}5As@BpjH>4&N4tw
zaV(N*?c}nh>MS^bu9u3l=*qH}#5w4~k}AVul~LzLDa%a<%Pm)NZkGk>bO9Q$f$aCk
z|NrWIQVR5`1L#hvI6b&auSa%@S-P7(veCrPIGjl4p(mR1h$WiyNF>&4RvvqwQrP+Y
z!V0a;E-R8nRfCexGpbsYd>T>NkkvDd$_`6yOkT5UjZ#CD6rym50wGv5E#LNMWIb3?
c-_PYgictsm;tLAh%i>Gir^o{u*xlsee<Qo%u>b%7

diff --git a/server/target/classes/com/wuhansaga/server/entity/MediaLibrary.class b/server/target/classes/com/wuhansaga/server/entity/MediaLibrary.class
index 7ba4dc54957b4bc81a74c9763332945d0a687888..8fb2772eb05b87e05b64fb15b1b69255e22de9e6 100644
GIT binary patch
literal 12102
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

literal 12007
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
XrqHveFf4H-Z)|-br9?*HU*G=&akOcZ

diff --git a/server/target/classes/com/wuhansaga/server/entity/News.class b/server/target/classes/com/wuhansaga/server/entity/News.class
index 65cc530f60beb66781ea1c1f2f5ea6a62d510425..af0abdccab169834f9a0b707480c19e28c3fad2d 100644
GIT binary patch
literal 16466
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
ai;*TUQk(I4uh@zl{zskICbo;q$@xF%?SruZ

literal 15858
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

diff --git a/server/target/classes/com/wuhansaga/server/entity/NewsCategory.class b/server/target/classes/com/wuhansaga/server/entity/NewsCategory.class
index 306a9ce7234a79b698350f8a27d7b46397ffe463..00ee26b7c69261b8b3d1301077c7acb696445919 100644
GIT binary patch
literal 7684
zcmdT}X>c4z6@IO~cV`cs*2u=>SQA;YBN7OZk?kZ_<XAznjqN0mfbmEgYu8%MD!a1^
z=DzQQBY}hv!V!o$3`rny4j>0qLKVOBEBt}~RPmeQ2;b}O*_oAO@9>8zs=Vsg?|tv<
znb-YZzg_?F-_JcyM0@G?De4h4x=>%4xT{sM-KM={Pc)szn$wtYT(9b#nK<O!)ts_D
zXQ|#elcKnw(rJ6mo~YUG(!}BU)6Rk?sNjY`GmF5?2B6uxyEG{%-K=`fRDIDA)EBZI
z^BPrYPrCMsb9+UQ6sBE4nP$D=9d0Z-4MF`Oml+pN<21mTt2U3c=4;hv#lfQKg@%I%
z-G2sRYjshJS*1N*UBSwxqVX`9n5{3^wHtwA6Ueg4M*))!XT@$T3ra0IwF5PKNl@>S
z<AsC4@7XuHGxT8kO}8FxA#^LwjJsBCR_ANZ4X#`FY_D2(oBZ;%`pSHLdEzF=bsAWH
z5o^aeFc}iG)u03=1r=wju5+lhGVe5w+n``Se%@Q{MwRDU8TTqxaE{GJ-9Zi--s4z%
zF9tf^K<@@W$>j#6D2-j<*Optu+BX@L32Uca*6uVY%UXk}gH0Rk;P$tT9d;X(BLfEq
z4l}_XvgyqR<=MoKIi)w0^=~n#z-zGn7QMTyf15!?*5})JwS!yz#d#~%Z8rN^29>B+
z`6)j3W6NHH`q;v6epDU<)?RN=Kd+O8_C|FkSUqLX06%VTbK~jgA6<VqcHWBIm~*^J
zeesChKvX@af&I(DIoOiHu$$fycFgb+I!Sz)^Tc59AnHS5cR%RtUjQx?Y_+T(Vm0#v
zi?9H!Y$}}FH0vhOWNwBBQB=>WVuy&qrXz;zcJ6H1HN11jTdG1bx%2icLi%ol-b3I_
zFWBxhqgi=}L4!1ur5L@>pj+rx*1g}LF&bydHt0$vEf{ozk{p9Bp-b7iWKda2RfDcj
z(y~EUDQU%^w<@V_(A()9>~W_-lS*nDw2v+oB<h`YOFyxoMBS^%3dN~dUS9|Yq;-S3
zAi<&fR#do<rX(R91+G_tI&_AFwTo0<L4vtjsGaTwy-r(^lK{W=8p`ZX1EV}=fsv<q
z>8YwK*IZ2<C={U8uEZJ;D2gElb;?R=3B{pQ3Z$GmKw*`7P`_sDxA3R=W1hXRJZG=!
zqM5GP&5F8-Vxv1}_)Ohv&{yee*vunGXXd7{+cP++4X4?v;dU!-*uHEzv{6R6V?)yA
zcJMRh;Lb~x{h%s|BbX@%!OE0_xa726y>3oh)GSr@Un}j^RdLADkLYZQ9__fAmC2wV
z(@$`Tt=YAfbNCeMceptCSr@8Oy4>`kJNTJF=ji8xwyfC8xVYT~+q<pmA#iTfvt17<
z{MRs<_T0$z|ELMy>iWfSAof(<s<%%NP7Uf$jGi#)7xWkk+_8GAvEUr2@;%)f?h&r!
zHVFH&zh3v6Uc+8hwZECA^Yl!Lo)%ON8l|ecR$q1|)Osr52kZq8eHZV<vw|K7$6KQn
z;X&J7tU1l{Y`wnRTAjRT$U7X5pILP_f!`5g*yNOGiYdER<7;cOn53uD^cz8sgkOHN
zvl#9byDstbfn}8szBKJhyMK-GB$QS>^>c+~KUV@hXGdW1XDU}%uak1G*og~s#zpHj
zRkNE-r<tM`1nt<c3!B9?MK1~3esL&{iP{9Z6!%CBd1O!z_jHhYxTBIIdMG)fYmy_H
zAvvP+ks~@CIij<XBRUm1qA!snIuSXd^}zTBtc1%E{97<fVm6G?#AgDsz?c|&l13hf
z&_mnsmm!3Qc?13$3P9WGjhG3(GrJI77L5p3ZWp2*(TH$kcOe>$MucXe3(>A<MCdiT
z5KTlQLJQJ`=;~-h=wP}KT@#H64Nw=NYoigNf9gWCCmIpjuP#K_MI%CA*oA0+G@=`6
z8kxO5*DR3taB_`}KSd)?K-!pWoTHq6D%n`#${^?fv<b8y_(~$^COX)S{<5g_TyWa-
zDM>%moqk7Ddah$_`i!K%xjX%6RC+FtZThUFe<#g$3(l^n^jvk@^f^gC*PVVMDm@qT
zHho^wAL<^QtE1BM9nq#QNczLw>92`O&sR^Iz9{LB(7U?D{@SSYe51ALOOpO*clte1
z>G`5;)AvdGW8H&uT~vC$f7|r^lKy!2le0f6Jzwi>`T<Fgue=*$AA1P(WGim%*T%;l
zr9}MP_)8=nq(to8_=_awc8#5<+vF6&?T2>Zj}_nj2g;f8SE%<a8N1E+d3vvpIAJ9K
zIbkKu1Y?q~P~Ta~n+Y=+0-dx{0G+hbW{N>+4N95m5NO`Y05or9%?yLG8k8}!A<&|g
z18C7Q%p8LZ4T2N`owD)(ow5pMo<Ri-%A17{sA3fXs#qnn$e@x270przblU0#=(N>m
z_A;nXgL=)r5U6JL15~pH%zg$9Xi&d75CXZ@AV97)WDYWDNP`B=p%7@*+5*t3HEeES
z(69z=F^5B-hGhcOutrRiK_ePunj=0aehxQ7Y<<%vN@~~rdqliO9<^{}2F1&?hDNT3
z%HllT1zn8B#N+e<NO8JJ+)HO5C1_6EO&^4mq?&N)Ly%I`5Ec3`q%^(=&(KF8W$1n}
zMIVKP?<=BAAA^)bo4=ht4#}WD(d+aHNO}4T{hdAuser!nHTo2!qDa!K^l3;Xv4ftX
z&p_%G<MbGP7E+(M8DF?R2dQ5ip)b<sAq|K+Ez=hu4T=^y(6(qu+=sjIOOUqUTwhOL
zhBPdmMMrQqBvZVAINSqigua3}-9uNT(*LAFip0NYC`B>+OG6x1V&;D=`nS4=1dj7h
zS{oCXuEnNtOOW8q<-NX8&yeu<8oRfKH*S}QHCZ0;>jhlbwIqq{&=pZ04wfeO#P`Y~
zu&p#%K?z8g#?Mk}_j&sIN!FjR;%qSE+LGqNpiC#NgfyWhNT;-!@J;hpQks%&6Do!B
zTC`Hqgd(B6QoiYwm6oP-+l11gyed{knou>gSH?G;wzATcZJSU_lvmBlNfXM5_R9Gt
z*D|EZXqyb*v})z033Ww#<$Y7bDo9hIZ9=udTH7{FMtVTSSZ`2FOw)bz4Qx;X$@5J}
zJ(Lyu=zeTkj4nqqJOC+9`$U$$1u21(@i%%9QW8o0Dt#ML3di|bdI(aQeo7D1cOYfx
zWhB<akh1h=s?c{K<>((YN8f{Fh#|U~z7HucuEII^0i*&aMQntIUxy-&q!0p$fZ=ug
z4dy+p7^H*`@G<dDm4+olumHJUtHG&GaDd;$pk2}%TmrAnZQ3!jnPcF4L9=$xUcfzI
zxEMl{<StAS@N@xbD&wM50b6&RCd_vu3^*e}H7yrgd9L7ok$>{k#bs%Zg4X24Xyn0@
z{}&Ee0y+A~re7`_vi~AF$R+a``XPozd`{t0!RLfhom9hVXlnSlYPzb11~l^!pF;xE
z#lBV^)OADfZ;2agc<3jbr|I#{8_3R|aANdJd5`>xp2Wy~>T~$~ntqEJ|KG;*^dkL^
G%>MxK>ot7<

literal 7166
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
Qzu`>&ApQyu$X8+h7Y`id{r~^~

diff --git a/server/target/classes/com/wuhansaga/server/entity/ProductCategory.class b/server/target/classes/com/wuhansaga/server/entity/ProductCategory.class
index 18f2692c7cdb054a2cf688b69cb4038e7b57f000..f7b392023ac58d5aaa22a086938f1d1a04196dd1 100644
GIT binary patch
literal 9678
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

literal 9582
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

diff --git a/server/target/classes/com/wuhansaga/server/entity/ProductLine.class b/server/target/classes/com/wuhansaga/server/entity/ProductLine.class
index 479065c33d6f485f31d9ff8a1c6e2b2424cddd55..b893108fbf3ae72534127cf15c9c4c8fe1cdbcb9 100644
GIT binary patch
literal 30706
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
Do>l#c

literal 30608
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
XjB%qBN0mXp6<GqS)~Gk8G3);T6ulg_

diff --git a/server/target/classes/com/wuhansaga/server/entity/SingleEquipment.class b/server/target/classes/com/wuhansaga/server/entity/SingleEquipment.class
index 9214ad436fe1e38974d01589c5311ddabe32598d..81f48732ec425a2b419bb4b07c0c805825afbfb9 100644
GIT binary patch
literal 21090
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

literal 20999
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
KZ{Qzi&i?}!{usId

diff --git a/server/target/classes/com/wuhansaga/server/entity/SparePart.class b/server/target/classes/com/wuhansaga/server/entity/SparePart.class
index 3b16319828077387e3169c0ec1a22e47d9c948fe..7e114c4a9c8d6556dc94d77b3123f8ca643a8cbb 100644
GIT binary patch
literal 20513
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

literal 20422
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
T*C+X>a2JDg9lxG`hFSj)%FZtB

diff --git a/server/target/classes/com/wuhansaga/server/mapper/CaseCategoryMapper.class b/server/target/classes/com/wuhansaga/server/mapper/CaseCategoryMapper.class
index 05b10e80f03b9c8521a9fc1dc041155a1ad60c0f..a375f6a1a3718d317d5d4aa236e09f01fe203937 100644
GIT binary patch
delta 105
zcmZ3$x`1_q0Hc_IZ)!<Keo8=MQDSatNor9sBLh=r%4Ri2K}JVz1_lOJMg|@R1{OvJ
cUIsn}Mh2)5KUhcrQ%I0O2%(B+as`tH0Mt$l!2kdN

delta 105
zcmZ3$x`1_q0HYXFW(p&NfNyF^Mt({_Vo_plYDsEQ@n$tfK}JU&1_lOJMh0#M1{OvJ
cUIsn}Mh2)5KUhcrQ%I0O2%(C5as`tH0K<O_!vFvP

diff --git a/server/target/classes/com/wuhansaga/server/mapper/CompanyInfoMapper.class b/server/target/classes/com/wuhansaga/server/mapper/CompanyInfoMapper.class
index 56382daeb9a51000baa6109803a595ca35060ba0..9dd0c256ff67aa6cb1a40e5b12d0a7c7e32f66e6 100644
GIT binary patch
delta 57
zcmZ3*yo!0k0x<#K)RK(+lz_yd#N5=9)S_ZW2ByrEiQ5i}urn|)ure}mFfgz%GH^0*
NF)%W)Pwr-v2LSWW4TS&z

delta 57
zcmZ3*yo!0k0x_n{6h;OC-_(+f{FH#iqQu<PlGLK&iQ5i}a4;}1ure~RGcd3)GH^0*
NF)%W4Ozvis2LR%&4Tb;!

diff --git a/server/target/classes/com/wuhansaga/server/mapper/ContactMapper.class b/server/target/classes/com/wuhansaga/server/mapper/ContactMapper.class
index 6a8c17bc0c9cd7fd2938a1b810508d2ff6d12b5a..cd7820753ad00b9786d549923f03107908e79f55 100644
GIT binary patch
delta 76
zcmeyx{EK<Q3^4)U)RK(+lz_yd#N5=9)S_ZW2ByrEiR=EUvokO-ure}mFfgz%GH^0*
TF)%Vfg}A{&JP@JDml@Ro8O9Fj

delta 76
zcmeyx{EK<Q3^At66h;OC-_(+f{FH#iqQu<PlGLK&iR=EUb1*P4ure~RGcd3)GH^0*
TF)%Vfg}A{&JP@JDml@Ro2)qvK

diff --git a/server/target/classes/com/wuhansaga/server/mapper/CoreTechnologyMapper.class b/server/target/classes/com/wuhansaga/server/mapper/CoreTechnologyMapper.class
index 399f106137e9354844e2dba35e676c3ed47937ad..6293b69ae764b3bbe66235715a9f97712fe04cee 100644
GIT binary patch
delta 105
zcmZ3*x{7s!7^9egZ)!<Keo8=MQDSatNor9sBLh=r%4Qu#QAS5@1_lOJMg|@R1{OvJ
cUIsn}Mh2)5KUhcrQ%I0O2%(B+aubsV0O7z4?*IS*

delta 105
zcmZ3*x{7s!7^4_dW(p&NfNyF^Mt({_Vo_plYDsEQ@n#)HQAS4|1_lOJMh0#M1{OvJ
cUIsn}Mh2)5KUhcrQ%I0O2%(C5aubsV0MPLa@c;k-

diff --git a/server/target/classes/com/wuhansaga/server/mapper/NewsCategoryMapper.class b/server/target/classes/com/wuhansaga/server/mapper/NewsCategoryMapper.class
index 170b5f37db1b8ac8e92d6681c23cbd3114daa0b1..bf5b04ab333ae24506ace341d1c6b96af7fa44b7 100644
GIT binary patch
delta 371
zcmZ3$dXJ6k)W2Q(7#J9A8Du7MMYyYI_+%xPCF<uS=B4WgmlS2@rCV!4gi1>?bM$>O
zi%YB-890M8)AJHbN{dn%83M3qnb>NtrW90~SCW~V8kSj{nUs?nkXV$Mn_7}u<d~P2
zUy@jonV(n8$e=p;4WqmcSPp0`YguAWDbPrc;>?m%=lm2PQ@}U1BqKisuDf{Rq2S3H
zjDPEy8Q6i&W@6xA-~`e<j0}tnTtLiS%)rCI3lw2x1Tq*{7#a8&_<`b3Apx+EAcGJ>
sNEj?6f+-}*Acjx{(J0Qq#sIO{jF8Phr%8YvD9IoNq}hN*Ni#420NboZPXGV_

delta 180
zcmcb|wt$uE)W2Q(7#J9A86+lhMKB3zOe~XUveTHj(tdI@W1ygbZ)!<Keo8=MQDSat
zNorB?<W-FSs~H*Cfm)atI9M1NI2pJY7#Vngd{#yVZUzRR5HABCLWmzMB!DR-$RLDJ
d1<@$Xzy=h8nhi8x1Z;~agBXwo$%r#B000lK6_Wq}

diff --git a/server/target/classes/com/wuhansaga/server/mapper/NewsMapper.class b/server/target/classes/com/wuhansaga/server/mapper/NewsMapper.class
index cc2884edca19b871a549035fdd161056ab55d513..e808518dc266317a453e3f398a73ae37f36fa609 100644
GIT binary patch
delta 517
zcma)1Jxjw-6g@8=wMmSPt!b)OtEL~nKoFz|3Q9M{*+K0?1Er!#2Peg~i{YXF!&T5l
zCwKpb;2#igoA83VI9$$q_ug~vIYaZ#Hs8J;p8>Sdip@RN6CX-FzAnZutIj%uu^*iD
z52L{aXSkK4ch3sK-N8{W2v2#JAs+@2-#Y7ZanF2qAorT$lfAN?<ll%N`d%sIJ$@WX
z?&f8O_}jEmjfaMC6<>7Jn~I?^=*U6E1X)v%he5ceizm$!ZOz(XFu`DjC=jGi2h+6V
z>X;<3sivq3R1QFTMU+VCr_Plm|6gYYF5MiR(izHQX%CgGH9Kz2{cX*onr$USdjX3w
xWKGnx)_Ib`R%MFB{SuZ__nwkPE@#h#XDA~}Y2uY%2T8!Ep@KRZggGKNfp3RCMk)XR

delta 345
zcmbQr+s!3#>ff$?3=9mm49e^bOpFX_lP@xfPE<9UY|HF5@e~hZ_GCL|x5?+2)hA~%
zR!;uSsK{sm6fvJ%$#jI#6v$E$(e%kmEKAfcEy>K$_sJ|Sv1Vk51W8ObVl<x|!qOzj
z!NSPE%D~3J%)kz`h>3w?@?TbU89oMnAdi=sfd@nZF&_g1P@w>WAOjOfK|KxyLJYzT
zj9|U2j0_@RJ)#U^2qAH>kOZcXB!d(}6-1*ngACkNvJ9L+M~E{4)o=kZ_vCO^esho$
gIhkNi1UgR+%@Ck><bi6K7!(*3fixRXrxF7L09?l><p2Nx

diff --git a/server/target/classes/com/wuhansaga/server/mapper/ProductCategoryMapper.class b/server/target/classes/com/wuhansaga/server/mapper/ProductCategoryMapper.class
index fa83f4379cfb9b7642f061dc5a18e0dcf9ccd81c..fad989a8fb33fa7e48ce51be9d5191750af90113 100644
GIT binary patch
delta 181
zcmcb>et~_1B%>HpW(p&NfNyF^Mt({_Vo_plYDsEQ@nn6*gOmR<uHnqhPbtkw4XG@c
zyp(CGBM$=u11lo~Hv<C;BLgo39|I!;REQreB!DR-$RLDJ#XY&2S=x#nXbKa97=t*F
h=3xZNN&vBBF@qG$Fe$JCX)r0nAPc0~fGXq|7yyVC7kvN#

delta 183
zcmcb>et~_1B%_#sZ)!<Keo8=MQDSatNor9sBLh=r%4B`UgWO!X`6;D2sUejGsgvI^
zuA97)X`&-H0|NsqBLfcu0}CSqF9RO~BLh^3A1ow*DI~}sgiysZxtdwp3aUj6Xc#*X
lGckxWNC0UbMxa7TAeJg-5Ce)zgXLrxWPvmrP*{$E0RY<H7uo;-

diff --git a/server/target/classes/com/wuhansaga/server/mapper/ProductLineEquipmentMapper.class b/server/target/classes/com/wuhansaga/server/mapper/ProductLineEquipmentMapper.class
index 73662ba35acb35d4f158a27e775eac6478ed6ab2..83813a9c66beb1ad39573fdfec1f3ea9cc420d63 100644
GIT binary patch
delta 367
zcmeyw@rh%?f{AxSCvMgf6!1+g$;eL$NGwXsO)W_+D&B0sXv;XchRK4LC$+FNvmiG$
zuf#K@c=9Hu-g+fw21W)BAm%J);6gCD5lkKiUIqpRUS^;)0|Pe@^Dr>5Ff#Bl@G~$m
zu!H!F2*q4r#jK1V#Xv;@SQT-@6mc`ugH#DJ2tkb!XF@g#?l6c3P9~TWfO>=(L>QPE
xM1j^bF^CazhB$)+T(KlrG0Y-UG=EEhod&f@3T(PGn3Q3V1=4Il=gBcJ002WuAb0=(

delta 357
zcmeyw@rh%?0zm=a)RK(+lz_yd#N5=9)S}{vpLHfK2;FSNXw5izDHH$XTqcXjTbR1*
zd6^kF7#J8hftU-3xq(=TnSqgk2Z(u#fpTyrCxXev!pOkKz|X+Mzz$T;$_O?Bq?Lye
zp@;*hNB~(8$PRQx^_)Oef($}Xqd1x1t^uhOXF@U#!360MW)NXuMz&rQsGf;I48sPH
qGsGDrpo*auNCFjuHJCC;fpy@pNfKzJG}vGn23a7@26TiR0|Nk)KODsX

diff --git a/server/target/classes/com/wuhansaga/server/mapper/SingleEquipmentMapper.class b/server/target/classes/com/wuhansaga/server/mapper/SingleEquipmentMapper.class
index d391a1100fee8976eb07d885bce03d1c7fc16ecc..8a43999c225b56a3a3a6034b36520ca6ad0e0407 100644
GIT binary patch
delta 325
zcmaFJ`H*wM+=<7JPuw6bDBzn~l98VhkXV$Mn_7}uRJ^%|(Tu5{iGhQGlYxOjoQZ*v
zfeVPaiy3$jOkM^)pd=>~P>g|rmw|zWk%6B<fPslbJ%S8EKr=x`u`)6UgN+ek5Csa=
zL&e0vV&Y&i6d?%)Npzi34AKnD4D3L|m>6Wh4&h-$xR?iK4ba6v*UI8mET;%lEeAGE
R9!x4QC<19VpqWYx3;^><7fS#D

delta 345
zcmaFJ`H*wMTnz!=)RK(+lz_yd#N5=9)S_ZW2Cn49lGOD4qDs#cMh5om)XMVwqLhiV
zPj2pGG-0aeWMbf8U|`?`VlE(NV&G=r0n*}342%rCK+IPRl!r4pSr{4k83cgJ*g={Q
zdI{(eWDo)x0@B0E$RNzX05nE~K@=!d4;2#wi;089P=q8HB++$BF-S8o!wdsC9^!Br
qu)}#65w7I`S|f|BSPnz6B0{ws&{y(61xySI42nRS4Jf6=zyJVDVjSN9

diff --git a/server/target/classes/com/wuhansaga/server/service/AboutService.class b/server/target/classes/com/wuhansaga/server/service/AboutService.class
index 76b3d616bf79d4ac7d4e0661fa0b219db7f856fd..f3063c1f3637443866a2550cdec67ab2cbe862dc 100644
GIT binary patch
literal 2099
zcmb7EZByGu5Pr@WRAeQ*CA1Xs3Jo?+qrRn0Yf3^$LzIX>W9oeAm$QACOKiy_oyhR7
z+L<;@`=LLeKdRF`NwGzcC)6{RbbGhYKKtz6{`2o&e*^d)KTV>5F#|;l<CtKmwEUj^
zDmvs|$UEE)MQ|j7_$6Dy-fa4js*{Zt3?;6YJG|c)0eQN)uDy6W@l1}^O85Yi222Yj
zSPZLY^kXnX(G@M_%1|+^l-(Enh}&K6b?mwdq}Qoc5>upP*Vd=vQ0Fa7={Qq~_g>WO
z%J5LMHH{eyvzQwo-#>QR47an$t{>y(aulAD>Nv@*X5u2|4SZ<fBP=kSACl7$48{@f
zMq>AXVXpi*B^q;&BbZpkl7UMWF5?QrwfDwjm=1;7@_T*m9XsBEubI!CX5KJy4c84U
zYhEi1GecgEr$k4WZocef38i+*Xc0FotfEZmP%tMPXs3NL^1t<{G_<H|7OJ?(Fd;qa
zA1c+2a(-`|(68cX-&+>!*f;98xf0s+xrHzACDo`+)mI{^QBJ0giQD+vz&94|;9JsX
znCWiw1@#RvT9=+w8w_LRN`s+DjX>7omfxm!o^qupo<_Z<2=;liOO{#JZ}Dz}2U4$7
zV^JN-kfEBNlD;tS-jo_$m5|~~-`hX#$GAgkY3CB%9ia~W_8t#-kJ1b%#$;V~Jg%aE
ze4MP_BiemEpVJAMH;BzSop+{|Mn|Yb)`Fxin$A=<ZcfsRw`t>SbtGXYl8_9`XJACf
zlgcvO9MLE_Lqyka@mWMSuqPbvNQRP1wCQ=i;#z1@Z`SSly{7-t-WHw+sF~W7x>@(5
zpd}tkUEi7PJiDc9!myBHHgXWlt{-&lu&-y$fiBZ4KX_?}R4m~us;r%k#u{C@0yQH*
zEc9HZFN40ngM~5FXmywN3-m6n{RUS36Gj2Q(6WGadQQ+$V1}kMFrOU52D#{83HPu`
z`}gU4oY4Z<qJIGo$oRuZ{Bx)AFaCf0hnS;CdHknO<1dWB-^QaM|83$<y^Y5y?$4x;
z)@7+`zQKjp__$hpgR8IcNvcz&fakx)`D&qNQKaW3nh}>VjVm;+u4aNR4MbbQ6S%{m
zPsoYUn0XuY0fp2-tu)A|CxV#q-ZCk_k^#2{;8q^^4zWp;dKdh&9Pm{FFOLAvk?Rhg
zrfsy5GB?-$z*lS4-@%6BBwbX>z?uWjX55s6E*dBGc1Zy3vPbU%evF^bP*1J<z<)tr
B*46+3

literal 2099
zcma)6+jiST6y2jZQ6sCl(m+UP8xk5jE)^8Y&1u>+z2KlUp$_JSm$5x@rnMz6X_T(~
z6|4oN@W2P~Q7q0#s;xB2s`a3`@4aWAGw0v`{{9ERUHoLiU?{izp7Sy~=3dA<+zCZ+
zB7(S)E#Yi8{Ycemjs_+Q3^UL933s~O>p1((=c1(;id=8n<Ndw}2+z$0?8VCoUb3~y
zQ0U5#0M<(G5VfuX>2<2*WGYg!>$tRwc2Cx2$Kxsr1Ve3vBb)h3gr}rBO_Wr(w2B?S
zEhfQm*~T~~ikQZ%i5Z6V5pQB+4wo3LP;|)<t(IZhm7aJS^_n6$<jpQgo^$;c?>2ZK
z^*Eg@sACy2RPv?jV7wg#5?l<4M*802X+Oq2XC8%VPpD(ReZT|W6G{Zcaao&v5H+be
z7HxgYWg8!9;nRum!5V|v5$eHdt<7*JYqaafk;%2?jIA1d#m2|DHn1guGbCZoWWpUo
zGK}#yE!-&O`)~%k+^|r>hKVx6)bQ#W$VLS>N&N}$Mq>YnVZOARCQ_WSF`0#1_{@aE
zu=37}*!Uc`NpL9Cj^FEZ@3iI}`P!HH^S+R-FY%R$I}Ec!T{TaMjtI20uNf9fwXC3Y
zv8pwFYvVgmbf<`{7G{F6kfnNaqTJ9P-?g!YdkhoOqg<i18_mHQok%=oSRKJ~+8*`W
zTnWwj(8hz9vrXxqOg*vjJqXlFrjk(SIHY+ur6<)E!_5m~ol_{v4Thy>5xv`<sCg$c
zl=OhMJ<nHMKLg6`Ik)Tgn*IytiSR@~Lfd5N81`-K;()TNq#>-j9|bM(SnAg}o2_iO
zbhsE6Q;tRsL&^1njuZBEaXQkE>ZKpNa6)=o!dLVTowP_+u|kz(j0!BN(&dDDCiP8R
zqS;9r8L&{K_8#>NYKt4c!>;^=DFeU8%k%V~pd-L6-lP9QvJF?Lr@tcJ#|N~&Nd0j}
z1I_i}JMov!<6jva|0=GLj6B`f&*Ls$fV+ydq3+dK_b0fK;{HPZXg`)K)@!W4!l#wO
zYkctv-=zL*8u<A)S~s8#nnQv9RK9Q(Go)<^*E6Kc1GAQKAKOFH`*es={=Ol7NN}3e
zPDysokXZ5BDqVXm18xt%?L6>DxJ}2jQ*VPm&H-Piouv!FbL`s14`h=|;5tM0sMSPU
s=`E~{Kk;;<@(1jpQAs8hGZfZ9zZECwAd|+)NdrF;pn+$orzD5K|5EJFlK=n!

diff --git a/server/target/classes/com/wuhansaga/server/service/AuthService.class b/server/target/classes/com/wuhansaga/server/service/AuthService.class
index dda9d2c8c6bafc69bca3d35eebb7313c24999c00..aaa6fcdc46d885b057818e88eced1097a8d5dcfe 100644
GIT binary patch
delta 1201
zcmYjQOH&hB7(KVU>25kV5TXP{n20DsAfk-;Kt)GT34<{Bz+s*SXhTBmFp&71nP^#-
z%Q0S8mMa&QRl4w<FqXP=s<g`T2e`G=S<c#;n(sCynML3JzH`6t+;i^ZV(rD+x|jd{
z`3%4gT&RQs)quuP0X^q!&kgr_Jup#ez~b<LixJi#&aqKemGdqWf3sTVyP`CjUidkd
zV5wN6to8&@XJ8q}a@30vrA3@kS`IXz(ZClRL9Aq`NkmUXJCji-)){fqcFdk*Fyl^o
zESk*N3~Fmz#KbBF|A&V+-~Ew)m%snv#_jhv&%eKV%R&IFIo6;>{G+V(w4%*Gh@%}H
zBB(ZrJ?bVifOQ<5ST8Q9&7LlNX<#EqH#UhoYS3h;NTy<ON4!z%V_S++GU<4-b09iD
zy+1l@VKaK9nQg9;F%vteDV>_J9SdF9$*~J94BnWXJ|sa`v<JJ<XP}>B5BAceYtUsS
zMlq`OWd|7a%)C7pnKCg*c4h2DkK5AF5XXMW=^@U;pK%i-ROQ4cXNpy$90!V3!zH{6
zhd2&Pu{s$`WztgQ5sq&$&fp`$A!#=vF6q?`-{S`ZKXUwppBbvkhcJ|KV&cBO$}|z>
zn82iXtM3b1u+d}S7}1nVM<x>XWSXJ7Rrpw=m{rZ((;7|dOHDoasBLGt*9oyj-zu7o
zX>r*|WEJ87=p^NRqDZ5-8!@PuCb*yS3PP`k9)h(mz)&z8{tLb*@Q&B8oWDAcn&;ui
zsC|KY`Fo5N*NU^k-y~-{2yZT6Z3!=Tg$o$m@C2L3^Vr&>E!X_p3+P?IS1OKBvX2_W
zr7S|(*QIQjvTusnT~~HoyfSxY6BKV;l#Cf9DI@V1#Bs7EBZne|o=FZV%#z6o^xzlF
zk<EFU=Tx<bqzTCoVnO|c1_Ob{I-H=qQXw)B4RDe^1*fQm4wpvSFJ!xDkSl2g9K7ci
z#A&ps5NM<ILXZmOI&!NQ6*8R0na>1+RHM?Izksn_a?^tae7At33ZzQ~WwtQ&uXEV~
zF1uf{WnJ1T4B#vgGI}Gw5}j1mOGQ$I70P2O)cy#pEKhgkRR536Ds7(S-V5fMub^iJ
YAATbm+44L6704wOoWpsEimavo2VREa82|tP

delta 1233
zcmYjR-*XdH6#njJlihCCk_1wu5-SuTKL`=6NDGt}P)I2SDlJw84egpH4V&6-@HZL8
z>9c08PmWJMF#dQ^L6U-_56s|<{|5u(jDLVLj^lSXP3z0O=R5bD?|$dpv%3;siAVnU
z_wKI%j^I-Rnm|(SH{y-l<{ksOK%`u_R>)NfZZUWEO4*t98pnoBfncRtEV(iq9Fi-c
za<6{8I_Gpj;0YT+gu>W_sDX$;ie#yvjTkmJR?qA4HG0`E;$o{D6bW++w%O>#Q}VLd
z)s;Y>fu{xfeGPwiGxHhjkhjF{$$mU*V3$C2Lr~uJoT9U2V>k8)m?hVnE>vocKp>gQ
zn@9=79^bzC@U!N_=1-5m{{GR;8;`#D#zF!a8+(zJ8EsD}hy4bglb5s|yz6<qAg^l&
z%miMvaR4vLU$p+vAPyNAl7DJ_j4*ImMgzU|;f|1+SE}Sr6_)4E6c#P^a6}a|>Pwh5
zah#p<stb;5VGu9dcm-MZsOWeXl+#xm#wm;$$kXpv<`a_4#%YX`XR+o9988XHl+AaL
z-vu&L69S>yva^(*GjWdfE88txbyS6uHeOYCg?ZQ1n%~3}qukQ$LMQ5?jn_I+6K(&k
zeDJV{hWNbInx|BkY!opn{|X%%Rq(0}7gf#$iO1Cp<mX10$E$A9FL}(uyI3}`B+$Jf
zSRLE&P?L3ir@0C5*?1ox$Zz$NGHJ{QEd($kKR3#Ca&Qp&Y-)&T>9h@)^mY+xun^|)
z3HpP?U!`xu&a9$a!$kIXMDAhBOjI;tJxx6MTlNmNKR~bA?qKJaol_Z0s?)vnr(4*!
z?)S4M{j`A=4&K9&nI?`7>D%<!u@+9O;$#393C=KaU>%($I=_xC5KVW`55D{vdEY!*
zf1UO~TQc6jn?w|kbGXFvly#Yw#?l&i3vaX7D;Pq7tBzTo+l*>^=IC+gVZ;8xb_0pT
zR=h*prI8GzQN811ab=%4%?bl`y@mN7X=s??YH<fryeAE%O!2E$x0MN$v9Lxk#u)V=
zu@)*Ls@Z)lEUx03236hv*|N;v=d<<r?6EaA9o?8H;zJS&eit8+?qjBgh(6)2R1Pyi
p39`~nTu*0yhP@$G#ex44C9_RztvAr}XGHi72=X&SL{_by{{RyS=Ue~)

diff --git a/server/target/classes/com/wuhansaga/server/service/BannerService.class b/server/target/classes/com/wuhansaga/server/service/BannerService.class
index 08654da1910df285699e4834e76a42f0544e8dcb..7eb3ebd5f79786e242e8778fc2434feffbe60f73 100644
GIT binary patch
literal 2260
zcma)7Yje{^6g}%aL}USZG@)q<GzkGe0Htk8X&pjIXu#l*fWh?jMYcDNh%I?!IZXal
zJJY7n5B=Ji{-{pRO7bJMGPOP9ecgNRx#!+p|NYM&e*(CNpEM){G8MOBzHJ{^PRpuU
zW=ncU(hCN=BF#<9aimw|CRZ9p1t#BEN0wQ)oSL~?ej_WsfKd*tcC2PodPFS5LN<cq
z2r;zH35?e579mzrg&uC+@nubVxpcVK_U*b^pc&04igwMh{I(|ro(|))9#2L(zU?1J
zWO5sd$d+4`6A(CWU<~6)T*Q=yNrBX`*%+9{IRU*T>y$+i7Pwfj9r>)?C`<39Rj!lu
zbiu7y^^)b;Y8`Ek`UiGP;AT8oRg-~YkaE&)?X}Ak@IY1tW?~d%xpt&~;8yo6&uU0t
zdW>>jN#5r;or)3q?!e}dN-E*57`TcBW*<t?7fY*2fAcs`x_A1kS8$yg%N?uq=~5~9
zWdql+*i|~jOV|XR?9(8?6d19pJh+h>20UHTk-<$3S%C|^epE;XZsE3oc4XDta(AC{
zr=CQz1$QBcrehVKY4}uN>HkwP@Hy5<xh4HAx6!nm<Gi!)Drsg0r6I9Z+%fPa?vffs
z%=edmwo|NtO6U6M_!{dP*eFxIT%tpj&OL#-RK7onp64p=8~6qf7>xW*1)J+<*YQY~
zRAIIZJjAyG<F><|W%~~)d!8;~nFX#5Qz$lZ(YGpxd`6-hG~RAjEng}YPYvV)7FAxv
zaO;_YUF@-A!mY4lVq{iC)@{f3Hw12-(K2!GSh^&z@S@E}r6Kdqk=?R+w;wo;>s!9<
zI=pn#g}U1)yNBi@$p@88t2rGbC>eN;*X+`ig3ya@+pEZJJ9sEgy}h?p2?ge(Af=cP
zse<d(%vRI0o!Y*-?r&Z1&}{M2OV>YcN;7)Kb6DgvH^Tn_(o%07XBy`k&T)5ws|0i;
zIo{_i!7-Wn6-M?wE+p`Ca6H4`ak>Cg_<+B2p&4d5Q=cR*;X|I!b3P`xP_aJ30?k7F
zj|2QQ?kW&n;lIaaF#tasz#E}e1TXLjGf2cTTpDCJe+I)9TqkVAa3x@P1E~nNNhMU~
z%US&$(kC#pC-~woB(tOM@YM-6B0)A2c>N2_MxYd#qnN;D%6Nrsc$H}{Vu|0LLd#u+
zma&aTjQ=?B7MD6iwz(GU-wu(7q@joyQN$-v#6%EL56)I7#r3`@MmLHPMTxQu!3$WU
zo2u`B!FOW7)3nT-0UjgabG)D$MS`pTc*#)(+K95yGr!|iCi@!<rCOLn*hk5}5PFxt
Y9<*n-N@JL$(|3XE_xORMa{dwc7eS;3!~g&Q

literal 2260
zcma)7Yje{^6g}%WaU%=zB2H7vD<R+qpgt(2IE0W;sKFrtQ`6TM+1@xJw&aoIF!@*Q
zOq)VK^lNAMQJtQZWXDOAsmEhk`?%+xd+yowhkyV28^C@1GL8gBQb_6;#h5_8?zD}!
z-5t~R%%*90(%qA8@MG1bv1Zz~bSs?XNI<Uz;|;UZkuGD)vBB+NIf@PU7Ss3$<0)u5
z($EF6!v+dyo@~jwU$#77U@2REWA2$o%e0$D$@XPay2V^L*Y&NIp|%Cd&gz)Jq`*WN
zzSXU@EN@3P1g5jG0n<8WaIT+kZNJ35cLwv79lOb7vDBsQTmF7jb5TPEb18hRV;-Lf
zoIT{MFa%P2W~(bVw*_XhPa`%#NkIw?pW;Fa7j<01Wr2nNPbe_yNq^mGcT9V~WN$l)
z`^-u1RRz7EV-Z)$sww@FHz3SxPnaX>YPg2$DP&bGIf1FeS|a@gGTG8#5xu^sWCa~J
zaFfZ%??|%DAiG{fuBv=u==cnu3yfJd?Z~cQ&kiGcuB3v$)Nwlq?sgicFV)l?9be-v
zJKLa>d>M8&MxBy|dnl%`tn-|#P}9RwH*0U`K~h?_Y|H1`NH$j$NYYcBO|Cl)o{ovK
zWy|N?c1^mk%vy^x(`Bb_wyLIUsc|%!^mi;z;6{8+>HwZNc}0P=HQ1_|m}5Y~8`9r#
z8e67owppmlEaMfcX`6o6C7Wllk{>%f%ki|1`g?_h&Zyc4+;g|*p8h!;8Y)F6hFwWm
zH16a;alwJ0+-8FdL;8S?84LLeTpgwy7E|%f`Y!LPs7GU=RRnIHV!gOKPC4TI%Pwz%
zwk+9umS?f)4{h7=P2X~Cc4NBSa@sX#*LWg%t<s(i3aM3`u3MLnt-vuyZroeSfdcap
zXf*~hTXx*0;dNZgZf>i-zjfSQ!(;cQ<L`H*5nbLzT;aukkN*Lrp{{<urTG2;I!3U{
z(F3k0_?yoE4pDfIR06+pn7~6m$G8=k!Wy5Ma2wX~h$9BzTRi6a6TXiM4uJ3YO`ycd
zr<mm1D#y1uQXrbbe~&Zb1pI6OuZO!L_z>wC=gK%2AsuHrb&~1)DNHx;oKO+d4YCo~
z#8!mcp%O}g#e((@vj;d|IKY*EkS-+OVd((*NSIp*y#9^bMgnCr6cf0>d*&klaV}ww
zLND-hsMKO#sYSfNOQx&@(PFMg<ORoq0`-VIA`L}Ek1~D{Wej_v1#3&x{n|hly`M#o
zvP4ye;ID9*VXFi^4*pdPc#h!tQ@~>+ypQiA6Rkwdwfvv>CSUjiLMb)qq4WT(*5|AR
cmh5+Cl&+~VP}%Nv0PsWb{1HDzvp)m>0WY2n%K!iX

diff --git a/server/target/classes/com/wuhansaga/server/service/CaseCategoryService.class b/server/target/classes/com/wuhansaga/server/service/CaseCategoryService.class
index 6209f1d30e7ed7ae7f7bab0199825d62d9619afe..0c1090640fe597d4d2651367adb281c62ea8fad5 100644
GIT binary patch
literal 1984
zcmb7^Yg5xe6o%hzfk+y;i{f4J(iSD&Z^a7Yty+{32S0DywXCK|C)wceuXM)y2Y-M+
z%JFOxOOVvjFG=?HocFxvWPkkp_8q`&JQ+p~c>@C$1~J5Nq3Lz(x8VkN1K#F#ApA|?
zM=#kF_A(E|GFPJQ`CDtWL~{%i&D87)?{<YxoO&jx6D{xH#3w2R?7^@B(?S6j!~Fjp
zXBZBIBbsW-aY#|IRDaDkxg9F$*mW7G2tQ(BRI^9pt*c?fk->&&>CodACNRlh#%p)C
zYAuF^VvKRP+qUbT+pd(d(-N+dYHLSY6%+d~ZD7BJ1DIhLj|4@enoAC9lZ;L7gyPvN
zhUsE0k(}N^j6*nV;E08zIL1)SG$kWA!$=@hE$F4FBcyUk6jVy<I`<P6PGXi}NV-&S
z#c;m(?`f858gbgfnFtYfTht$Vs%W8vGCA6!!YC0tI+<1xJ6bbw4(AQbTd;9~VQkx|
zXN}iXQWCZxU8$-J`C@6EY@@Qpg&tV;TGWA~b?J(yVW%Pd7rf!<o~(OK?yPfP>TxnT
zpf+T{a49=E-RgaMyh81@CfhDop-=GYuJ&5UMrKr|QYF}4oj|HKMq8-ZpPZz&8%tFx
z@`$EZgxc_0tK8=uGSjCt^1MZR|EpBw-B7HFq5SWX=~P@phK%|V^m3nm>HoLuG9G#!
z(r?odHFr}6lFGE?x}M@ndM>3mQFpvf!+T>t6t3{8r&?s3x#op_Q#_Em#s@NPqj}vt
z3^NIOJp){<dw$yvy1sPVue6<SJ^zgzkg38`TU}u%7h44<=xRJiw<L+tmm_@{^nDQ)
z&0nI?6&f*mo8=E+Utuu3qfri*={XdwjME;_{%9Aj;u?*vM|*D2+|7QZy}L>K{z|%q
z$wbo~dgmxYL2H`(im}`-Q8N*0I^LFuq64U4fkfS=!-I?lI`1kpPv^RtaHr-5zF_JT
z4krBLIlO#N>v7g2$kX=``umTPqGPE*Q@ub_Sj5tHphY^s=<@g-=w1@YN&=kP5x}HX
z&}~(~Yzl7m;8qs=E|%$-&f-t_*$ns@f}iaJ&#=fQXg-2h6Xj<4Gv>;3AHlYbiQA!&
h!kRtJX4G6g=La!{`=nJLc|h+R9!Aecs3o(HfnVIJ#{B>Q

literal 1984
zcmb7EYje{^6g{gvOk|N4AtmM2(iUu|L_ABu!4SfuZcWKF9ryFvUL1ied8AdC{3|-s
z2k?O(z>n(mtfU%;C{y^N)$ZOs=iGDe?z?~9yajL@Kb2q!T<V4c_eHWJgIM;Z8>?tn
zMd{#mmAffpwJEjghtb|Px42fqq`>?$xhq{?27UKQ=b7qifyM4v>|;3`s)*>VLij<t
zy$?M*Q5PurUaU8KpNN%eE9FVF=esQ~b9-jn>jzRNkrHSe2v{%XQ-SvM-afv1gJ6@J
zVNcCK;HZNsOqVf-g%aik);>+PgGC&nwpjV}A{9T^@&fg9GU%x2SK0BYcCi(9rQep3
zXXg3hq~7sjfh)zjO*IZF1JxfjPHiO}4m+x6#IHE`+z6S=gpBs+YG3Jld(ED}dL=V8
zEnX`O`t@otd68*`<cx!}I3-|bBpIsZ5qkbZWG+2cdME5{$w&^ARuOZZkUhp;tb9Cc
zwQb`(DkWSHSa{!g&47)mA_rB}nBlJU6ZPb&z;dOTH%^*k9#*&UE!Il7C{QV^Zb7~d
zTwD^Ejg@Z3V{R^wd-xxIwQbzF;@~Q-2~2wdtH*osNr^UjFw-GW`*?$RDjD{8PmO|`
z4sN6hdhABc#yd8yHmi6l^|pfs?y!(qU{=V2U?XbX3q0KrxOzz04!_aWw!q0>65hap
zY6iPr?6Lbdf*{mVdttzaSZw*>pc6iKAE`h^%%aCyP2hopyLiZcsTc@*J4~Xkdgz&}
zbfVy0S~HCyu#!`?3y3PMFzUPUF!F-_Q`3+y!sxjhvn^Gq_lC;NpSU`{<eM<TSCZn)
z!@$21|4TRm3p1Qquu<lCjjMvAUHb#hYs?C~Om~m*JDu(<V2S@u7KP(j=1kzT|3f-)
z5b1a!(n*}68l&Y7M~h?GXjy%Y)7AkoD=EZs7M6?Q0eq1re2#~w1Sdw}SNJ-|-O6#7
zRwrNKo4>G{<6pM$+wY9EV6vS}{W{IO&TxKqjA&^@w1n&Uj@UWT^_1wwi0FP!<m3e3
z?<26e3mz>~nz1y?!Wn@(Mc}tk=P~2Xhv4f4;O7~6;Slfwi|%5BN#7&5DfK2tL)6H#
ruxo$ger@$nIPXo$TB1BgVUP6NX`_wInZi7Q9ud&O4`}8jKLY;(nxMi1

diff --git a/server/target/classes/com/wuhansaga/server/service/CaseStudyService.class b/server/target/classes/com/wuhansaga/server/service/CaseStudyService.class
index 8dc84efc85e3215fbc06a9642ecdc399fce66ecf..53293da469924a5a78d146447f12ade08c60b95e 100644
GIT binary patch
literal 3106
zcmd5;TUQ%Z6#h<bBVmA)n~g<<DwG81)Js(wN-b2{#84<fYO7W!$sr6RGdLHz;=4b>
zf8e98rLE{%KKSU5a=Fi$VG>AKfKNWm%$Ysse0%S2fBVe&`=8(c1aKQ>4<d*vh^dGp
z!7x{`8rpMjM>ie4rfUwj54bHKMult3y2DGZS8bNaP6md7%8_YR-{0ppAr!kpH00+N
zf<Haii&xO2AgQ7kD#OeL)-og=Ugs6JXgDsz)9K=_exPf0-K=Rv%dF+v-t(r*YurA=
zRB~;D)@A&Ko@>-Kft^#(&oI?BG%_|UQ(M<-e1kh)-R(sRmlO=D7{V|^zl<q_Vu(4$
zcf?zCI+IUg6t60{tRjuq7$(nh@W|tKlR>F*SNM}41pzXq;&p)_zLW?)i9WokVjL3;
zi3P(n+(m}bfS)jyT%l0NY>5KArQ&T&QZao#*S&JxaCUf=;pTZr?chsbUQ;oROjx6(
zW}e{YJK!?i)xu5JaGNc)<dT@dtb#ce*P$_7YLz-DEoFb8*FC<rEmF+~F-b8T6+el0
z@UDXQRJ@Oyr}2H#GnLTcZr*7l<%r2+;69Tds`v==#JXWp>yRq5)8|YulNYSzR4mB#
z-hNegxiBrNxPy<0$SR55<vx)^okWtHmawego+$h$45=1HYvo;P6RDRiQsBN6&kr3C
z|FvJbXV}&mQn=JsX9?Wzpd5v`Y*k6$14YB+54}d2+naj1PL{!<RnhBPx^0N}z!-CP
z42MDMjxV;bZhIHGNmhvCnq^CErrOe%+XsC&oHg419Ig}mP}}z-Mad~ETz5TNbc?db
zo6jwqMuTmWgI$Fo{;l7@*SZJVK^Otryh3>7J&3N=yrlBuTr~HO_?Y*dhjSOY`#Y)h
z+#*quTIKGJRbAI@y+LZT$#qZ3sF^ZFhQI!=qPa+peYCr|ZT<Z0JV~A0<Syb+?8|=N
zMhp^1RIk$g{5u2nY{D-V!ztS7s3k4&_X`qkM|v4Tym89Lbjp8PEV;7b(YD;+dGo+<
z4C=qTrfIplYgi`9WUyGb8f9xwyU$H-Q)5*{hm|bPuJ9E@H1EjC<HL2aMKPoU+^sIC
z(?!d!Y0kd*F>eb^Qh)7f4k?pcE=gVsP9ix>&_QO2&NLK>ILgpSq45gtBZ>#~_9J@8
z0?cNA0h^hfOUDkO#BnR}2l}3*6Y0bu1{l6i$6sJX+^)RD8$Z$fDDreq5<2LYp29E+
zG<x7;;ZqdpjZm?QhvZL;*03&T&*Bk{qSCg35@K?+iO(p$6vnWH#}w!1WL0UUZ+SwN
zr(_w46Cel*1OjZ(wMo|(bVcwbP5%m$L1G1Z3MZ<c*deY)Ap(!cz!Ng4%QEP3e_j~0
z8V0S(P$SZHPei&FZhd#p2;ysG2vG2Nhn|9qUg_=-Q;`mDW76BGKP~jui*F=FBE2}H
z7f~x6<p5W3CUA#mV!t8#0yhHu4<dN{Gui!g`eh2^^k1ByYFuq|G#ok_Mg>*E4jfga
zqlM7Xy}*&r*CB2lbKn<xl8&QOZQyDMu66_G*d|cH&PnjwUBEL0o;?M;3q|9oQPKi@
xF^D{weTlo-nP0(L#Q1gYYlBUOF(+k1goFt7?GT(;V$d^!U3uR_J+L-_e*r2w9ku`f

literal 3106
zcmd5;-B;X19KBg!BO#@fFN;NmDuv~vsoJV^DYa0ki%X$wrP69O><&v{H^C%J55D_H
z_#gPF=hRm893Oo2kMekD5|#zR0X;tWu$!65<lg)HxRd<(*RQ_=xCK{7O2b6at6I-$
z8@3zRW!nmbzaxBgaf-s4wF6NIYo*-+*SVmhSwqLBy<=My+bvs*Yn!4NYB*oq-?(6J
zZwsHe`9$EVx_y8fZO>|G-nPp^!}lZk1N6M-ma`4>oEwU=@K0GPguWx6OXTNb)pM;S
zl0B#ie>a;sb>FfGYL$=@TMJIvwZocEoqzmabxtM6BizslcMtNOot8PD^-7`@8qS$$
zLAnj+aY09ihOxxlCD+bGC%QBkfvB(*@=m~Zc>JGbCli&w7CIG6VrO;qXt<K7uc5Y4
z&D!uP`gB~>(5{-Qj$-09Tw?rz^DS%HG?K{~cpY!*ctgX`Y1pc7OblR9gI*S)>?H*<
zFG1ci@%H|m0^tpG<BEx4jA%$tIj$2<Yv_&hQx}w-pP$dH&_{X4758h^HQ_(B*DA#A
z%zH(<vSRy=oX3mJ;f51vu##&nJ)C4-R@^Asw2<fT=1TN&gSC{^c;5*Y>Hk33gzsv&
zzi&OYWlks;5JKM)yU#qIqt1rSu>&=<d?P)kVK`Z6L%||563`b#;*mX8caS2c?Qkx3
zxA*fgd8AAJi3vIuM7ZIVmTcdyijc9>4i$FVQf-Zw4Z+xMoTZ(Qb*hG^|K_=~YnOh#
zZQ>(Lv2h~%HHen2Iiu=4c}&I$hu*P6LNeSn@iAuV29F?94%5<Pm-s(Al3d(lV3`#I
z^T_M?RKtaXLq6^-6AQS{`tR74npj+y9?8WiRd1U81~jmQWgQPrGU`!U69qiv0T75V
z7c``2--3t0Gb=LU6%&u}IqmAWv=WcAvxk`DQ;~uboBpUkx-wncF432g`%4o~6nBZo
zX-NNf9WR~|X`5I>k!6WCMrBFZOhwmDs8I5Go|Wg&rR5r57*&yTcbvfC!E?uTz0eLF
z&!s;)^A)eU=51N`ge!b1FJ%ohVM88sjyehnVHCWYUlenWJjHsBen?!E4WOYf=2=N#
z8OeKo*$TGh+k9P`lLyU~70{x>3+a6;{wB#{kgu>Ne$!Bye2;OYbFAYPuC{WPf`K+(
zf8b2#b$s+W%(3x_zUDo&x8P>_H*~M|rTfx*=+*FDU&{;h%fHJnG4vz%HzC7+gE&AJ
zI(VXwa`Z`rg)xkCMpR7TDtYC|!Zo#f9Pe->wT<IlyoY8rx{e#v*@1q%j}NH#L#~>9
zGFqAB%1y5Hv=9)40ztsXf$RKf$YQD<*ew;<Jm-?ci~`%kbQ7fTloFm+qAn`Y1JS;^
zXtOTbR8mulx;3S!C9Q@#m?4nN-)&xH4%!sW9%fU=So#%9Z?vt>(uO&e8W~oL#)-te
z#|%ceOEGTuSo1H)y})9O|5*x;e&XIJjCLh`fK?r26)rarb=Qfyv5LpUj)_(k(UUsS
z-IyrK(;mJ!L=Y8th@oC-05|L4W)k>Qd=*D=6#VN1@C?C6PXJFy(J)F3S}+P(!*yO|
t8K&bXjM0}UkB<Ee^B_r4t<N=37<K)IGDkf*vIA4tBwz|#sKg{y;BPHo7JL8z

diff --git a/server/target/classes/com/wuhansaga/server/service/CompanyInfoService.class b/server/target/classes/com/wuhansaga/server/service/CompanyInfoService.class
index 733e32f750bf90714431e188a0be5a631fc33023..172820d3a9a9fb3b9884d5ffc646d004617fdee2 100644
GIT binary patch
literal 2336
zcmb7FU31e$6g{hisF6i%oR9!11sXymJ0PGbp*4kqDXFPLQo^K9eOTKYM_@}HNe+{L
z)y|Z*=|g`&e^jS;wL(^6bpkJ1?Z-X$+;i{U{pa7m{s!<3UQI*8gpNrQXE4R!wEe#G
zcDT>IkaxKgir_#5@!+<FQ}_D=?j1I~J%5LGXo=w*S-fA|<b#0-2&I_|(~q~aD9WH_
z;1f*iFiaF+GR(Z@2i)m#uj@2@ugjnx@ZL~t?J>++&+X>%?OFjdDC#JgIEOOB&5!cU
zV1%M4+R>B4Mu(whokX|uV-a5DMu*v0D2h3p*D-Hm0T&ona(Rr~F_c0P)ki8y9<$>-
zc4eHGOf2G4hN<D8!y}S^)%sw5c0(rnGZR;EmEmmL_afeo-sh~EkCWysbC?wW97{T`
zn^?vT20J&>JWGb6QhR&Y>bc>*pioz=(<F{v$4)JoW1C@pT%LUTsoV;~Kvkw_m0>BD
z^YP;{%v&ZL+$O<YkD4K3uuc<Pd9oYQ`mRjZZ3AogQpY_L>$p$p9@Xzw>ot`gp+9gv
zH+sl0VcEM>?_CkeCS$0cDo)ybHHOK$-=Uf)HeFA=81`Etc*R>iS}8aEHt+57z?Ji4
zaWdL>Lxwx~%E{Kx?|E`$sPa=BKc)mJxG5zvl}*0mGzZzpN}D3u_dDA>;C&H^fOs1u
zQeD+BT^XZ^YGlo&(kh*7X0qa)PHOd`xg^%hr;t@yr?yhcq%MB`pK?jNBaKouVlCfK
zdOY@%9F?WA_;N@$QC~E?12=RjxsN^1k9g$z9%)o=_WXX!f8%TjPXu&fbY${&{9(`*
z&s<p<3z>^2xzlgS`eeA6An)ejT1`LbI^iI2z3!e&$y+~o<AjtL;YWu9;UrKsT%#*z
zjh-3}W%<I;Us>KiH0ogZ3SZN=Mzi~vpg&-y@*9}(C-ftn)$j|gXm~*1sd%?cPZnUR
zlX!?nG-LP{kLi>|*(MZ?#<{A5_#Lwnt$Kuu8h-kf))m$aodV|R(OJMOF2tDg$}Yhq
z1Ux~Vu%FV&GmIwE(Ra8(U+HL#MoHHo2bYg<jg3)V%uqE_s?T62R3FhOsTL#xQCu01
z_DY6XA!Sy;2EHff3A2ruSp&}#+>;Vi68xJv5-gDf*GYoqjH9{Kk(A(vks~ERGj;Sd
z3BXJo+&SjJh=a4}LANvDW(scRfv;neQX}=<By*XhV&xBfQK`NItE|4m<xvh*JrrW>
stLkWqU5qPDrl%O!nigv{t<iFc7D{+QTM}T4MvaO_et*QvWOWDl4{y3eK>z>%

literal 2336
zcmb7FTX)k&7@QR$CbDW9CrwJz7TOT-B}71JLowxM3N>{|N;vLQA7p#u2yDqmmcz-v
zYR@Tc!vjB{KdPs*l8{BLo{$G?t-Z|5H#@uf=ifJP0ep|=8E67##~qlj#(S1CvU-*|
zlHR`bg2wJhv+fRtmUGZ>cHJG0uq%TZfx-)G-!l7_(=)f)FJ#9TI7^&&Q#Y;QP<q5}
zrh*TG;UsprpeFE9$8~(G<G(|w9)pmW%+;Bm^p#YBYN?#QQaZlvA0)ZCZl>;b<s3+F
z;524+<Z(8Gf<SIkXVZ0h28x&`&A!zi%dK63`O=ee^ZhxsEI!6k28#k$PE@^tPjF5^
zAIUxqeQ?m|3e-wR(N9uVzG*x1>3GnV-gB$nmjcD6+p+pB%d^#c)H&nt*&~5#>4vF5
zq$h#K>EmJ7@@44xS}7eN#qx4X$Cp^i;46X4sV+?~GH?;AjNVB4^-0u}OY_q%wbU+L
zHc&!YU^Y}Ka1w<Lt_wv7oW%6Pru6sR?zZJw1L;eT&gzV1J<K)BJvNy^rfVvWR}Exv
zCX4I1k-^v0k!n?ZoDzq@z&BVI$cJIt9=H4UXiw6s+(b(lv5jf-j@iagpHlUm%It=K
zW)rz^G^#Az>UQJ8OUK0{#8uI_tD<pFU?sKQI2yqMrQ?BtIv#SvY=?2>W%Qw3+~m~{
zs+Lzn7^0{g#rmU)mtwtbJGOsE;Mf1DFy5de7i2A+I-Z``&sw=9u>5Sy+iSq%wr`JY
z9^m_q<NB6wyAD%UZ1&wj+kI(1mX7pzD!Vlur|{H316u;8N(w^XamQXqKC;zqu#`AQ
z(e1vjE;E615mPILr_^-4o;ezNw$s~HA%Eq1FU=97E?xg%D9s3}#uH9jerhyco4i)}
zuc-3OHp7uQ=zM1Rc9XLN+g#-j82aDH9b!SlZ|u?VDW9{!Xc5c&Z-g`P89wKmz!x~r
zSqf#FC>q;^s)G0v7Zh6c5SKLk@;m!OtX!aIkt&uj&-5zH#c*AONd#0-CH5M}P7A&$
zqAOVEQxV-@tK{k=Fb{D}Oi5i%NY!Jh-(n+@dY7$|npFstcyqei^9g0ySXmagP$PMy
z>{g)cHoxWR7Tk&O@26O>LJKa^g4G1kLQJGA_+dg6TJR_)dKeX8L<EoDBhZ85N;IpS
z05@WABMrQPC)}E!SdrT9rgDeBO+u*%<tu+-vr>Hxqq6oI=43y^Y-9tT3*pq5Cm*Cv
fZB;(Vofh~ur?I=hjsmf_IjG@hJY%b%c7Xo?pbS4x

diff --git a/server/target/classes/com/wuhansaga/server/service/CoreTechnologyService.class b/server/target/classes/com/wuhansaga/server/service/CoreTechnologyService.class
index 331799f50312176b4860ae92caae65d33bd428df..8cf1fc995684b240e433c437f470464abe669fe2 100644
GIT binary patch
literal 2010
zcmb7^X>-#s5QbkRZA~51GZe~wlcWW6Un!xbT!8=`%9PJaA{>EZXKcAl{}s$|f8Yo3
zqZn4UNki*0(=WEQlAhgtcfG%U|M&^u4xWx8hrEFy3&R*;xZLu)_WP*Ay^uTH4n?po
zg7_s{!d~_R@k+Ehp6~k3#wu-+m7&=B$Nr4>dLkfJBNNt*x3{p8JJkaAVAOzVp#Y2F
z;%)&9qoHs`OD(xB!&Ir<c+1zh9VzMB4H>G~!I*_{O&?E=u0%~&h8@w?&L=HQVVc2A
z_U>)e+YGf*f^oU$*bU!vs^#p|gr}t1*pgb+#6HXz*l*zgW*H{qkYZNdQ^L_w8SC7Q
z#EUl!Go^YO^xz3%9KvA(M=Tu0F@{Q}Fq!Td#zLX$VLwgnV<4Y2hH80D=YPV&Nt|LB
zksj4vG1#Tuq*|_P$QcV~V@T9%b0xH?WTA`->Ds39D3RzoJs3x#Yu&^=&KtO3!Nx^~
ziA}LyG~ZHTDYOOYNmXOWm&$7-9ThJr_t3K6rfwW>NKZVEx=j(h;!T$<Qw_hx-8CLa
zy-tlosv|>&tJ&%4#^15ytJG$z(($;80>UqDYqN!HXl8w?HNx%HNeooTaD+-U%1LU#
ziGg~>I+5v_P#wR$!UNtVK?6!9&)al%mjxpQN0PW0=64e|-Aii8kWoj%UfZE_{`ddu
zf*yJq(Qnihb#GmUk_xuudA{OG`W_`Y)o}f8(|>0_5}pXCyV@k5x#~wjOFWdi+6ObI
z)CJv046`YGEdyO@_<>`Gy+C@-8!hX5KX_+{B(Ct)Mo-x3z^mc}4b6F)pA?QBoAhPS
z_a#_lzf7yEv|{u&E1$r=!(jM8s~oP-b0prGq%)xN@hM!xbz0qs&)g*2t({1Fx0Ck$
zmvkG`X-s$Nog)tg9n;)*Oysr&H5;R5l4EI5bOBW?P*8X1@-U-?&btQ9)48ss+~VBO
zHx$3%V9Gz9!|RW<pJY9TJbfRbNpO@RIyT^_*mqRKB9=BCEz$)>gXFKH`>7)<b#VG0
z2PW-;W>*2H2H;j7Ze_vmVVSP!EVjbWWx&r8{M-)k42f)l=3{s*johq!#aw0XGuWmu
lNjnq<ux3AIGj6WF^23<G1Bz8&c}VXZ9>vecsHfH^z#roO(*^(l

literal 2010
zcmb7E*>ck`6g_g6P{(v56w1Dnq<~pkwv^CPwm^UmWx}(P2uI-98Cx#Xzk(U|2R?w0
zVz{zR2(1g#7t4~a&N=toEB*NS?K^;5c$|a5aJl7o?YB{fdm(qY9g1LG1o0qS!d~$M
z@j|pZp6~k3#u{zXY7WB;ldt(Yw_WZz_Os?|(NYYB)?d+2c&{e{VyI_QbmQ$!49S@a
zL(Y|<T6SHA>0+rKb45zJcAb`Kdu&ZQ9#>Hy7?!pKEM_wbPf4}0iLp{8xZxGQEylpG
z+rkJ&^O(R?4wDQQcPib&G<K1`P`KntoWMj~dg5u+ZHnLpZ@Q#-y6(5Q+u(uJ^K@}o
zb!5mepRHZjW!r*K2D`Oit5K7Nj%e!yW-T1hQYI29{XO#55$euHt<6v^Cf3Gftoxo*
zDP_}VTc>G`SU8G93}!-;;2M&^CpTl$(i5RNetVS%yepIlDBmI8rdYeU6W&t8#2FNG
zILk2grw?nM5{?Kglu)KD*SQ;sXRjD$inX+b;ylx^iivZ$ki&U~a%Pn?bGBgPBExtn
zR4p9vbY{@W-wdUOcIdK&E0|{(l^#`*?#T|5t<lj$3&Xjc*hJ@|UYjeSRot*}EmqN{
z&Q#Qddj=IJwU6cAvQWisDrgdz6f`4P%UYD4R8@wBZOZqrJ6>uq9DE+po$QL5w=P3T
zcVXG{e8rXYJ!*~Vy6bnF{u}#&@I*j)w5eu8xMyJr_o;J=8p2%jqo5`3OMS5pWWHAy
zbc-;|reuu_s$$&_96Rg<(sN$v=6vf1Z|sm-RQPJ6C+zg;tKc}j5<~QUl05xX&|i-J
zbJzs~V>B~hB2VKytuh+T@&{O7G0yNV-rYmr(RgPH1^Ty=DD1@y%^3Fm4{85aq`jF)
z2XTnhXf3yCG-%9gEpuOS*w`XwHino<!csAG0LS8lPtf5JMiZ^@Bu=Hct0`__ZukpM
zf5Kdff62hh_Y`YDXFDGIb(r!xLi3{oM1?+40SmZF*eTIMOmwYJbT=ikQiAJ$5ty_K
zI+`bG+R`Kos}F8vf!{=hj%jx`gD+-)pP|UJ+kj_Sw1j0!`VN8XQm@dciK=N9X8AMj
mmghdg`eRbk68QlNv#;Nb8?A572qp>W0Rb9#h+0bW2>1o#1I`Qp

diff --git a/server/target/classes/com/wuhansaga/server/service/MediaLibraryService.class b/server/target/classes/com/wuhansaga/server/service/MediaLibraryService.class
index 251349342ad4bcdb6a9dc7de54ef750f89d30fbe..c1a06642e5e1a9c4e0a48a3e3f2c4a2116206e7d 100644
GIT binary patch
delta 2848
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

delta 2916
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
YTx6xn%4QqSIcy%;G#bxm#jFJSn^E>~;Q#;t

diff --git a/server/target/classes/com/wuhansaga/server/service/NewsCategoryService.class b/server/target/classes/com/wuhansaga/server/service/NewsCategoryService.class
index 479d115f86d4281a3c2066b4631a4ae0edc6bc05..2931e8217cc52d3870e9c82c3a1fe1343865e484 100644
GIT binary patch
literal 2508
zcmb7FYgZdp6x}xj29lvb+9G|}7D;Iyg`x3nD3wxMqv6qprdq9flU$N1$qZ}e2IRB9
zLVty>Wn=Y&KfoX5^4ysrOcukElC`++bN1P1pELjb``6z9?xLk3#;{bkJH|n`#VwaN
zx#0?DUpU@i)`hVl4%{^^MbmZ;D|AGA8sZF-FZn(<+T3ayo3)psE*Vl*=<Yh-+Y=61
zFGrg1c*g_Q{TD?Bt!=t;wcTb&XUfNJD$+5nW-;q;b*0%h%5;$)j8)90#bwtK3|nV-
zvK);`Skjb-1DJ{{WIn!TH^dki#&ry1B#8-3X_#bKe6!GWq%cZoUC}1KyZ|T4rX@DI
zotkjAd96+OQ)Ro(+g0wEY8`CGWy^FK3emV##!g8Up&xZkDO3c?_6asAk?TUX?8X*%
zct=R#ke_jtfURzghL&ikc(3YsTVbE@vG>m?Sxq7DAC?*n%VFlrwwJ0%f}(g<PG)ty
zgX;_l--&NEW|Ha25OB{j!w_%K!9pgQk|-D1Y62PLG-MevX9cDskJ}7Min7w@@j@mL
zp(p=9mkBIlNrOSEwVkHn?kTnIC{hn>XV>ub>R)|I(sgy*L4oLNad%t%NY!&OOy7~#
zpKExJ;Z`Ktx^20VThcfJ=8ob6l2^Z!Rk$DN_!ys10B$&dNMA(HGFCL)9Vl)eiH>`U
zhB%dAM_pUhao^)b+GYDdIBVP$2|U0<4WBVg9m}j_QR@(njz{>MqTT21uGrjRn9h{K
z90u2l3i1~^zC@Yf96>I*A*oG=89I8Att#nk=-9*-!-#27H4vL`B#aV0^cBO9JG-E$
zP%4twcd2m&bvn}BYf!ILh^jiaJwy$vc1gu|K8)Tk4-fit9pB(vQoVoCSAE1~1#;Q6
zOu54F?kTcAy{l%c3|F3Xsl#<d$=Wwvle){QW!aKTlZ2$2L)-4u>|NuLu!KWVG$<QG
zsOfltI@Mc7nMhRZu2UBeP1UMqBEAiaD)kJP0$0@tN11X|eYn(mge?#Egb{pZikPLI
zJ49b90;d`;%`}>87^U4YTE&n+lE!;9i_w_O{SH0<C(gz2t9N{!{*TZT-~#=CY5y87
z(oFp&@fK$2{1VNF87-8r%l~Wt%1Qe(XSaV1*9k@x?i(lVUOmO`9MZ?Q=RDjuF(26d
ziAKdoA>YHT*I4)kWBJtkJ$#r~8$A?z_*AXpud&ucDPV0qhG)Ogt05@bE_;06Acki#
zi8)*&hx52eU28rBsnDmgfX8@3kSd-9HhIM9V_GvRg(Ga809!i1_A{miQ3Yt84xmXP
zPIj_{CPxXoO?VbUDAIit=|L1TgD9TitAL>g0SZ0v_I2Pb=Ea`y*ju6;-3fWo`(AYN
ze}euO_>QRio?t4){XnBi@k-z*k^2KYmwyFaQS7_%l{p@Ak?6Zfc!KXMbC_}vL&JM2
LutTGI+ywpu+n-In

delta 818
zcmaKqOHUI~7>3_DGo8Zekrrsn#X>6uT3X8;t0FBZ-nb-P!P1PGNgzPvQWAFMC(s->
zE;MdjnqcA$7lgI(5BM|u0UE!Vo={A|Omf~ix99!dZ{|n)S&)DK^X(MC3>K^WEo)0x
zPvfkRuKxNRy|%f&S1#>8Cs}js0D|Ze=$3hAnY{vW#N->6iiMV)^4bf#WbIm8PTASr
z)1X_nts$3Qs)i!+kcIis3dbPQex&3xBdQM}BM*!L^CpJ<$VpAl=_44G?~Gw{Twnr|
z@~5%WYVL2_R@rfV?+D~+b;Fl5X9Nl;%9p-Z=0ky5JdzXUQH7zIGB9uiNGGAu1Mtj8
zh!eDEIQDkiX*9i^R)pzY)J`FSD9to<potj&A$2yAA}*=efVz$tq1<AMq>MD+7Lz?e
z4{NBVOTPDaR1&yBHT2O@pN0g9h9vqGrKBj~tnn2CpOICxF^1I-be6#l*8-i!9*WUR
z^SBo>>bZwiNYL68Zq<#ZJfl4NE6QnJISJ)(`yU7H(fTM^@&a9))5T@<yO_QLey<L%
zP$4z?AkkA-&@XAyEaoWoeY);`+Xtj>+Y2fN&wRmrCi@AZ-lp0=5V&B$5s|N(g9+7r
SA3}8fF<}^<;Hg3{0Dl2YNLf?>

diff --git a/server/target/classes/com/wuhansaga/server/service/NewsService.class b/server/target/classes/com/wuhansaga/server/service/NewsService.class
index e4f78c259268ebcad14e6098c6405314a73be982..b84ff8cb6d02a79478566f1d063447b3e4cf1dba 100644
GIT binary patch
literal 5341
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

literal 3285
zcmd5;TXz#x7~PXgLnl)xEmTUYa<Q~Y3qdJf2o$*pq^3{^22s3BlS4XfG81Mdtwnvr
zU*Ut#KH*wgtghvw5B?^X%Y9}h(`h?hcJbs(X6Bsl>~DYjyPW*>&u@PKxP)&rNGO=7
zS*^lqXHhpDy`dKzVXp|=dl)rQxGh$l3YYkvK}tdYlD?uBn!4F2+*w!>HCKUZ(q>L?
zw}nl#ax7fS+xF0W%c6o*TW<&j-%XS^G0T?OC`P_ZrYjo4jxJSP+mJ@Fez@4O%)&g8
z?{<W}R?PjU-96!SnlAbDR*Z(JyB(XPe*9mMx)@Jhn6BZjd14l4q>$IFy6A<1J`HK~
zWN`ooGw4@vDpsQ%xzI3xLFUmBO(wK#I85rzmlGi8=dR-#&4L6fW^i~n9+6!6ImqG_
z3}<je!G5nILKF>0F~T?<<0*5KoXC|_yo%Q|cum1rY>W|XuMRXE!*K<fhHzzVcp$S9
z<fMi-x;quZt2l&H8pbi9py#4t8t#mOp+Jm~P;qv4Hdj?}plq1pcBi!<?ECsclehzA
ztEM-rx^2ksU@_$`8jgZ|d^%;vZEH0qRjuhPeal`e)!B8Cmhf7H`-XEvc-6}N!N`8M
zWf<+USX;Gh?hi!vgZ@#Fej+<W!FW8a?Glnx#uhc=F_eJNrXUn)YvgO~ZuHaJYGRL7
z-9IPXMXNrq+j>j5!lu{0CQE9*v%trqU|8q(QlvXdQo+NQIkzX;viD{*Tn5!T;P+F6
zuPnc-UP7mLFxX{KMSER>U(;|MSHfoX(GrHN5n0<^ZREO&TbRwDq~KU=k3^s~e26mJ
zju0g$1W|B!B2dp8_}$7<aU1g)+);3Fb8-ip8t%$g-Dj9?Rd05L<Xq8kA0M#_4YOv8
z7X4NYv3kwwm>e{NJCz{gl)O_EoQN;Y2y^P(S8?^)GOv}O+md>na*XYA6GhMFsxp*E
z8a~74tnL*__|9Y5@1^*-Z{bS~Iu<CEvrVe*jM$=-bZ`rG4MLvLcqWWo3e(WA2!n&h
zFgXM$#-2!1o*q96zI57k&It+D(y;7-)j7spj-nW4tJ3g^23w{>^$q<Jn%qUM9hXH>
z&b^U)%$?B^C3D4a3=X<0rfIplYgi_;Hc)O_tp#hja8sDVCcS!5MG~uWtbXN<UP7o9
zt7F&14MR@N{>a~qGqR=>3<oZ%F%Blmmfa{gZTUywu^bPaa?1sWLqb?C2TvjR$5O;`
z-ik^7*&!);HS%pA-!uG8qL*I@sL1m9J-_5`KL0bc$*I#D*q_3M^zS(Ia5z1j-oTK8
zXTzy=jLM%AFEI9;)=A{}s}cnm#C~2KdA`l~NSMSFzle#`I76@Ut$?$hbslfxEst3q
z=P->FPmkg}-X_a;XsOZOUwM}+?{Vc|iZCDmcoaM&gSvoX7|2C0kXe4qfHgmm4O~h>
zQcZYNdpsIPJetRRyO5?9($oT)(rs@dbgSTfTp^Iu>oT7*>a6Ex16LC}yo`EYhJ3To
zOBNq^Vo2<?!Vek7jS%-4%_aTZChpwSpBR~1$IW%jrG7wvuyZeg2UE|L%`^;ADDaxk
zGU-Qg0%JJIdK-(xnhROv0v1`khAJM=>Bl_F()b(W8FuUzb`S9h4P?}h_>@tPPNsgv
zr|bA)GU+{Q0jJ00^b_}eu?Lt{Mnc#;`ssRv^&soRmt-^~Gm0frP`XZ+Xri!{yH2kM
zPW_B-pt;3~Uwj49I~xJlLU1h(+=N9?8PRs|b`1DAT2Ai*9+S**I832Sa9M2~KBc3X
sAPP1A0xS8+U!ZLY<yU22#DyC2SG~3k#Yt1i1l9<cz*Br3IQa(n7fSvlB>(^b

diff --git a/server/target/classes/com/wuhansaga/server/service/ProductCategoryService.class b/server/target/classes/com/wuhansaga/server/service/ProductCategoryService.class
index b313ecbd80f6c0d47ab6be47f1ec778c1351622a..527fbefc6ebf8e52dd8ffe74725021a9f82da820 100644
GIT binary patch
literal 3797
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
Spp`(k2^hjB_|$ju8SoEwFKXNX

literal 3732
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
R!D04O=l3&w?n%D@{sZ@yf?fas

diff --git a/server/target/classes/com/wuhansaga/server/service/ProductLineService.class b/server/target/classes/com/wuhansaga/server/service/ProductLineService.class
index 6469f8ca6e9255c5efef57291ca58d391c7d5962..65e2b022bba5576537c62d60c45ea5f474320921 100644
GIT binary patch
literal 4591
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
Z0!YWXpqo?O9PFmS&y?BEgA7~)egPXMp49*V

literal 4591
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

diff --git a/server/target/classes/com/wuhansaga/server/service/SingleEquipmentService.class b/server/target/classes/com/wuhansaga/server/service/SingleEquipmentService.class
index 4b5a045eda78bdf41153a80f0ba56b9e0f082a93..e846500fe4bedca92cb2da422ac95a1878899426 100644
GIT binary patch
literal 3142
zcmcguT~pge6g_Jj9Berd5@^6_OVSc-3=wHa+QtbV`5-kl;ln9u`Yqdw5y+B}WHR)<
z&;1Ym1?@~qN;}in&h$rhdUqv^uthq4>4RlywR_IJ=bpRTzyJCDPXPC^*M|tAal{n#
zpqJrR#j2|>o7<Y{Xf;iBxV_J9`KMR7TGGv$!5{B6^+uhWZi(K~FvE~@`o)UYXmFd*
zilK0I`MMp=Ta-`Y9Qxu&C`dwKxY;!VL&D((uee3saT#Va#T{*5Qw`0msYT1I<pa+p
z*QUtxS#PN6>V_&-<>NTda6Oco2J4oou4y&C!JVezCNY2uaSSTBh)WFTC0h%MA?E1c
zlSa`@wvfOu-iqV0f)R`|jQ<zGdXw7+4DlLw1)l_279dv?ye$yKn-ak%kixqP#&DIP
z_nvO*?i|CgpLr{m{POa0c2fxao`Ux=&d~2Ewbm>fy0guz4A(m3>JUc&Oen}8+miah
zL4nrJhpY`vk-Ve32ki#PCy>Kb9McMJKxN2vv6gfvDGE*?lc9_sxvYG_ba{>2#BmcJ
z#Boc(EN(MgIPr!*gGAlej3!^*5(*Z=F>?4&!AJO*Xq`6NW7SWwdaCCY+{1mUkZw|A
zkvC^D;SF+zKG}kheqO<XL}@mvn#;w|0|gK9h^kQ~<Gb9e#>LKRkO7zQB#uvnRSFCP
zC)ux-cc^8g!#2sY4QV&01ERBc!ZQeTi8L{_SZFl^^So}#6Zu1{N?z|T>L!2Mte3g{
zOe-5SGFY@Knz5<bx_I^nWA3)@Fx(Eu7aQ2wI~S29Dx_h}vZa9s0_n-Eg3PeX4_;a}
zxqC41(%&~2diJ~)od~B7r02;%fHtoX9);|)owO$z?sSF+jpHom+jgjX;e2NpXO0pb
zSmExrRbA6;txg`XDS*C`UNbefX_K};{r{!zK8F<TQf{Ed*E@o4->kalhzpKI!|*m&
zuazP?)jz6L>Dq0}QZw~>RbiO!s%Q+UlB-pA>AUD#z1M4RhLF}Ko;zpkCU5-QW@%x1
zqe&Zbofph~-O;JF7ERM~HCMMxa>-!Pu<B)NSAD`wZd12ZMcb6Drd{Dny6DSv__^SQ
z*j*S#eDuu_>`c+JYpT-_U*RobOlq}V)ggOw%O&@#{t+XOt8`9Tq9Y5%BTg!GcaH9t
z@hPGx($kOVqj6wj@)cNa>Im^D?#BK=>cvQGBzA;;h99O6F+{)gYrOL_O^srOt_cDL
zeY#V)gr{^j>%m|ZYxG2bSjPrYiMtY>$=MV544bq*g;6}m=ZN72y;o?KH}VCId`Tmz
zC@lsp11$i)qF)4G)3k3e?#De(BO-vLjQa@JA`r1fWNf{X_p*#@*qhdhE9u82czT%R
z@$kQ;Mc=jX7l=pTD-xecUD^q*1PGKCf$}B-4OxN}!nY@Iy)%Ka0DiKCpF~*->nBhq
zEQSiIKCbu|fv0nanEVULT<kZ@9O90z)7=Q3|3a_5A`X(^pd(G3^6sZXjne5v6w?ze
z-QrAxV~c2NawY4RRU-8`Ju@t{$RGLSo@z&!^Vz(zc$Uf00d*?C5>(D(@iX(lx1sx)
zwSzB)fU5*Pa|U>bY-8B*{WRxCo|t@%$CJ5V!GuadJEa1!iIy@6*;VXVkRCeJ?$Scx
QKtlr5<<*4ck2ZjR0WpIad;kCd

literal 3142
zcmcguTXz#x7~Q8y8#|doDHN$i1r(Yzz<^v7f-QGQO`#AhBHpISAsw2`gqcZM_1$Ox
zgTFx6(qeTjUtP-|<#L}h(=en{u`fO(b2;biy}$i^-#PQw-@p9<;A1??VL;$a-D_LV
zyUVs4*iG9Cq`xYCeR1m2syS}6C2u_II-Rz3!x~5VI)|*l=u>;uwpzB^wC*lFmGw|y
zJa~2byxr+YpB&XxlC~c1=ZF@S1+pExDFuQ;^(9l)bDQPFb1n2qSx(0%Y1?zH1;X6x
zN`I|feC@pZGU&EKk`LFMrfY{?p9+5X{}o(HSIQJP;ab0A<r(GHHLoFuAuwWM5JP$F
z#-1ET1y1kSdlO^WD_{h&#k5wPfT=zEA3P{ViRp$;%TlY#IgAS&OXW}GCh|OwH!+dJ
z0fAjQ-8~c&Z()-01<tq3MW#@!7<e1+=J1Zd(br+?yqh?L!veXc3{@>?kU0hNo{9H2
zM{0yOun)&fOran!bjfj@a7JK%9C=Srd2Vj5xG1o@>bUYwx4k6&2li5nxMNkXZnqX~
z-%-!;%WSyp1On&MGphP+`$l74jk+DmrsuC!8tl15>FZWtR4a1rx#x3mEHN1Og}~r5
zRrvx_>GX*-L@h!<U)G67$uZl@z-h*-5w3MMqnz!_{mu(`bY6zbUSq-b?Y0c1PXQw>
zR?$LtiI-)`2#;(j!Yw5yaPPH~cB)PF(j}8S<^?7_YKnxYoDzAZ)rt!2s?O7FiiXru
z-KL=x<5d&aaJkop5%7RR8!~o-|ECJ+DcuILxM<)u=5nYAly;!S#3!h-DcL-gAQAR>
zA@*LM02P--D*dv7J6Oo!uE3s`n|3^C;vVkPrB%Dtm3N=0&Z?wi+{ObFpMpKME9j%$
z?8aAEi;K#z&rCeR=j>d^Wmj>}+NncyW+-w`;KYv1WvSLeyS~D+EAINCZl}S<Rl2@0
z@s-xq;C>o%o7lUxI&=UH6B6{rh$coEPnk@e=eJ4zzaFV-)0({B<r&hJ6?fGM9PUzA
zT-OWj(D7V0+*q~cwU@jV>y~t-PyG#MG=mkjC$hk~`4YmYd0oFQZ#rtrn@s;gIH|HP
zFcGsYrf?Oip5L^Bjyk}fsGjF8wqgbBeCdVUSgiPCqm08m)iV5Kp+0rA@$L=Y=lGw&
zFrNlsAkXXfd>Z6+YWioGrQ;jemBGdA@7VWfB0G`Yz<z=6PORe~e@9;6=#QM5L6QFk
zA%MLY;r>6(yR#7tN;u9Z0^$Ttl2YASIHhM#;WR$r`Vk&aXSgDZa~wB0D|&ODZ$9Lk
zkqj4u%fJOHhL3Qer~9JTJxf3(Ag^_ApgaJjZ9r=q(!2+>uKm%pp00eXOYsb{W;OoI
z7W~WPQ~0LF7uuJ8f`bVHvqxa25zOK;;gsS1!mn%<ekg&P@8RZgT^kw;zpjPfz|9!9
z!K)HHSz5=fKanqGf5rSdYOy~L2k`JG4oArwqtW0wp2JZ#+Z5ALNN`T}I4AKKU(n1i
z^-8f@XNRsm=CfdjZjxV*$s@Nm@O8`<r6Vep62m{9U`aX_vBZ%@;5L@x$oj$SDc}~t
zPi+I9V%rp&bYhuNs8VrwRjHYYqcEml;OTVf7nsViWJ!%AD2$#<hVC%2Y0e-<xu~s|
Ly6|{aBpu)%vJ?=T

diff --git a/server/target/classes/com/wuhansaga/server/service/SparePartService.class b/server/target/classes/com/wuhansaga/server/service/SparePartService.class
index 550a3872e41988528fb5dbe1ac957aac26592fca..b70caad177d68631d53785a8f73eb3b6f7cc91af 100644
GIT binary patch
literal 3052
zcmcguT~`}b6x}xoOi3n%(t-u5(kdk(&_Try8cLz9)X-2Usnq&CNiJbvGLy~+UHI;^
zf50E1Ybh07%U9R(N4Y%r&Jd=_pz`8FCNpR5+54P*&bf2{{Oi}>0o=l~J|vJ-kW$fu
zUWS>P-PE4@JG$lS4PA4&v(Fv*XVkb>Y3UB%&>gQrb}}&ZyT_(Az189lA(Uewn)3At
zLa@A;!8!CPNUO*|Whk7%mm%$Plh?em;d%^nx$>^QuWP1mHMFvAHHwkvisu+)$p<Fi
zGfYi*6&0LkxE@PN#-?p)8+wCpa@RM#3<hvP!JvwZxWsT?vbCWYQm*k0DU!_POKA+_
z6$O`7j9`>u;@=1!`P?~RP#WA5d=g|;fLu}Wsz4BLDg>WK7O$%q$5n>j1;aADMTX%p
z^L8x7)z#JfmXP)h6>nlflu0VJ;a5$=-QjhHYh7}6i6a0eRpgLwOMT~{M85MezOgBC
z%QL)#lcE>XC}3K_jEWo3P7|ini?pWnOKv3kp<EcPtai!rc!N8H{ubU=@Q#W(yvuOm
zq#wc+B;>ws`h0y`s8)){DByh+A7Gwn-45DgrC(wVlrE}Rz%8nZVbRb~KThT12ca{&
zV!kAVzO7<O`unZA?r~wdqv9^^k@j^ep2q|2FLrBB?Y4sZ3O*8zQDPW4$$P!JO9LYN
zX^T3vC7a9bg6N)<_}C*eAzPLPDz@&Cb;0ZuiTtiz7aK;|u=qp2S>?`Sy=szWux!_K
zb4zy&@f;dc-j3liXz}=BTZ-F{h$dYl^%}M#8+9O(nA{Sm0rvR8bK9XV9*n#U_Xmca
zXTc~=#uG;p3j`oQht~*?f(_YD#*muq<=hTh$N9~7>_iLkd|l15NGT4iac{@2(>|;>
zsV^L&?yDFLOZR+-^!)z+FYj5R&(aR$MMn8SSGb)U(OJ+Hfxc{-!Il|}Ov0dQC-pjA
z|NBtVxbz0<Gn~>4UBzL@Ry@77N8h%vjeCR9Wr!JDVwgQ;k2vLHnJ1UAO`kT^CNEk0
zhHKEkEL)cC>7HR*)CYrQ({5JnJ?%cXxI>dr7b8)zeW%7(3^8p(o!{^qVz*!z330b#
zP;+J5X=rXsd_%WI)6oF!X)d)Mw>|1<Ej$hsag|OJD|E1+NW^)9?#|KuDjpz-GCh5V
zKC%OoQ$K+frjMW`aWnNBvQI}+BdH_wGkiO9h#~roy})Zf(9$H<=$a;A(1$mROL$0k
za{&z2u|ZD+h)38YDsflAW4U?~A7hLBvlzt_e1a67(tDLw1(r|A@)=pONpc3cfgFI(
z>6gG4wCqbvgmK>{iwGbi<37T*1Vn5J8C$R9y)5Gz4wkj!%7k$Vo*pK70{pMY>FYNB
z67dLpRpK+LODDmV2!YxrQ2&WQN1kAX@SO=<?@nMmf}d&QXHb>Gh6z*&i=l>kh%5d@
z;A4eDO#OjOA@vJp5Aj~8)6E2){7A2ZA`X(^paY3QdG}MHM(J!JiW!JD*5(`o$2QS4
zq$lf_RU-8`Ju@t|$?t{afoexs4B3LR1T9mbgXMIDC8}J&5@r^F@4yH%>jYnp0oMq8
z_7w0K*~YOO_S0e*d3x#vKAbB23?@{Hwo^6&n{F$UmQ%%!1?iz9=^i<X4m2e|Q(i6D
Ip|u744aBDN8vp<R

literal 3052
zcmcguTXz#x7~Q8y8<|X?l#A4&0$Q3hz@Xx#1j|(*B|srqM7&LtLpn5>2{V(j>buYW
z0e^(9g<y3pUtP-|<#L}h({xCttN7wWa%RqD@9(z1Gk^c{`=0<l#giOH1Wq=*j`g&+
zV!MIevaLY+Ytq+)(~wrZYx{E1_QN{oIgvwFVEnPYW?OCBZCSUMAInB4uqW8uc+>87
zrBB>iDsV?HZ{bGUD+1ZB-I4-9v9^U?^W0V?@m>#oN6n-nbF$;P)*@l<^rXLDDebuL
zt_*tZkmS4SPRq5!o=*#Y`u{CBmu{(aLnmC{idAJ^#p$xwl)E5MFfod;JoaF34&wsl
z)TpG#+r$L+2^fKFGkrBDU<%K?g5RYm8NJYHTk2FLhXVq~Q<)R_h~k{b>zK^pkic%8
z;y#LrH!wxd0_S_iKT|AK4ZMlBb9hT&dM9k1YZFIsR3O)qp~}AoSx_MFn0R+{rA~MQ
z`*GaF42l9{=N#7w=LHVNp7#x^EG#UPmRQv_$CbBwon`6YvzOb%ov3*YyS-%lj(U$L
zv*C&p2w3S^REkQI5_4%Z>`=Bmf4$nIsuG2+3!nb1%Jrw7&&7$vVypsz(I=|T1!mHT
z6A6d}K|o(Nh(}{%wk?+#hL?R??{4}xH<0!JQm*4SWw_!s*+T4&45d%%LYtMd*jwhX
zBI(<)p~4#~Gl3gBZhCdAlxEJE?0|EsacK!8%*iS9F1FiIIbG7ZnM+|$EzBXwDy~Z=
zF5^O9ZV}{&L)SBQlmD~D^aKupm6i-#$3hO(?SwIS#KaBMC^!nE8YG-NP>f@&yLi=Q
z8A`um;1(8hxGk`Es|m-8Chp)aW3pzqd-C=prJ8Cw#&z5?@j0lU-N69urqW(wEiI`a
zePQAOzN9K0mx^IOdiAI<8e@^;+iGDjE)-v(9@>pn-aoO5$9ml+<*01=&crv`mL`iM
zr0n+%=U*G$G$FxQ7}3TkvniWt;puIXoZg@-s{Kse?ePZa$f~>M1P=SnMc4I0J9Ipk
zGMcEhz0R_?YF(4A^l5pM`O9EcbvG6-+bAK7y4Uj?@~Wen*MY&?{FKVFz+}v`l)_T1
zd49_Zy6WP6q%_Qav}y%Zvh+f>2rK?DsNg8?qzpeSXqmd0`1Bf|bNtU>7vDx;AkXnf
zzKwF6nSBPcd}0H;GdP?51N$FLW+$^7I4JPL$>%uC-?0~%{+U}dDDmGQ1h5YU_V8Ig
zorz#j#tFU=5GQepl<LXCX}x;}@8Nx(FYt=_fG4u}kn1LQMKd39=3~wjGCT|(0}m)4
zKEYhy?z7tN^8{1|<h9)!sEk0_Hll4C)4YeYT?eCWeY^6pU5aOvA4VE~ehB{p`4qmX
z@r91dAi?1Tf!QZ8(+JMv0^wA^2MxbCZ1|A`ZoZG3#}ysW*zhab@Xv5H#%*#`22Yir
z<Jw=ym$Sd&=5y5J_}m}C{a?5oC2xX(2Jhk=rYW!)rlXkPoa%E<;UT_aFu&F(#U7m<
zM(rWr1y#98ekCT4qP2l<W40(AQK^*a{)q%jGGY-+>{$eEV>$M05WJBBZV~+SHsC2?
zn?Z|_SfLlHR2+^fHS@6-#_S6`o-O|hQ$;LUQiTMC(T|d$6(%-=Gm3E@>gb~`JdTQ_
G3;YXeFzPx0

diff --git a/server/target/classes/com/wuhansaga/server/service/WorkshopService.class b/server/target/classes/com/wuhansaga/server/service/WorkshopService.class
index d103977c06bcddda5b15cdb46e4461364c3e0f9e..68244cf0ad7da9f543decf05877a3c8917074784 100644
GIT binary patch
literal 2199
zcmb7FU31$+6g}%WF;UbeaneAD`$a?Rj}jFqrL99so6_Q<G@%a83oo+0vDMm=N0QUY
zzk(SkEf4$veiXx5NwtNe%!CK8cJJ;z_uPBWuK)h$&%XeCgM(RQFqK1A$24XHZnoUM
z@p{;`9N+3#hA+J%>4hJ=C5;2ud*yfCL7ir<1<t>YEj!j=AU*n<sQ~?Od*mOTuFl~D
z%;uo!n1e1*KD(=c=F6UJ1*Yu>0_#QdrFCQ(J<I7B^}w^8PPG)7hJoEP)TuDqc^&gu
z5SWj=_lC`$?RRBcAYV*%$m>|b@+jP+;~LN2O@=ewFjy*g=>&FgJW9K&VFe%N@R5#H
ze9Y>NNh=hA+>zBA%H2bOrQ)-gPnc5}L_+}=bGW4AGOjS`vxF2_@MW;=_6L@8TyqXx
z#eeA}|AvN7a4m;*MeS38#WA&-6UdJ0?Mkth<P_VPQ~@`16j5SE3|8|KWnD>zdhbzc
zsLoe(+{9-BGqyvSv5Tc*x_Bn5SgI*^L&vSqeK=@afmEh1bbN{1Y*w4v2xQc(lw@lf
z?%?Yj?&`RQ`z+Bo+1=(#s*0pGZO0C_1g46mhCr4wp*6ehwyFAg({|+ZVZSN8eXH4{
zC2zVdtJknRTdiYbHt5>Ez(#sj>T0Fjsj7hf{!;B94?^rQy;$3%yd#6I+upN0tIt$D
z#+j|#9mfiW9(~MY*-yC;o9VnJtGz`==T!QMuHHX!S^fuDt|Nn}H5r>?Tu5BqQ0A<;
z)#k>T<-q>TM63m_pDihRL>dt=PElR@lcmJ4_F~9;-Iq1z$o6ga`=R5wffd-U!#3p2
zp4)G_uZ*YCksg)VW&yRjJM>!eiLJ!4Jn@WfsQwD9#;}bP(4y&j9m5}}m+ersTuH?6
z*?8#&REZJ4$W>hBdwz#cJBg?lowFS0Rp^+)CRY!*pW%0|{2N5&9da4`!exg41>kYP
zaS>Y_SE6Hd_?9a=;2|Dyf1C4Z!3FS`zYM;k@d*|<Q~0;JQXrbbe}{A81pI{%UXM=2
z@Db8e+P=qfj5Nt~@g&pLQ<&E9j8HMt8rcZ^05it@nUzo#C{(n!xbOyRmF!zweS_<9
zMamf*{L1~PBza^xzsT3+5_7zaHC#yqEsV-jzz&{|gYJYuZ;gUJCY%bY$3Zs!6GRL5
zuCd1J32=P`uBU<Tl1WtaN$}58z;6(|cnWw*x$a>v7R*-6Tr2;9ugaC*A;!gt^fH%#
g)kd7PP=2E>OtX4FvH;5E1-}{8!*L%!#nuM!FY2lU(EtDd

literal 2199
zcma)6TXWM!7(MGa5s?Mt0%_9(T1o(4Xw*yEQXB##6l$uF6sOKhUu1h@3v9_F$zk%Z
z+L@L@ANm9OqdGk+DYhFcGxmdbwU=|wp6~L{zkmG=-~kRbWCZRuysr7C-?rVrZrNra
z{bT7zgVT`aq36F2+Fq~9WqxbO3e3H-k8QJKyDf9C{z^7NflF_abGvr0Cw-z?sj%H>
zdw?3BE(>HkPC%HoyfwtGhQ8yr%7u8TA37b=;whe<tvW5&4*R|ouqL>&nJz}Up%b1A
z#FV#`kR7inXCZLWz%*uZxQuxXa{|T5-(z3_7X<V`c4&^$EO6O!T=}BktxNyFu6HPW
z!SWh*r)K+(`c4+JVcQ7=*3$*6*rWu7vW-*!4^Da!_Lz+f+pY}TUUT2}?XC=^Po9g)
z_WgdHLt8efDWBr@{jtS~{Z#f{H}El5=s;}82%FZD;r2;|y!S?fXn9f8Q~f?0GDUFH
zz#480{EiVb4q@j;vME9pn6jJPDCE-(J_}!{=_ul^h7wbJXsN<7@EO(xv}3!|mwQJ7
zi}~k?c~NCVd^$eImm0ocW>4}Q17Bf-vI80Jc-@}uo>bf;PZ_j0ZV;t?gL@jj6__7N
ztGJ<TNnfe^PGBit8P$|*mX)lsflWN%vq)A6MxwGbN_BdpP*YAnH1G(I1!f$VsmQFJ
z*vASl#pVj!p3HmR==Yj-C>8Tl15YC6CTl8Qsu*~V9~t&|DGqyzPl|feah-5Wz&t1J
z>20Y{6IglKXP4;8ihJw?4h!|M>w2LbI-bk=S+F`@x9+_*pGjBx)Y_!CQ~1e%g_lgW
zyn@iHUf*xXr;e)nD`y(&x(c1Zazax}A<0{w-!g-q>V`+Ec2%vL0V`N~A<NxNdUF{!
z*te$G+9^ymFU~a1HC*88EWa|)k>mJ~vkb>v@pl-d_qde7uhI4*|7Umwn8y|VFU7}j
zl{59r;RAfg{bkOl1wRzmM_A#p7=Jaw-{7hO(G~uCToYsPS0i{MK9#@=e8LxGQWbtW
zu5kGrg|~2<u!+K3k-|I3C%C`R3H9>TlKu{bw=hfDcli1(?k7%cWpMZ#_cKsdEFjDO
zYxM6r=2RD>!l5mz16x+Hjh!LsHZKY0>nZ6I!YNWCA^HA)Bzm-Wlh0lo0XGKVMjH4t
zZ19?j<yr6_Qo!%<Wd0oR6uT_!(xw*#SGlmqQ4wt=uh5HsV!v4W1IEy(IA?Mr6#78F
X9;M<SBGYs-gDL?tIKa;dNe%c9TPFTd

diff --git a/server/target/classes/data.sql b/server/target/classes/data.sql
index 102a72f6..3bc6b3d6 100644
--- a/server/target/classes/data.sql
+++ b/server/target/classes/data.sql
@@ -60,26 +60,33 @@ INSERT INTO f_company_info (
 -- ================================================================
 -- 产品分类
 -- ================================================================
-INSERT INTO f_product_category (product_category_id, name_zh, name_en, parent_id, sort_order) VALUES
-  (1, '连续涂镀机组', 'Continuous Coating Lines', NULL, 10),
-  (2, '连续热处理机组', 'Continuous Heat Treatment Lines', NULL, 20),
-  (3, '表面处理机组', 'Surface Treatment Lines', NULL, 30),
-  (4, '后处理及辅机', 'Post-processing & Auxiliary', NULL, 40),
-  (5, '单体设备', 'Single Equipment', NULL, 50),
-  (6, '备品备件', 'Spare Parts', NULL, 60),
-  (11, '热镀锌/镀铝锌机组', 'Hot Dipped Galvanizing / Galvalume Line', 1, 11),
-  (12, '锌铝镁机组', 'Zinc Aluminum Magnesium (ZAM) Line', 1, 12),
-  (13, '彩涂机组', 'Color Coating Line (CCL)', 1, 13),
-  (21, '普碳钢连续退火线', 'Plain Carbon Steel Continuous Annealing Line', 2, 21),
-  (22, '冷轧退火镀锌两用机组', 'Annealing & Galvanizing Combo Line', 2, 22),
-  (23, '硅钢连续处理机组', 'Silicon Steel Processing Line', 2, 23),
-  (31, '碳钢酸洗机组', 'Carbon Steel Pickling Line', 3, 31),
-  (32, '不锈钢退火酸洗机组', 'Stainless Steel Annealing & Pickling Line', 3, 32),
-  (41, '拉矫/脱脂/重卷线', 'Tension Leveling, Degreasing, Re-coiling', 4, 41)
+INSERT INTO f_product_category (product_category_id, name_zh, name_en, module_type, parent_id, sort_order) VALUES
+  (1, '连续涂镀机组', 'Continuous Coating Lines', 'product_line', NULL, 10),
+  (2, '连续热处理机组', 'Continuous Heat Treatment Lines', 'product_line', NULL, 20),
+  (3, '表面处理机组', 'Surface Treatment Lines', 'product_line', NULL, 30),
+  (4, '后处理及辅机', 'Post-processing & Auxiliary', 'product_line', NULL, 40),
+  (5, '单体设备', 'Single Equipment', 'equipment', NULL, 50),
+  (6, '备品备件', 'Spare Parts', 'spare_part', NULL, 60),
+  (11, '热镀锌/镀铝锌机组', 'Hot Dipped Galvanizing / Galvalume Line', 'product_line', 1, 11),
+  (12, '锌铝镁机组', 'Zinc Aluminum Magnesium (ZAM) Line', 'product_line', 1, 12),
+  (13, '彩涂机组', 'Color Coating Line (CCL)', 'product_line', 1, 13),
+  (21, '普碳钢连续退火线', 'Plain Carbon Steel Continuous Annealing Line', 'product_line', 2, 21),
+  (22, '冷轧退火镀锌两用机组', 'Annealing & Galvanizing Combo Line', 'product_line', 2, 22),
+  (23, '硅钢连续处理机组', 'Silicon Steel Processing Line', 'product_line', 2, 23),
+  (31, '碳钢酸洗机组', 'Carbon Steel Pickling Line', 'product_line', 3, 31),
+  (32, '不锈钢退火酸洗机组', 'Stainless Steel Annealing & Pickling Line', 'product_line', 3, 32),
+  (41, '拉矫/脱脂/重卷线', 'Tension Leveling, Degreasing, Re-coiling', 'product_line', 4, 41),
+  (200, '卷取设备', 'Reeling & Coiling Equipment', 'equipment', 5, 200),
+  (201, '炉类设备', 'Furnace Equipment', 'equipment', 5, 201),
+  (202, '涂布与焊接设备', 'Coating & Welding Equipment', 'equipment', 5, 202),
+  (203, '破鳞设备', 'Scale Breaking Equipment', 'equipment', 5, 203),
+  (204, '拉矫矫直设备', 'Leveling & Straightening Equipment', 'equipment', 5, 204),
+  (205, '剪切修边设备', 'Shearing & Trimming Equipment', 'equipment', 5, 205)
 ON DUPLICATE KEY UPDATE 
-  name_zh = VALUES(name_zh), name_en = VALUES(name_en), parent_id = VALUES(parent_id), sort_order = VALUES(sort_order);
+  name_zh = VALUES(name_zh), name_en = VALUES(name_en), module_type = VALUES(module_type),
+  parent_id = VALUES(parent_id), sort_order = VALUES(sort_order);
 
-ALTER TABLE f_product_category AUTO_INCREMENT = 100;
+ALTER TABLE f_product_category AUTO_INCREMENT = 210;
 
 -- ================================================================
 -- 案例分类
@@ -99,13 +106,37 @@ ON DUPLICATE KEY UPDATE
 -- ================================================================
 -- 新闻分类
 -- ================================================================
-INSERT INTO f_news_category (name_zh, name_en, sort_order) VALUES
-  ('公司新闻', 'Company News', 10),
-  ('行业动态', 'Industry News', 20),
-  ('技术文章', 'Technical Articles', 30)
+INSERT INTO f_news_category (site_code, name_zh, name_en, sort_order) VALUES
+  ('wuhansaga', '公司新闻', 'Company News', 10),
+  ('wuhansaga', '行业动态', 'Industry News', 20),
+  ('wuhansaga', '技术文章', 'Technical Articles', 30)
 ON DUPLICATE KEY UPDATE 
+  site_code = VALUES(site_code),
   name_zh = VALUES(name_zh), name_en = VALUES(name_en), sort_order = VALUES(sort_order);
 
+-- ================================================================
+-- 新闻文章（示例；生产环境可替换为正式稿件）
+-- ================================================================
+INSERT INTO f_news (category_id, site_code, title_zh, title_en, excerpt_zh, excerpt_en, content_zh, content_en, is_featured, is_published, sort_order) VALUES
+  (1, 'wuhansaga', '武汉萨格官网更新上线', 'Wuhan Saga Website Refresh',
+   '集中展示连续板带处理产线、单体设备及工程案例。',
+   'Highlighting strip processing lines, equipment and engineering cases.',
+   '<p>武汉萨格工程技术有限公司官网已升级，客户可通过产品中心了解热镀锌、退火、酸洗及感应加热等成套装备与单体设备，并查阅成功案例与新闻资讯。</p>',
+   '<p>Wuhan Saga Engineering has refreshed its website for strip galvanizing, annealing, pickling, induction heating solutions, case studies and news.</p>',
+   1, 1, 10),
+  (2, 'wuhansaga', '板带处理装备市场观察', 'Strip Processing Equipment Market Notes',
+   '节能与智能化连续处理机组需求持续增长。',
+   'Growing demand for energy-efficient intelligent continuous lines.',
+   '<p>国内外钢铁及加工企业持续投资连续镀锌、退火与酸洗机组。武汉萨格团队在设计与改造项目中注重节能环保与自动化控制。</p>',
+   '<p>Steel and processing firms continue to invest in continuous galvanizing, annealing and pickling lines with emphasis on energy saving and automation.</p>',
+   0, 1, 20),
+  (3, 'wuhansaga', '感应加热在涂层干燥中的应用', 'Induction Heating in Coating Drying',
+   '非接触加热可提高涂层烘干效率并降低能耗。',
+   'Non-contact heating can improve drying efficiency and save energy.',
+   '<p>感应加热适用于涂层干燥等工艺环节，可与产线控制深度集成，实现分区温控与节能运行。</p>',
+   '<p>Induction heating suits coating drying processes and integrates with line control for zoned temperature and energy saving.</p>',
+   0, 1, 30);
+
 -- ================================================================
 -- 关于我们
 -- ================================================================
@@ -278,28 +309,69 @@ ON DUPLICATE KEY UPDATE
 -- ================================================================
 -- 单体设备
 -- ================================================================
-INSERT INTO f_single_equipment (category_id, name_zh, name_en, technical_highlights_zh, technical_highlights_en, sort_order) VALUES
-  (5, '感应加热系统', 'Induction Heating System', '焊缝退火、硅钢轧前加热、涂层干燥', 'Weld annealing, Si-steel preheat, coating drying', 10),
-  (5, '镀后冷却系统', 'Post-plating Cooling System', '喷气冷却、气雾冷却（BLADE喷嘴）', 'Jet and air-mist cooling (BLADE nozzles)', 20),
-  (5, '电磁驱渣器', 'Electromagnetic Slag Drive', '替代人工除渣，自动化锌锅', 'Automated zinc pot skimming', 30),
-  (5, '红外辐射炉', 'Infrared Radiation Furnace', '涂层干燥，非接触加热', 'Non-contact coating drying', 40),
-  (5, '氢气回收装置', 'Hydrogen Recovery Unit', '回收率>75%，2-3年回本', 'Recovery rate >75%, typical payback 2–3 years', 50),
-  (5, '合金化炉', 'Alloy Coating Furnace', '直接火焰加热（FLOX/MILD），NOx降50-70%', 'FLOX/MILD firing, NOx reduction 50-70%', 60),
-  (5, '燃烧系统改造', 'Combustion System Revamp', '双燃料切换（LPG/NG/COG）', 'Dual-fuel switching (LPG/NG/COG)', 70)
-ON DUPLICATE KEY UPDATE 
-  name_zh = VALUES(name_zh), name_en = VALUES(name_en), technical_highlights_zh = VALUES(technical_highlights_zh), 
+INSERT INTO f_single_equipment (category_id, name_zh, name_en, technical_highlights_zh, technical_highlights_en, sort_order, is_published) VALUES
+  (5, '感应加热系统', 'Induction Heating System', '焊缝退火、硅钢轧前加热、涂层干燥', 'Weld annealing, Si-steel preheat, coating drying', 10, 1),
+  (5, '镀后冷却系统', 'Post-plating Cooling System', '喷气冷却、气雾冷却（BLADE喷嘴）', 'Jet and air-mist cooling (BLADE nozzles)', 20, 1),
+  (5, '电磁驱渣器', 'Electromagnetic Slag Drive', '替代人工除渣，自动化锌锅', 'Automated zinc pot skimming', 30, 1),
+  (5, '红外辐射炉', 'Infrared Radiation Furnace', '涂层干燥，非接触加热', 'Non-contact coating drying', 40, 1),
+  (5, '氢气回收装置', 'Hydrogen Recovery Unit', '回收率>75%，2-3年回本', 'Recovery rate >75%, typical payback 2–3 years', 50, 1),
+  (5, '合金化炉', 'Alloy Coating Furnace', '直接火焰加热（FLOX/MILD），NOx降50-70%', 'FLOX/MILD firing, NOx reduction 50-70%', 60, 1),
+  (5, '燃烧系统改造', 'Combustion System Revamp', '双燃料切换（LPG/NG/COG）', 'Dual-fuel switching (LPG/NG/COG)', 70, 1),
+  (200, '开收卷机（机型一）', 'Payoff / Tension Reel (Type A)', '板材开卷、张力卷取与收卷', 'Strip payoff, tension reel and recoiling', 200, 1),
+  (200, '开收卷机（机型二）', 'Payoff / Tension Reel (Type B)', '重载卷取与张力控制', 'Heavy-duty recoiling with tension control', 210, 1),
+  (201, '立式炉', 'Vertical Furnace', '立式布置热处理炉', 'Vertically arranged heat-treatment furnace', 220, 1),
+  (201, '卧式炉', 'Horizontal Furnace', '卧式连续热处理炉', 'Horizontal continuous heat-treatment furnace', 230, 1),
+  (202, '焊机', 'Welder', '带钢闪光焊、搭接焊等', 'Flash welding, lap welding for strip joining', 240, 1),
+  (202, '立式涂机', 'Vertical Coating Machine', '立式辊涂、涂层施加', 'Vertical roll coater / film application', 250, 1),
+  (202, '卧式涂机', 'Horizontal Coating Machine', '水平涂覆与烘干前道工序', 'Horizontal coating application', 260, 1),
+  (203, '破鳞机（机型一）', 'Scale Breaker (Type I)', '热轧氧化铁皮破碎与疏松', 'Breaking and loosening hot-rolled scale', 270, 1),
+  (203, '破鳞机（机型二）', 'Scale Breaker (Type II)', '另一型式破鳞与延伸', 'Alternative scale breaking configuration', 280, 1),
+  (204, '拉矫机', 'Tension Leveler', '带钢拉伸弯曲矫直', 'Tension leveling / stretch leveling', 290, 1),
+  (204, '两弯两矫拉弯矫直机', 'Two-bend Two-straight Stretch-bend Leveler', '多辊拉弯矫直改善板形', 'Multi-roll stretch-bend leveling for strip shape', 300, 1),
+  (205, '圆盘剪', 'Side Trimmer', '两侧碎边裁剪宽度', 'Side trimming for strip width', 310, 1),
+  (205, '碎边剪', 'Edge Chop Shear', '碎边切断与收集', 'Chopping and handling of edge trim', 320, 1),
+  (205, '圆盘剪（双刀头）', 'Side Trimmer (Twin Knife Head)', '双刀头提高修边效率', 'Twin knife heads for trimming efficiency', 330, 1),
+  (205, '双刀头碎边圆盘剪', 'Twin-head Edge-chop Disc Shear', '碎边与圆盘剪组合结构', 'Combined edge chop and disc shear', 340, 1)
+ON DUPLICATE KEY UPDATE
+  name_zh = VALUES(name_zh), name_en = VALUES(name_en), technical_highlights_zh = VALUES(technical_highlights_zh),
   technical_highlights_en = VALUES(technical_highlights_en), sort_order = VALUES(sort_order);
 
 -- ================================================================
--- 备品备件
+-- 成套机组与单体设备关联（与 f_single_equipment 自增 ID 顺序一致，可后台调整）
 -- ================================================================
-INSERT INTO f_spare_part (category_id, name_zh, name_en, description_zh, description_en, sort_order) VALUES
-  (6, '辐射管（W/I/U型）', 'Radiant Tubes (W/I/U)', '工业炉用辐射管', 'Radiant tubes for industrial furnaces', 10),
-  (6, '换热器', 'Heat Exchangers', '翅片管换热器、RJC换热器等', 'Finned tube and RJC-type exchangers', 20),
-  (6, '炉辊与张力辊', 'Hearth & Tension Rolls', '炉辊、大炉辊、张力辊、转向辊等', 'Hearth rolls, tension rolls, deflector rolls', 30)
-ON DUPLICATE KEY UPDATE 
-  name_zh = VALUES(name_zh), name_en = VALUES(name_en), description_zh = VALUES(description_zh), 
-  description_en = VALUES(description_en), sort_order = VALUES(sort_order);
+INSERT INTO f_product_line_equipment (product_line_id, equipment_id, sort_order) VALUES
+  (1, 3, 10), (1, 6, 20), (1, 2, 30), (1, 5, 40), (1, 1, 50), (1, 7, 60),
+  (2, 2, 10), (2, 5, 20), (2, 6, 30), (2, 7, 40),
+  (3, 10, 10), (3, 11, 20), (3, 4, 30), (3, 17, 40),
+  (4, 10, 10), (4, 11, 20), (4, 8, 30), (4, 9, 40), (4, 2, 50), (4, 6, 60),
+  (5, 4, 10), (5, 1, 20), (5, 13, 30), (5, 14, 40),
+  (6, 1, 10), (6, 10, 20), (6, 11, 30), (6, 5, 40),
+  (7, 15, 10), (7, 16, 20), (7, 17, 30), (7, 19, 40),
+  (8, 10, 10), (8, 11, 20), (8, 12, 30),
+  (9, 17, 10), (9, 18, 20), (9, 19, 30), (9, 20, 40), (9, 8, 50)
+ON DUPLICATE KEY UPDATE sort_order = VALUES(sort_order);
+
+-- ================================================================
+-- 备品备件（产品目录单品，与官网图册一致；封面请在后台上传 cover_image）
+-- ================================================================
+INSERT INTO f_spare_part (category_id, name_zh, name_en, description_zh, description_en, sort_order, is_published) VALUES
+  (6, '翅片管换热器', 'Finned Tube Heat Exchanger', '备品备件', 'Spare parts', 10, 1),
+  (6, 'RJC 换热器', 'RJC Heat exchanger', '备品备件', 'Spare parts', 20, 1),
+  (6, 'W 型辐射管', 'W-radiant tube', '备品备件', 'Spare parts', 30, 1),
+  (6, 'I 型辐射管', 'I-type Radiant Tube', '备品备件', 'Spare parts', 40, 1),
+  (6, 'U 型辐射管', 'U-Radiant Tube', '备品备件', 'Spare parts', 50, 1),
+  (6, '滑块', 'Slide Block', '备品备件', 'Spare parts', 60, 1),
+  (6, '轴套衬套', 'Bush and Sleeve', '备品备件', 'Spare parts', 70, 1),
+  (6, '支臂', 'Support Arm', '备品备件', 'Spare parts', 80, 1),
+  (6, '炉辊', 'Hearth Roll', '备品备件', 'Spare parts', 90, 1),
+  (6, '大炉辊', 'Big Hearth Roll', '备品备件', 'Spare parts', 100, 1),
+  (6, '镀铬辊', 'Chromed Roll', '备品备件', 'Spare parts', 110, 1),
+  (6, '氯丁胶转向辊', 'Rubber Turning Roll', '备品备件', 'Spare parts', 120, 1),
+  (6, '聚氨酯辊', 'PU Roll', '备品备件', 'Spare parts', 130, 1),
+  (6, '汲料辊', 'Pick Up Roll', '备品备件', 'Spare parts', 140, 1),
+  (6, '托辊', 'Support Roll', '备品备件', 'Spare parts', 150, 1),
+  (6, '水淬辊', 'Water Quenching Roll', '备品备件', 'Spare parts', 160, 1),
+  (6, '张力辊', 'Bridle Roll', '备品备件', 'Spare parts', 170, 1);
 
 -- ================================================================
 -- 成功案例
@@ -321,4 +393,5 @@ ON DUPLICATE KEY UPDATE
 ALTER TABLE f_company_info AUTO_INCREMENT = 2;
 ALTER TABLE f_case_category AUTO_INCREMENT = 9;
 ALTER TABLE f_news_category AUTO_INCREMENT = 4;
+ALTER TABLE f_news AUTO_INCREMENT = 4;
 ALTER TABLE f_media_library AUTO_INCREMENT = 500;
\ No newline at end of file
diff --git a/server/target/classes/mapper/NewsCategoryMapper.xml b/server/target/classes/mapper/NewsCategoryMapper.xml
index 125430ff..57bb83bb 100644
--- a/server/target/classes/mapper/NewsCategoryMapper.xml
+++ b/server/target/classes/mapper/NewsCategoryMapper.xml
@@ -7,11 +7,15 @@
     </resultMap>
 
     <select id="selectAll" resultMap="newsCategoryResult">
-        SELECT * FROM f_news_category WHERE del_flag = 0 ORDER BY sort_order ASC
+        SELECT * FROM f_news_category WHERE del_flag = 0
+        <if test="siteCode != null and siteCode != ''">AND site_code = #{siteCode}</if>
+        ORDER BY sort_order ASC
     </select>
 
     <select id="selectPublished" resultMap="newsCategoryResult">
-        SELECT * FROM f_news_category WHERE del_flag = 0 AND is_published = 1 ORDER BY sort_order ASC
+        SELECT * FROM f_news_category WHERE del_flag = 0 AND is_published = 1
+        <if test="siteCode != null and siteCode != ''">AND site_code = #{siteCode}</if>
+        ORDER BY sort_order ASC
     </select>
 
     <select id="selectById" resultMap="newsCategoryResult">
@@ -19,13 +23,14 @@
     </select>
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="newsCategoryId" keyColumn="category_id">
-        INSERT INTO f_news_category (name_zh, name_en, sort_order, is_published, create_by, remark)
-        VALUES (#{nameZh}, #{nameEn}, #{sortOrder}, #{isPublished}, #{createBy}, #{remark})
+        INSERT INTO f_news_category (site_code, name_zh, name_en, sort_order, is_published, create_by, remark)
+        VALUES (#{siteCode}, #{nameZh}, #{nameEn}, #{sortOrder}, #{isPublished}, #{createBy}, #{remark})
     </insert>
 
     <update id="update" parameterType="com.wuhansaga.server.entity.NewsCategory">
         UPDATE f_news_category
         <set>
+            <if test="siteCode != null">site_code = #{siteCode},</if>
             <if test="nameZh != null">name_zh = #{nameZh},</if>
             <if test="nameEn != null">name_en = #{nameEn},</if>
             <if test="sortOrder != null">sort_order = #{sortOrder},</if>
diff --git a/server/target/classes/mapper/NewsMapper.xml b/server/target/classes/mapper/NewsMapper.xml
index 065a5653..3927f612 100644
--- a/server/target/classes/mapper/NewsMapper.xml
+++ b/server/target/classes/mapper/NewsMapper.xml
@@ -5,6 +5,7 @@
     <resultMap id="newsResult" type="com.wuhansaga.server.entity.News">
         <id property="newsId" column="news_id"/>
         <result property="categoryId" column="category_id"/>
+        <result property="siteCode" column="site_code"/>
         <result property="titleZh" column="title_zh"/>
         <result property="titleEn" column="title_en"/>
         <result property="excerptZh" column="excerpt_zh"/>
@@ -12,11 +13,21 @@
         <result property="contentZh" column="content_zh"/>
         <result property="contentEn" column="content_en"/>
         <result property="coverImage" column="cover_image"/>
+        <result property="metaTitleZh" column="meta_title_zh"/>
+        <result property="metaTitleEn" column="meta_title_en"/>
+        <result property="metaDescriptionZh" column="meta_description_zh"/>
+        <result property="metaDescriptionEn" column="meta_description_en"/>
+        <result property="metaKeywords" column="meta_keywords"/>
         <result property="isFeatured" column="is_featured"/>
         <result property="isPublished" column="is_published"/>
         <result property="viewCount" column="view_count"/>
         <result property="sortOrder" column="sort_order"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
         <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
         <result property="categoryNameZh" column="category_name_zh"/>
         <result property="categoryNameEn" column="category_name_en"/>
     </resultMap>
@@ -26,8 +37,10 @@
         FROM f_news n
         LEFT JOIN f_news_category nc ON n.category_id = nc.category_id
         WHERE n.del_flag = 0
+        <if test="siteCode != null and siteCode != ''">AND n.site_code = #{siteCode}</if>
         <if test="categoryId != null">AND n.category_id = #{categoryId}</if>
         <if test="isFeatured != null">AND n.is_featured = #{isFeatured}</if>
+        <if test="isPublished != null">AND n.is_published = #{isPublished}</if>
         <if test="keyword != null and keyword != ''">
             AND (n.title_zh LIKE CONCAT('%',#{keyword},'%') OR n.title_en LIKE CONCAT('%',#{keyword},'%'))
         </if>
@@ -35,11 +48,14 @@
     </select>
 
     <select id="selectCount" resultType="long">
-        SELECT COUNT(*) FROM f_news WHERE del_flag = 0
-        <if test="categoryId != null">AND category_id = #{categoryId}</if>
-        <if test="isFeatured != null">AND is_featured = #{isFeatured}</if>
+        SELECT COUNT(*) FROM f_news n
+        WHERE n.del_flag = 0
+        <if test="siteCode != null and siteCode != ''">AND n.site_code = #{siteCode}</if>
+        <if test="categoryId != null">AND n.category_id = #{categoryId}</if>
+        <if test="isFeatured != null">AND n.is_featured = #{isFeatured}</if>
+        <if test="isPublished != null">AND n.is_published = #{isPublished}</if>
         <if test="keyword != null and keyword != ''">
-            AND (title_zh LIKE CONCAT('%',#{keyword},'%') OR title_en LIKE CONCAT('%',#{keyword},'%'))
+            AND (n.title_zh LIKE CONCAT('%',#{keyword},'%') OR n.title_en LIKE CONCAT('%',#{keyword},'%'))
         </if>
     </select>
 
@@ -48,6 +64,7 @@
         FROM f_news n
         LEFT JOIN f_news_category nc ON n.category_id = nc.category_id
         WHERE n.del_flag = 0 AND n.is_published = 1
+          AND n.site_code = #{siteCode}
         <if test="categoryId != null">AND n.category_id = #{categoryId}</if>
         <if test="isFeatured != null">AND n.is_featured = #{isFeatured}</if>
         ORDER BY n.sort_order ASC, n.create_time DESC
@@ -60,11 +77,19 @@
         WHERE n.news_id = #{id} AND n.del_flag = 0
     </select>
 
+    <select id="selectPublishedById" resultMap="newsResult">
+        SELECT n.*, nc.name_zh AS category_name_zh, nc.name_en AS category_name_en
+        FROM f_news n
+        LEFT JOIN f_news_category nc ON n.category_id = nc.category_id
+        WHERE n.news_id = #{id} AND n.del_flag = 0 AND n.is_published = 1
+          AND n.site_code = #{siteCode}
+    </select>
+
     <insert id="insert" useGeneratedKeys="true" keyProperty="newsId">
-        INSERT INTO f_news (category_id, title_zh, title_en, excerpt_zh, excerpt_en, content_zh, content_en,
+        INSERT INTO f_news (category_id, site_code, title_zh, title_en, excerpt_zh, excerpt_en, content_zh, content_en,
                             cover_image, meta_title_zh, meta_title_en, meta_description_zh, meta_description_en,
                             meta_keywords, is_featured, is_published, sort_order, create_by, remark)
-        VALUES (#{categoryId}, #{titleZh}, #{titleEn}, #{excerptZh}, #{excerptEn}, #{contentZh}, #{contentEn},
+        VALUES (#{categoryId}, #{siteCode}, #{titleZh}, #{titleEn}, #{excerptZh}, #{excerptEn}, #{contentZh}, #{contentEn},
                 #{coverImage}, #{metaTitleZh}, #{metaTitleEn}, #{metaDescriptionZh}, #{metaDescriptionEn},
                 #{metaKeywords}, #{isFeatured}, #{isPublished}, #{sortOrder}, #{createBy}, #{remark})
     </insert>
@@ -73,6 +98,7 @@
         UPDATE f_news
         <set>
             <if test="categoryId != null">category_id = #{categoryId},</if>
+            <if test="siteCode != null">site_code = #{siteCode},</if>
             <if test="titleZh != null">title_zh = #{titleZh},</if>
             <if test="titleEn != null">title_en = #{titleEn},</if>
             <if test="excerptZh != null">excerpt_zh = #{excerptZh},</if>
@@ -80,6 +106,11 @@
             <if test="contentZh != null">content_zh = #{contentZh},</if>
             <if test="contentEn != null">content_en = #{contentEn},</if>
             <if test="coverImage != null">cover_image = #{coverImage},</if>
+            <if test="metaTitleZh != null">meta_title_zh = #{metaTitleZh},</if>
+            <if test="metaTitleEn != null">meta_title_en = #{metaTitleEn},</if>
+            <if test="metaDescriptionZh != null">meta_description_zh = #{metaDescriptionZh},</if>
+            <if test="metaDescriptionEn != null">meta_description_en = #{metaDescriptionEn},</if>
+            <if test="metaKeywords != null">meta_keywords = #{metaKeywords},</if>
             <if test="isFeatured != null">is_featured = #{isFeatured},</if>
             <if test="isPublished != null">is_published = #{isPublished},</if>
             <if test="sortOrder != null">sort_order = #{sortOrder},</if>
diff --git a/server/target/classes/schema.sql b/server/target/classes/schema.sql
index c13244ce..3dd85322 100644
--- a/server/target/classes/schema.sql
+++ b/server/target/classes/schema.sql
@@ -195,6 +195,7 @@ CREATE TABLE IF NOT EXISTS f_product_category (
   product_category_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
   name_zh VARCHAR(100) NOT NULL COMMENT '分类名称（中文）',
   name_en VARCHAR(100) NOT NULL COMMENT '分类名称（英文）',
+  module_type VARCHAR(20) NOT NULL DEFAULT 'product_line' COMMENT '模块类型 product_line/equipment/spare_part',
   parent_id BIGINT NULL COMMENT '父分类ID',
   icon_class VARCHAR(100) COMMENT '图标类名',
   sort_order INT NOT NULL DEFAULT 0 COMMENT '排序',
@@ -280,6 +281,19 @@ CREATE TABLE IF NOT EXISTS f_single_equipment (
   KEY idx_f_single_equipment_category (category_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='单体设备';
 
+-- ================================================================
+-- 成套机组与单体设备关联表（多对多）
+-- ================================================================
+CREATE TABLE IF NOT EXISTS f_product_line_equipment (
+  product_line_equipment_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
+  product_line_id BIGINT NOT NULL COMMENT '成套机组ID',
+  equipment_id BIGINT NOT NULL COMMENT '单体设备ID（f_single_equipment）',
+  sort_order INT NOT NULL DEFAULT 0 COMMENT '排序',
+  PRIMARY KEY (product_line_equipment_id),
+  UNIQUE KEY uk_f_ple_line_equipment (product_line_id, equipment_id),
+  KEY idx_f_ple_equipment (equipment_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='成套机组关联单体设备';
+
 -- ================================================================
 -- 备品备件表
 -- ================================================================
@@ -366,6 +380,7 @@ CREATE TABLE IF NOT EXISTS f_case_study (
 -- ================================================================
 CREATE TABLE IF NOT EXISTS f_news_category (
   category_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
+  site_code VARCHAR(32) NOT NULL DEFAULT 'wuhansaga' COMMENT '站点编码：小写英文短码，与 f_news.site_code 取值域一致',
   name_zh VARCHAR(100) NOT NULL COMMENT '分类名称（中文）',
   name_en VARCHAR(100) NOT NULL COMMENT '分类名称（英文）',
   sort_order INT NOT NULL DEFAULT 0 COMMENT '排序',
@@ -376,7 +391,8 @@ CREATE TABLE IF NOT EXISTS f_news_category (
   update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   remark VARCHAR(500) DEFAULT NULL COMMENT '备注',
   del_flag TINYINT(1) NOT NULL DEFAULT 0 COMMENT '删除标志：0正常 1删除',
-  PRIMARY KEY (category_id)
+  PRIMARY KEY (category_id),
+  KEY idx_f_news_category_site (site_code, del_flag, is_published, sort_order)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='新闻分类';
 
 -- ================================================================
@@ -385,6 +401,7 @@ CREATE TABLE IF NOT EXISTS f_news_category (
 CREATE TABLE IF NOT EXISTS f_news (
   news_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
   category_id BIGINT NOT NULL COMMENT '所属分类',
+  site_code VARCHAR(32) NOT NULL DEFAULT 'wuhansaga' COMMENT '站点编码：与分类 site_code 一致，用于多站点数据隔离',
   title_zh VARCHAR(200) NOT NULL COMMENT '标题（中文）',
   title_en VARCHAR(200) NOT NULL COMMENT '标题（英文）',
   excerpt_zh TEXT COMMENT '摘要（中文）',
@@ -408,6 +425,8 @@ CREATE TABLE IF NOT EXISTS f_news (
   remark VARCHAR(500) DEFAULT NULL COMMENT '备注',
   del_flag TINYINT(1) NOT NULL DEFAULT 0 COMMENT '删除标志：0正常 1删除',
   PRIMARY KEY (news_id),
+  KEY idx_f_news_site_list (site_code, del_flag, is_published, category_id),
+  KEY idx_f_news_site_time (site_code, del_flag, is_published, create_time),
   KEY idx_f_news_category (category_id),
   KEY idx_f_news_create_time (create_time)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='新闻文章';
@@ -534,6 +553,14 @@ ALTER TABLE f_single_equipment
     FOREIGN KEY (category_id) REFERENCES f_product_category (product_category_id)
     ON DELETE CASCADE ON UPDATE CASCADE;
 
+ALTER TABLE f_product_line_equipment
+  ADD CONSTRAINT fk_f_ple_product_line
+    FOREIGN KEY (product_line_id) REFERENCES f_product_line (product_line_id)
+    ON DELETE CASCADE ON UPDATE CASCADE,
+  ADD CONSTRAINT fk_f_ple_single_equipment
+    FOREIGN KEY (equipment_id) REFERENCES f_single_equipment (single_equipment_id)
+    ON DELETE CASCADE ON UPDATE CASCADE;
+
 ALTER TABLE f_spare_part
   ADD CONSTRAINT fk_f_spare_part_category
     FOREIGN KEY (category_id) REFERENCES f_product_category (product_category_id)
diff --git a/server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index 913d31a4..bfd4da2c 100644
--- a/server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -2,6 +2,7 @@ com\wuhansaga\server\entity\CaseStudy.class
 com\wuhansaga\server\WuhanSagaApplication.class
 com\wuhansaga\server\entity\CompanyInfo.class
 com\wuhansaga\server\controller\portal\PortalAboutController.class
+com\wuhansaga\server\constant\SiteCodes.class
 com\wuhansaga\server\mapper\SingleEquipmentMapper.class
 com\wuhansaga\server\mapper\ProductCategoryMapper.class
 com\wuhansaga\server\service\WorkshopService.class
@@ -33,6 +34,7 @@ com\wuhansaga\server\common\GlobalExceptionHandler.class
 com\wuhansaga\server\mapper\NewsCategoryMapper.class
 com\wuhansaga\server\controller\admin\AdminMediaController.class
 com\wuhansaga\server\mapper\ProductMediaMapper.class
+com\wuhansaga\server\config\PortalSiteResolver.class
 com\wuhansaga\server\service\CaseCategoryService.class
 com\wuhansaga\server\service\ProductLineService.class
 com\wuhansaga\server\service\SingleEquipmentService.class
@@ -65,6 +67,7 @@ com\wuhansaga\server\service\SparePartService.class
 com\wuhansaga\server\mapper\CoreTechnologyMapper.class
 com\wuhansaga\server\mapper\ProductLineMapper.class
 com\wuhansaga\server\controller\admin\AdminNewsController.class
+com\wuhansaga\server\config\PortalSiteProperties.class
 com\wuhansaga\server\controller\admin\AdminSparePartController.class
 com\wuhansaga\server\service\NewsService.class
 com\wuhansaga\server\controller\admin\AdminCoreTechnologyController.class
diff --git a/server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 9bc2abb8..db7fbce4 100644
--- a/server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -4,9 +4,12 @@ D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\common\PageResult.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\common\R.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\config\OpenApiConfig.java
+D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\config\PortalSiteProperties.java
+D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\config\PortalSiteResolver.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\config\RedisConfig.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\config\SaTokenConfig.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\config\WebMvcConfig.java
+D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\constant\SiteCodes.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\controller\admin\AdminAboutController.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\controller\admin\AdminAuthController.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\controller\admin\AdminBannerController.java
@@ -58,6 +61,7 @@ D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\mapper\NewsCategoryMapper.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\mapper\NewsMapper.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\mapper\ProductCategoryMapper.java
+D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\mapper\ProductLineEquipmentMapper.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\mapper\ProductLineMapper.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\mapper\ProductMediaMapper.java
 D:\DeXun_workspace\projects\wuhan-saga-official-website\server\src\main\java\com\wuhansaga\server\mapper\SingleEquipmentMapper.java