diff --git a/.gitignore b/.gitignore
index 687b526..2b552d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # frontend-vue (Vue 3 + Vite)
 frontend-vue/node_modules/
+frontend-vue/node/
 
 # frontend build output (auto-generated by Docker build)
 src/main/resources/static/v2/
diff --git a/AGENTS.md b/AGENTS.md
index e03946c..13269fc 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -9,7 +9,7 @@
 - 核心目录：
   - `src/main/java/com/svnlog/`
   - `docs/`
-  - SVN 预设地址：通过仓库管理页维护，持久化至 `outputs/repository-configs.json`
+  - 仓库预设（SVN / Git）：通过仓库管理页维护，持久化至 `outputs/repository-configs.json`
 
 ## 2. 常用命令（Build / Lint / Test / Run）
 以下命令默认在仓库根目录执行。
@@ -32,7 +32,7 @@
 - 运行单个测试方法（重点）：`mvn -Dtest=ClassName#methodName test`
 - 单测方法示例：`mvn -Dtest=SVNLogFetcherTest#shouldFilterByUser test`
 - 调试失败测试（输出更完整）：`mvn -Dtest=ClassName test -e`
-- 说明：当前 `src/test/java` 为空；新增测试时采用 Surefire 默认约定。
+- 说明：测试采用 JUnit 5（Jupiter）+ Surefire 默认约定；现有测试含 `GitLogFetcherTest`（本地 git 仓库夹具，不依赖外网）等。
 
 ### 2.4 Run
 - 运行 Web 工作台（Docker，推荐）：
@@ -45,13 +45,18 @@
 
 ## 3. 代码结构与职责边界
 - `SVNLogFetcher.java`：SVN 连接、版本区间处理、日志抓取、用户过滤。
-- `LogEntry.java`：日志数据模型（POJO）。
-- `web/controller/*`：REST API（SVN、AI、任务、文件、设置）。
-- `web/service/*`：异步任务与业务编排（SVN 抓取、AI 分析、输出目录管理）。
+- `core/git/GitLogFetcher.java`：Git（JGit）远程仓库 mirror 缓存、增量 fetch、按时间范围过滤、作者过滤、变更文件提取；支持 HTTPS Token 与 SSH 私钥认证。
+- `core/range/DateRangeResolver.java`：按月份/日期/周解析时间范围（SVN 与 Git 共用）。
+- `LogEntry.java`：日志数据模型（POJO；SVN 用 `revision`，Git 用 `commitHash`）。
+- `web/controller/*`：REST API（SVN、Git、AI、任务、文件、设置）。
+- `web/service/*`：异步任务与业务编排（SVN 抓取、Git 抓取、AI 分析、输出目录管理）。
+  - `SvnPresetService` / `GitPresetService`：SVN / Git 仓库预设管理（共享 `RepositoryConfigService`，按 `type` 区分）。
+  - `AiWorkflowService`：项目列表动态化（启用预设 = 项目，固定 3 个 SVN 项目顺序优先），支持 SVN + Git 报告合并整体 Excel。
 - `src/main/resources/static/*`：Web 前端页面与交互脚本。
 - 变更原则：
-  - 抓取逻辑改在 `SVNLogFetcher`。
+  - 抓取逻辑改在 `SVNLogFetcher` / `GitLogFetcher`。
   - AI/Excel 逻辑改在 `web/service/AiWorkflowService`。
+  - 时间范围解析改在 `core/range/DateRangeResolver`。
   - 不把多种职责混入同一方法。
 
 ## 4. 代码风格规范（必读）
diff --git a/Dockerfile b/Dockerfile
index 7c2eb9d..7ab4241 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,11 @@
 # Docker 镜像仓库加速（默认使用 docker.1ms.run 国内代理）
 # 如需切换回 Docker Hub：
 #   DOCKER_REGISTRY_MIRROR=docker.io/library make up
+# npm 源加速（默认 npmmirror 国内镜像，可用 NPM_REGISTRY 覆盖）：
+#   NPM_REGISTRY=https://registry.npmjs.org make up
 # ============================================================
 ARG REGISTRY_MIRROR=docker.1ms.run/library
+ARG NPM_REGISTRY=https://registry.npmmirror.com
 # 内部/开发用途，推荐通过 make fast-up 触发快速构建
 ARG FAST_BUILD=false
 
@@ -16,7 +19,9 @@ WORKDIR /frontend
 
 COPY frontend-vue/package.json frontend-vue/package-lock.json ./
 
-RUN --mount=type=cache,target=/root/.npm npm ci
+RUN --mount=type=cache,target=/root/.npm \
+    npm config set registry ${NPM_REGISTRY} && \
+    npm ci
 
 COPY frontend-vue/ ./
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dfcb417..aeb24f4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
         # Docker 镜像加速（使用 DOCKER_REGISTRY_MIRROR 传递，国内可选阿里云，例如 registry.cn-hangzhou.aliyuncs.com/library，不能带 https://）
         # 内部/开发用途，推荐通过 make fast-up 使用快速构建
         REGISTRY_MIRROR: ${DOCKER_REGISTRY_MIRROR:-docker.1ms.run/library}
+        NPM_REGISTRY: ${NPM_REGISTRY:-https://registry.npmmirror.com}
         FAST_BUILD: ${FAST_BUILD:-false}
     container_name: svn-log-tool
     network_mode: host
diff --git a/docs/README_Web.md b/docs/README_Web.md
index daf03cd..11c5380 100644
--- a/docs/README_Web.md
+++ b/docs/README_Web.md
@@ -4,14 +4,14 @@
 
 Web 工作台将现有 CLI 能力封装为可视化页面与 REST API，支持以下流程：
 
-1. SVN 参数录入与连接测试
+1. 仓库参数录入与连接测试（SVN / Git 两种类型）
 2. 异步抓取日志并导出 Markdown
 3. 使用 DeepSeek 或 OpenAI 兼容接口分析 Markdown 并生成 Excel
 4. 查看任务历史（状态、进度、错误、产物），支持筛选、分页与取消运行中任务
 5. 下载输出文件、配置 API Key、SVN 账号与输出目录
 6. 工作台展示系统健康状态（输出目录可写性、API Key 配置、任务统计）
 
-批量抓取策略：多个项目按顺序执行（前一个项目完成后才开始下一个）。
+批量抓取策略：多个项目（SVN + Git 可混合）按顺序执行（前一个项目完成后才开始下一个），最终汇总为一份 Excel 整体报告。
 
 ## 启动方式
 
@@ -51,11 +51,21 @@ http://localhost:18088
 ## 页面说明
 
 - 工作台：最近任务统计与最近产物
-- SVN 日志抓取：版本区间、过滤用户与连接测试；SVN 账号密码统一在系统设置中托管
-- AI 工作量分析：选择 Markdown 文件、工作周期、输出文件名
+- 日志抓取：选择 SVN / Git 仓库（可混合），选时间范围（月/周/日）、过滤用户与连接测试；SVN 自动填充版本号，Git 直接按时间范围抓取
+- AI 工作量分析：选择 Markdown 文件、工作周期、输出文件名；SVN 与 Git 报告可多选合并，按项目归类生成整体 Excel
 - 任务历史：异步任务状态与产物列表，支持筛选、分页、取消任务
+- 仓库管理：SVN / Git 预设 CRUD、连接测试；Git 预设支持分支（留空自动探测）、HTTPS Token 或 SSH 私钥认证
 - 系统设置：AI 提供商、DeepSeek API Key、OpenAI 兼容 Base URL/API Key/阶段模型、SVN 用户名/密码、输出目录、默认 SVN 预置项目
 
+## Git 仓库支持说明
+
+- 一个 Git 地址即一个项目（与 SVN 语义一致），在「仓库管理」新增仓库时选择类型 `Git`。
+- Git 抓取基于 JGit（纯 Java），HTTPS 使用「用户名 + Token」，SSH 使用预设中保存的私钥（加密存储）。
+- 首次抓取会 mirror 克隆到 `java.io.tmpdir/svnlog-git-cache/<presetId>/`（首次较慢），后续增量 fetch。
+- Git 报告显示提交短 hash（如 `4fed870`），AI 分析与 Excel 汇总逻辑与 SVN 一致，SVN + Git 报告可混合合并为整体工作量统计。
+- SSH 主机密钥默认严格校验（读取 `~/.ssh/known_hosts`）；内网可显式开启信任任意主机：
+  - `SVN_LOG_TOOL_ACCEPT_ANY_SSH_HOST=true` 或 `-Dsvnlog.git.acceptAnySshHost=true`
+
 ## 输出目录
 
 - 默认输出目录：`outputs/`
@@ -123,6 +133,10 @@ http://localhost:18088
 - `POST /api/svn/fetch`
 - `POST /api/svn/version-range`：按 `rangeType=date|week|month` 查询版本范围；旧的 `year/month` 月份请求仍兼容
 - `GET /api/svn/presets`
+- `POST /api/git/test-connection`
+- `POST /api/git/fetch`：按 `rangeType=date|week|month` + 时间参数直接抓取（Git 无版本号）
+- `POST /api/git/version-range`：返回 `commitCount` 与首尾提交 hash
+- `GET /api/git/presets`
 - `POST /api/ai/analyze`
 - `GET /api/tasks`
 - `GET /api/tasks/query?status=&type=&keyword=&page=1&size=10`
diff --git a/frontend-vue/index.html b/frontend-vue/index.html
index 45439fd..fcfb748 100644
--- a/frontend-vue/index.html
+++ b/frontend-vue/index.html
@@ -2,6 +2,7 @@
 <html lang="zh-CN">
 <head>
   <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="color-scheme" content="dark" />
   <meta name="theme-color" content="#0F172A" />
diff --git a/frontend-vue/public/favicon.svg b/frontend-vue/public/favicon.svg
new file mode 100644
index 0000000..0a999cd
--- /dev/null
+++ b/frontend-vue/public/favicon.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+  <rect width="128" height="128" rx="28" fill="#22C55E"/>
+  <text x="50%" y="54%" dominant-baseline="middle" text-anchor="middle" font-family="system-ui, -apple-system, sans-serif" font-weight="900" font-size="48" fill="#FFFFFF">LOG</text>
+</svg>
diff --git a/frontend-vue/src/components/AppSidebar.vue b/frontend-vue/src/components/AppSidebar.vue
index c758707..8923059 100644
--- a/frontend-vue/src/components/AppSidebar.vue
+++ b/frontend-vue/src/components/AppSidebar.vue
@@ -3,8 +3,8 @@
     <div class="sidebar-brand">
       <div class="sidebar-brand-icon" aria-hidden="true">S</div>
       <div class="sidebar-brand-text">
-        <h1>SVN 工作台</h1>
-        <p>v2 · Log &amp; Analysis</p>
+        <h1>日志工作台</h1>
+        <p>v2 · SVN &amp; Git</p>
       </div>
     </div>
     <nav class="sidebar-nav">
@@ -12,10 +12,14 @@
         <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/></svg>
         <span>工作台</span>
       </router-link>
-      <router-link class="sidebar-link" to="/svn-fetch" active-class="active" aria-label="SVN 日志抓取">
+      <router-link class="sidebar-link" to="/svn-fetch" active-class="active" aria-label="日志抓取">
         <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
         <span>日志抓取</span>
       </router-link>
+      <router-link class="sidebar-link" to="/projects" active-class="active" aria-label="项目管理">
+        <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87"/><path d="M16 3.13a4 4 0 0 1 0 7.75"/></svg>
+        <span>项目管理</span>
+      </router-link>
       <router-link class="sidebar-link" to="/presets" active-class="active" aria-label="仓库管理">
         <svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg>
         <span>仓库管理</span>
@@ -29,6 +33,6 @@
         <span>系统设置</span>
       </router-link>
     </nav>
-    <div class="sidebar-footer">SVN Log Tool v2</div>
+    <div class="sidebar-footer">SVN Log Tool v2 · Git Ready</div>
   </aside>
 </template>
diff --git a/frontend-vue/src/main.js b/frontend-vue/src/main.js
index 93a878a..12a027c 100644
--- a/frontend-vue/src/main.js
+++ b/frontend-vue/src/main.js
@@ -6,14 +6,16 @@ import SvnFetchView from './views/SvnFetchView.vue'
 import HistoryView from './views/HistoryView.vue'
 import SettingsView from './views/SettingsView.vue'
 import SvnPresetsView from './views/SvnPresetsView.vue'
+import ProjectManageView from './views/ProjectManageView.vue'
 import './styles/main.css'
 
 const routes = [
   { path: '/', redirect: '/dashboard' },
   { path: '/dashboard', name: 'dashboard', component: DashboardView, meta: { title: '工作台', desc: '查看系统状态与最近产物' } },
-  { path: '/svn-fetch', name: 'svn-fetch', component: SvnFetchView, meta: { title: '日志抓取', desc: '一键抓取 SVN 日志并导出工作量 Excel' } },
+  { path: '/svn-fetch', name: 'svn-fetch', component: SvnFetchView, meta: { title: '日志抓取', desc: '一键抓取 SVN/Git 日志并导出工作量 Excel' } },
   { path: '/history', name: 'history', component: HistoryView, meta: { title: '任务历史', desc: '查看任务执行状态、日志与产物' } },
-  { path: '/presets', name: 'presets', component: SvnPresetsView, meta: { title: '仓库管理', desc: '管理 SVN 仓库预设' } },
+  { path: '/projects', name: 'projects', component: ProjectManageView, meta: { title: '项目管理', desc: '创建项目并将 SVN/Git 仓库拖拽分配到项目' } },
+  { path: '/presets', name: 'presets', component: SvnPresetsView, meta: { title: '仓库管理', desc: '管理 SVN / Git 仓库预设' } },
   { path: '/settings', name: 'settings', component: SettingsView, meta: { title: '系统设置', desc: '配置 API Key 与输出目录' } },
 ]
 
diff --git a/frontend-vue/src/styles/main.css b/frontend-vue/src/styles/main.css
index c8b457b..b3a2a96 100644
--- a/frontend-vue/src/styles/main.css
+++ b/frontend-vue/src/styles/main.css
@@ -423,6 +423,7 @@ body {
 .tag-danger { background: var(--c-danger-bg); color: var(--c-danger); }
 .tag-muted { background: rgba(100, 116, 139, 0.15); color: var(--c-text-muted); }
 .tag-info { background: var(--c-info-bg); color: var(--c-info); }
+.tag-default { background: var(--c-info-bg); color: var(--c-info); }
 
 /* ========== Tables ========== */
 .table-wrap {
diff --git a/frontend-vue/src/views/ProjectManageView.vue b/frontend-vue/src/views/ProjectManageView.vue
new file mode 100644
index 0000000..3f9b0e1
--- /dev/null
+++ b/frontend-vue/src/views/ProjectManageView.vue
@@ -0,0 +1,341 @@
+<template>
+  <div class="project-manage">
+    <!-- 新建项目 -->
+    <div class="card" style="margin-bottom:var(--space-lg);">
+      <div class="card-title">
+        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 5v14"/><path d="M5 12h14"/></svg>
+        新建项目
+      </div>
+      <form @submit.prevent="onCreate" class="form-group" style="display:flex;gap:8px;max-width:480px;margin-top:var(--space-sm);">
+        <input v-model="newProjectName" class="form-input" placeholder="输入项目名称，例如 PRS-7050场站智慧管控" required autocomplete="off" spellcheck="false" />
+        <button type="submit" class="btn btn-primary" :disabled="creating">
+          <span v-if="creating" class="spinner"></span>
+          创建
+        </button>
+      </form>
+      <p style="font-size:12px;color:var(--c-text-muted);margin-top:var(--space-sm);">
+        提示：将下方仓库卡片拖拽到项目卡片中即可分配；一个仓库只能属于一个项目。
+      </p>
+    </div>
+
+    <!-- 项目卡片列表 -->
+    <div v-if="projects.length" class="project-grid">
+      <div
+        v-for="(project, idx) in projects"
+        :key="project.id"
+        class="project-card"
+        :class="{ 'drag-over': dragOverProjectId === project.id }"
+        @dragover.prevent="onDragOver(project.id)"
+        @dragleave="onDragLeave(project.id)"
+        @drop.prevent="onDrop($event, project.id)"
+      >
+        <div class="project-card-header">
+          <h3 class="project-card-name">{{ project.name }}</h3>
+          <div class="btn-group" style="gap:4px;">
+            <button type="button" class="btn btn-sm" :disabled="idx === 0" @click="onMove(project.id, 'up')" title="上移">↑</button>
+            <button type="button" class="btn btn-sm" :disabled="idx === projects.length - 1" @click="onMove(project.id, 'down')" title="下移">↓</button>
+            <button type="button" class="btn btn-sm" @click="startRename(project)" title="重命名">改名</button>
+            <button type="button" class="btn btn-sm btn-danger" :disabled="project.repos.length > 0" :title="project.repos.length ? '项目下有仓库，需先移出' : '删除项目'" @click="onDelete(project)">删除</button>
+          </div>
+        </div>
+        <div class="project-card-repos">
+          <div v-if="!project.repos.length" class="repo-empty">拖拽仓库到此项目</div>
+          <div
+            v-for="repo in project.repos"
+            :key="repo.id"
+            class="repo-chip"
+            draggable="true"
+            @dragstart="onDragStart($event, repo.id)"
+          >
+            <span :class="['tag', repo.type === 'GIT' ? 'tag-info' : 'tag-default']">{{ repo.type === 'GIT' ? 'Git' : 'SVN' }}</span>
+            <span class="repo-name" :title="repo.url">{{ repo.name }}</span>
+            <span class="repo-type-hint">可拖出</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-else-if="!loading" class="card" style="text-align:center;padding:var(--space-2xl);">
+      <p style="font-size:13px;color:var(--c-text-muted);">暂无项目，请先在上方创建。</p>
+    </div>
+
+    <!-- 未分配仓库 -->
+    <div class="card" style="margin-top:var(--space-lg);">
+      <div class="card-title">
+        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg>
+        仓库（拖拽到上方项目卡片分配）
+      </div>
+      <div class="project-card-repos" style="margin-top:var(--space-sm);">
+        <div
+          v-for="repo in allRepos"
+          :key="repo.id"
+          class="repo-chip"
+          draggable="true"
+          @dragstart="onDragStart($event, repo.id)"
+        >
+          <span :class="['tag', repo.type === 'GIT' ? 'tag-info' : 'tag-default']">{{ repo.type === 'GIT' ? 'Git' : 'SVN' }}</span>
+          <span class="repo-name" :title="repo.url">{{ repo.name }}</span>
+          <span v-if="!repo.assigned" class="repo-type-hint">未分配</span>
+        </div>
+        <div v-if="!allRepos.length" class="repo-empty">暂无仓库</div>
+      </div>
+    </div>
+
+    <!-- 重命名弹窗 -->
+    <div v-if="renameTarget" class="modal-overlay" @click.self="renameTarget = null">
+      <div class="modal" style="max-width:400px;" role="dialog" aria-label="重命名项目">
+        <h3 style="font-size:15px;font-weight:600;margin-bottom:var(--space-md);">重命名项目</h3>
+        <form @submit.prevent="onRename">
+          <div class="form-group">
+            <label for="rename-name">项目名称</label>
+            <input id="rename-name" class="form-input" v-model="renameForm.name" required autocomplete="off" spellcheck="false" />
+          </div>
+          <div class="btn-group" style="margin-top:var(--space-lg);">
+            <button type="submit" class="btn btn-primary" :disabled="saving">
+              <span v-if="saving" class="spinner"></span>
+              保存
+            </button>
+            <button type="button" class="btn" @click="renameTarget = null">取消</button>
+          </div>
+        </form>
+      </div>
+    </div>
+
+    <div v-if="loading" class="card" style="text-align:center;padding:var(--space-2xl);">
+      <span class="spinner"></span>
+      <p style="margin-top:var(--space-sm);font-size:13px;color:var(--c-text-muted);">加载中...</p>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+import { useApi, useToast } from '../composables/useApi'
+
+const { apiFetch } = useApi()
+const { toast } = useToast()
+
+const loading = ref(true)
+const creating = ref(false)
+const saving = ref(false)
+const projects = ref([])
+const unassigned = ref([])
+const newProjectName = ref('')
+const renameTarget = ref(null)
+const renameForm = ref({ name: '' })
+const dragOverProjectId = ref(null)
+const draggingRepoId = ref(null)
+
+const allRepos = computed(() => {
+  const assigned = new Set()
+  for (const p of projects.value) {
+    for (const r of p.repos) {
+      r.assigned = true
+      assigned.add(r.id)
+    }
+  }
+  return [...unassigned.value.map(r => ({ ...r, assigned: false })), ...[].concat(...projects.value.map(p => p.repos))]
+})
+
+onMounted(async () => {
+  await loadProjects()
+})
+
+async function loadProjects() {
+  loading.value = true
+  try {
+    const data = await apiFetch('/api/projects')
+    projects.value = data.projects || []
+    unassigned.value = data.unassigned || []
+  } catch (err) {
+    toast(err.message, true)
+  } finally {
+    loading.value = false
+  }
+}
+
+async function onCreate() {
+  const name = newProjectName.value.trim()
+  if (!name) { toast('请输入项目名称', true); return }
+  creating.value = true
+  try {
+    await apiFetch('/api/projects', { method: 'POST', body: JSON.stringify({ name }) })
+    toast(`项目创建成功: ${name}`)
+    newProjectName.value = ''
+    await loadProjects()
+  } catch (err) {
+    toast(err.message, true)
+  } finally {
+    creating.value = false
+  }
+}
+
+function startRename(project) {
+  renameTarget.value = project
+  renameForm.value = { name: project.name }
+}
+
+async function onRename() {
+  if (!renameTarget.value) return
+  const name = renameForm.value.name.trim()
+  if (!name) { toast('项目名称不能为空', true); return }
+  saving.value = true
+  try {
+    await apiFetch(`/api/projects/${encodeURIComponent(renameTarget.value.id)}`, {
+      method: 'PUT',
+      body: JSON.stringify({ name }),
+    })
+    toast('重命名成功')
+    renameTarget.value = null
+    await loadProjects()
+  } catch (err) {
+    toast(err.message, true)
+  } finally {
+    saving.value = false
+  }
+}
+
+async function onDelete(project) {
+  if (project.repos.length) { toast('项目下仍有仓库，请先移出', true); return }
+  if (!window.confirm(`确定删除项目「${project.name}」吗？`)) return
+  try {
+    await apiFetch(`/api/projects/${encodeURIComponent(project.id)}`, { method: 'DELETE' })
+    toast(`已删除: ${project.name}`)
+    await loadProjects()
+  } catch (err) {
+    toast(err.message, true)
+  }
+}
+
+async function onMove(id, direction) {
+  try {
+    await apiFetch(`/api/projects/${encodeURIComponent(id)}/move`, {
+      method: 'POST',
+      body: JSON.stringify({ direction }),
+    })
+    await loadProjects()
+  } catch (err) {
+    toast(err.message, true)
+  }
+}
+
+function onDragStart(event, repoId) {
+  draggingRepoId.value = repoId
+  event.dataTransfer.effectAllowed = 'move'
+  event.dataTransfer.setData('text/plain', repoId)
+}
+
+function onDragOver(projectId) {
+  dragOverProjectId.value = projectId
+}
+
+function onDragLeave(projectId) {
+  if (dragOverProjectId.value === projectId) dragOverProjectId.value = null
+}
+
+async function onDrop(event, projectId) {
+  dragOverProjectId.value = null
+  const repoId = draggingRepoId.value || event.dataTransfer?.getData('text/plain')
+  draggingRepoId.value = null
+  if (!repoId) return
+  try {
+    await apiFetch('/api/projects/assign', {
+      method: 'POST',
+      body: JSON.stringify({ repoId, projectId }),
+    })
+    toast('分配成功')
+    await loadProjects()
+  } catch (err) {
+    toast(err.message, true)
+  }
+}
+</script>
+
+<style scoped>
+.project-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(340px, 1fr));
+  gap: var(--space-md);
+}
+.project-card {
+  background: var(--c-surface);
+  border: 1px solid var(--c-border);
+  border-radius: var(--radius-lg);
+  padding: var(--space-md);
+  min-height: 120px;
+  transition: border-color 0.15s ease, background 0.15s ease;
+}
+.project-card.drag-over {
+  border-color: var(--c-primary);
+  background: rgba(56, 189, 248, 0.06);
+}
+.project-card-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  margin-bottom: var(--space-sm);
+}
+.project-card-name {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--c-text);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.project-card-repos {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+.repo-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 10px;
+  background: rgba(15, 23, 42, 0.5);
+  border: 1px solid var(--c-border-light);
+  border-radius: var(--radius-md);
+  cursor: grab;
+  font-size: 12px;
+  max-width: 100%;
+}
+.repo-chip:active {
+  cursor: grabbing;
+}
+.repo-name {
+  color: var(--c-text-secondary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 180px;
+}
+.repo-type-hint {
+  font-size: 11px;
+  color: var(--c-text-muted);
+}
+.repo-empty {
+  font-size: 12px;
+  color: var(--c-text-muted);
+  padding: 8px 4px;
+}
+.modal-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 10000;
+  background: rgba(0, 0, 0, 0.6);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: var(--space-md);
+}
+.modal {
+  background: var(--c-surface);
+  border: 1px solid var(--c-border);
+  border-radius: var(--radius-lg);
+  padding: var(--space-lg);
+  width: 100%;
+  max-width: 520px;
+  box-shadow: var(--shadow-elevated);
+}
+</style>
diff --git a/frontend-vue/src/views/SvnFetchView.vue b/frontend-vue/src/views/SvnFetchView.vue
index a5ece11..f15bdf5 100644
--- a/frontend-vue/src/views/SvnFetchView.vue
+++ b/frontend-vue/src/views/SvnFetchView.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="svn-fetch">
-    <!-- 空状态：无预设时引导去仓库管理新增 -->
+    <!-- 空状态：无仓库时引导去仓库管理新增 -->
     <div v-if="!loading && !presets.length" class="card" style="text-align:center;padding:var(--space-2xl) var(--space-lg);">
       <svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" style="color:var(--c-text-muted);margin-bottom:var(--space-md);" aria-hidden="true"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg>
-      <h3 style="font-size:16px;font-weight:600;margin-bottom:8px;color:var(--c-text);">尚未配置 SVN 仓库</h3>
+      <h3 style="font-size:16px;font-weight:600;margin-bottom:8px;color:var(--c-text);">尚未配置仓库</h3>
       <p style="font-size:13px;color:var(--c-text-muted);margin-bottom:var(--space-lg);">
         请先在<a href="#/presets" style="color:var(--c-primary);font-weight:500;">仓库管理</a>页面新增仓库后再来抓取日志。
       </p>
@@ -13,14 +13,14 @@
     <div v-else class="card">
       <div class="card-title">
         <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
-        SVN 批量抓取参数
+        批量抓取参数
       </div>
       <div class="alert alert-info" style="margin-bottom:var(--space-md);">
-        支持多个项目批量抓取，可先选月份自动填充版本号，或手动填写。
+        支持 SVN 与 Git 仓库混合批量抓取；SVN 可自动填充版本号，Git 按时间范围直接抓取。
       </div>
 
       <div style="padding:var(--space-md);background:rgba(15,23,42,0.4);border-radius:var(--radius-md);margin-bottom:var(--space-lg);border:1px solid var(--c-border-light);">
-        <h4 style="font-size:13px;font-weight:600;margin-bottom:12px;color:var(--c-text);">智能版本号辅助</h4>
+        <h4 style="font-size:13px;font-weight:600;margin-bottom:12px;color:var(--c-text);">时间范围</h4>
         <div style="display:flex;gap:8px;flex-wrap:wrap;align-items:center;">
           <select v-model="rangeType" class="form-select" style="width:80px;" aria-label="范围类型">
             <option value="month">月</option>
@@ -40,17 +40,28 @@
       <form @submit.prevent="onRunSvn">
         <div class="form-grid" style="gap:var(--space-lg);">
           <div class="span-all project-block" v-for="(proj, idx) in projects" :key="idx">
-            <h4>{{ proj.name }}</h4>
-            <div class="form-grid">
-              <div class="form-group">
-                <label :for="'start-'+idx">开始版本号</label>
-                <input :id="'start-'+idx" class="form-input" v-model="proj.startRevision" inputmode="numeric" placeholder="请输入开始版本" autocomplete="off" />
+            <h4>
+              <span :class="['tag', proj.type === 'GIT' ? 'tag-info' : 'tag-default']" style="margin-right:8px;vertical-align:middle;">{{ proj.type === 'GIT' ? 'Git' : 'SVN' }}</span>
+              {{ proj.name }}
+            </h4>
+            <template v-if="proj.type === 'GIT'">
+              <div class="form-group" style="max-width:420px;">
+                <label :for="'range-' + idx">提交范围</label>
+                <input :id="'range-' + idx" class="form-input" :value="proj.commitInfo || '点击「自动计算并填充」获取提交范围'" readonly style="background:rgba(15,23,42,0.5);color:var(--c-text-muted);" />
               </div>
-              <div class="form-group">
-                <label :for="'end-'+idx">结束版本号</label>
-                <input :id="'end-'+idx" class="form-input" v-model="proj.endRevision" inputmode="numeric" placeholder="请输入结束版本" autocomplete="off" />
+            </template>
+            <template v-else>
+              <div class="form-grid">
+                <div class="form-group">
+                  <label :for="'start-'+idx">开始版本号</label>
+                  <input :id="'start-'+idx" class="form-input" v-model="proj.startRevision" inputmode="numeric" placeholder="请输入开始版本" autocomplete="off" />
+                </div>
+                <div class="form-group">
+                  <label :for="'end-'+idx">结束版本号</label>
+                  <input :id="'end-'+idx" class="form-input" v-model="proj.endRevision" inputmode="numeric" placeholder="请输入结束版本" autocomplete="off" />
+                </div>
               </div>
-            </div>
+            </template>
           </div>
 
           <div class="form-group">
@@ -68,7 +79,7 @@
         </div>
 
         <div class="btn-group" style="margin-top:var(--space-lg);">
-          <button type="button" class="btn" @click="onTestConnection" :disabled="testing" aria-label="测试 SVN 连接">
+          <button type="button" class="btn" @click="onTestConnection" :disabled="testing" aria-label="测试连接">
             <span v-if="testing" class="spinner"></span>
             测试连接
           </button>
@@ -168,15 +179,29 @@ function scrollPane(refEl) {
 
 onMounted(async () => {
   try {
-    const data = await apiFetch('/api/svn/presets')
-    presets.value = data.presets || []
-    defaultPresetId.value = data.defaultPresetId || ''
-    projects.value = (data.presets || []).map(p => ({
+    const [svnData, gitData] = await Promise.all([
+      apiFetch('/api/svn/presets').catch(() => ({ presets: [], defaultPresetId: '' })),
+      apiFetch('/api/git/presets').catch(() => ({ presets: [] })),
+    ])
+    const svnPresets = (svnData.presets || []).map(p => ({
       presetId: p.id,
       name: p.name,
+      type: 'SVN',
       startRevision: '',
       endRevision: '',
+      commitInfo: '',
     }))
+    const gitPresets = (gitData.presets || []).map(p => ({
+      presetId: p.id,
+      name: p.name,
+      type: 'GIT',
+      startRevision: '',
+      endRevision: '',
+      commitInfo: '',
+    }))
+    presets.value = [...svnPresets, ...gitPresets]
+    defaultPresetId.value = svnData.defaultPresetId || ''
+    projects.value = presets.value
     loading.value = false
   } catch (err) { loading.value = false; toast(err.message, true) }
 
@@ -189,73 +214,95 @@ onMounted(async () => {
 })
 
 function getFormProjects() {
-  return projects.value.filter(p => p.startRevision && p.endRevision).map(p => ({ ...p }))
+  return projects.value.filter(p => p.type === 'GIT' || (p.startRevision && p.endRevision)).map(p => ({ ...p }))
 }
 
 async function onTestConnection() {
-  if (!presets.value.length) { toast('未加载到 SVN 预设', true); return }
+  if (!presets.value.length) { toast('未加载到仓库预设', true); return }
   testing.value = true
   try {
     const pid = defaultPresetId.value && presets.value.some(p => p.id === defaultPresetId.value)
       ? defaultPresetId.value : presets.value[0].id
-    await apiFetch('/api/svn/test-connection', { method: 'POST', body: JSON.stringify({ presetId: pid }) })
-    toast('SVN 连接成功')
+    const proj = presets.value.find(p => p.id === pid) || presets.value[0]
+    if (proj.type === 'GIT') {
+      await apiFetch('/api/git/test-connection', { method: 'POST', body: JSON.stringify({ presetId: pid }) })
+      toast('Git 连接成功')
+    } else {
+      await apiFetch('/api/svn/test-connection', { method: 'POST', body: JSON.stringify({ presetId: pid }) })
+      toast('SVN 连接成功')
+    }
   } catch (err) { toast(err.message, true) }
   finally { testing.value = false }
 }
 
+function buildRangeBody(rt, dv) {
+  let body
+  if (rt === 'month') {
+    const [y, m] = dv.split('-')
+    if (!y || !m) { toast('请选择月份', true); return null }
+    body = { year: parseInt(y, 10), month: parseInt(m, 10) }
+  } else if (rt === 'week') {
+    body = { rangeType: 'week', week: dv }
+  } else {
+    body = { rangeType: 'date', date: dv }
+  }
+  return body
+}
+
 async function autoFillVersions() {
-  if (!presets.value.length) { toast('未加载到 SVN 预设', true); return }
+  if (!presets.value.length) { toast('未加载到仓库预设', true); return }
   const rt = rangeType.value
   const dv = dateValue.value
   if (!dv) { toast('请选择日期范围', true); return }
 
-  let logPrefix = ''
-  let body
-
-  if (rt === 'month') {
-    const [y, m] = dv.split('-')
-    if (!y || !m) { toast('请选择月份', true); return }
-    logPrefix = `${y}年${m}月`
-    body = { presetId: '', year: parseInt(y, 10), month: parseInt(m, 10) }
-  } else if (rt === 'week') {
-    logPrefix = dv
-    body = { presetId: '', rangeType: 'week', week: dv }
-  } else {
-    logPrefix = dv
-    body = { presetId: '', rangeType: 'date', date: dv }
-  }
+  const logPrefix = rt === 'month' ? `${dv.split('-')[0]}年${dv.split('-')[1]}月` : dv
+  const body = buildRangeBody(rt, dv)
+  if (!body) return
 
   autoFillLoading.value = true
   showLogPanel.value = true
   clearLogs()
-  appendSyslog(`开始查询 ${logPrefix} 的版本范围...`)
+  appendSyslog(`开始查询 ${logPrefix} 的提交范围...`)
   try {
     for (let i = 0; i < presets.value.length; i++) {
       const proj = projects.value[i]
-      appendSyslog(`正在查询 ${proj.name} 的版本范围...`)
-      const data = await apiFetch('/api/svn/version-range', {
-        method: 'POST',
-        body: JSON.stringify({ ...body, presetId: proj.presetId }),
-      })
-      if (data.startRevision && data.endRevision) {
-        proj.startRevision = String(data.startRevision)
-        proj.endRevision = String(data.endRevision)
-        appendSyslog(`${proj.name} 版本范围: ${data.startRevision} - ${data.endRevision}`)
+      appendSyslog(`正在查询 ${proj.name} 的提交范围...`)
+      if (proj.type === 'GIT') {
+        const data = await apiFetch('/api/git/version-range', {
+          method: 'POST',
+          body: JSON.stringify({ ...body, presetId: proj.presetId }),
+        })
+        if (data.commitCount) {
+          proj.commitInfo = `${data.commitCount} 条（${shortHash(data.startCommit)} - ${shortHash(data.endCommit)}）`
+          appendSyslog(`${proj.name} 提交范围: ${data.commitCount} 条`)
+        } else {
+          proj.commitInfo = '该时间范围无提交'
+          appendSyslog(`⚠ ${proj.name} 该范围无提交记录`, true)
+        }
       } else {
-        appendSyslog(`⚠ ${proj.name} 该范围无提交记录`, true)
+        const data = await apiFetch('/api/svn/version-range', {
+          method: 'POST',
+          body: JSON.stringify({ ...body, presetId: proj.presetId }),
+        })
+        if (data.startRevision && data.endRevision) {
+          proj.startRevision = String(data.startRevision)
+          proj.endRevision = String(data.endRevision)
+          appendSyslog(`${proj.name} 版本范围: ${data.startRevision} - ${data.endRevision}`)
+        } else {
+          appendSyslog(`⚠ ${proj.name} 该范围无提交记录`, true)
+        }
       }
     }
-    appendSyslog('所有项目版本号填充完成')
-    toast('版本号填充完成')
+    appendSyslog('所有项目范围填充完成')
+    toast('范围填充完成')
   } catch (err) { appendSyslog(`填充失败: ${err.message}`, true); toast(err.message, true) }
   finally { autoFillLoading.value = false }
 }
 
 async function onRunSvn() {
-  if (!presets.value.length) { toast('SVN 预设加载异常', true); return }
+  if (!presets.value.length) { toast('仓库预设加载异常', true); return }
   const formProjects = getFormProjects()
-  if (!formProjects.length) { toast('请至少填写一个项目的开始和结束版本号', true); return }
+  if (!formProjects.length) { toast('请至少填写一个 SVN 项目的开始和结束版本号，或选择 Git 仓库', true); return }
   showLogPanel.value = true
   clearLogs()
   running.value = true
@@ -263,20 +310,36 @@ async function onRunSvn() {
   let aiStream = null
   try {
     const mdFiles = []
+    const rt = rangeType.value
+    const dv = dateValue.value
+    const rangeBody = dv ? buildRangeBody(rt, dv) : null
     for (let i = 0; i < formProjects.length; i++) {
       const proj = formProjects[i]
       appendSyslog(`正在提交 ${proj.name} 的抓取任务...`)
-      const data = await apiFetch('/api/svn/fetch', {
-        method: 'POST',
-        body: JSON.stringify({ presetId: proj.presetId, startRevision: toNum(proj.startRevision), endRevision: toNum(proj.endRevision), filterUser: filterUser.value || '' }),
-      })
+      let data
+      if (proj.type === 'GIT') {
+        data = await apiFetch('/api/git/fetch', {
+          method: 'POST',
+          body: JSON.stringify({ ...rangeBody, presetId: proj.presetId, projectName: proj.name, filterUser: filterUser.value || '' }),
+        })
+      } else {
+        data = await apiFetch('/api/svn/fetch', {
+          method: 'POST',
+          body: JSON.stringify({ presetId: proj.presetId, projectName: proj.name, startRevision: toNum(proj.startRevision), endRevision: toNum(proj.endRevision), filterUser: filterUser.value || '' }),
+        })
+      }
       const taskId = data.taskId
       appendSyslog(`已创建抓取任务: ${proj.name} (${taskId.slice(0,8)})`)
       while (true) {
         const task = await apiFetch(`/api/tasks/${encodeURIComponent(taskId)}`)
         if (task.status === 'SUCCESS') {
-          appendSyslog(`${proj.name} 抓取完成`)
-          if (task.files) mdFiles.push(...task.files.filter(f => f.endsWith('.md')))
+          const md = (task.files || []).filter(f => f.endsWith('.md'))
+          if (md.length) {
+            appendSyslog(`${proj.name} 抓取完成`)
+            mdFiles.push(...md)
+          } else {
+            appendSyslog(`⚠ ${proj.name} 该时间范围无符合条件日志，已跳过`)
+          }
           break
         }
         if (task.status === 'FAILED' || task.status === 'CANCELLED') {
@@ -286,7 +349,12 @@ async function onRunSvn() {
         await sleep(2000)
       }
     }
-    appendSyslog(`所有 SVN 抓取完成，共 ${mdFiles.length} 个文件`)
+    if (!mdFiles.length) {
+      appendSyslog('所有仓库均无符合条件的日志，无法生成报告', true)
+      toast('所有仓库均无符合条件的日志', true)
+      return
+    }
+    appendSyslog(`所有抓取完成，共 ${mdFiles.length} 个文件`)
     appendSyslog('正在提交 AI 分析任务...')
     const aiData = await apiFetch('/api/ai/analyze', {
       method: 'POST',
@@ -386,5 +454,6 @@ function syncAiOutput(task, state) {
 }
 
 function toNum(v) { const n = Number(v); return Number.isFinite(n) ? n : null }
+function shortHash(h) { return h && h.length > 7 ? h.slice(0, 7) : (h || '') }
 function sleep(ms) { return new Promise(r => setTimeout(r, ms)) }
 </script>
diff --git a/frontend-vue/src/views/SvnPresetsView.vue b/frontend-vue/src/views/SvnPresetsView.vue
index 8609432..2eebb1b 100644
--- a/frontend-vue/src/views/SvnPresetsView.vue
+++ b/frontend-vue/src/views/SvnPresetsView.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="presets-manage">
-    <!-- 空状态：无预设时显示引导 -->
+    <!-- 空状态：无仓库时显示引导 -->
     <div v-if="!loading && !items.length" class="card" style="text-align:center;padding:var(--space-2xl) var(--space-lg);">
       <svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" style="color:var(--c-text-muted);margin-bottom:var(--space-md);" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
-      <h3 style="font-size:16px;font-weight:600;margin-bottom:8px;color:var(--c-text);">暂无 SVN 仓库</h3>
-      <p style="font-size:13px;color:var(--c-text-muted);margin-bottom:var(--space-lg);max-width:400px;margin-left:auto;margin-right:auto;">
-        请新增一个仓库，填写 SVN 地址和可选的账号密码以开始使用。
+      <h3 style="font-size:16px;font-weight:600;margin-bottom:8px;color:var(--c-text);">暂无仓库</h3>
+      <p style="font-size:13px;color:var(--c-text-muted);margin-bottom:var(--space-lg);max-width:420px;margin-left:auto;margin-right:auto;">
+        请新增一个仓库，填写 SVN 地址或 Git 地址及认证信息以开始使用。
       </p>
-      <button type="button" class="btn btn-primary" @click="showAddForm = true">新增仓库</button>
+      <button type="button" class="btn btn-primary" @click="openAdd">新增仓库</button>
     </div>
 
-    <!-- 顶部操作栏：有预设时显示 -->
+    <!-- 顶部操作栏 -->
     <div v-if="items.length" class="toolbar" style="justify-content:space-between;">
       <span style="font-size:13px;color:var(--c-text-secondary);">共 {{ items.length }} 个仓库</span>
-      <button type="button" class="btn btn-primary btn-sm" @click="showAddForm = true">
+      <button type="button" class="btn btn-primary btn-sm" @click="openAdd">
         <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
         新增仓库
       </button>
@@ -21,26 +21,76 @@
 
     <!-- 新增表单弹窗 -->
     <div v-if="showAddForm" class="modal-overlay" @click.self="cancelAdd">
-      <div class="modal" role="dialog" aria-label="新增 SVN 仓库">
-        <h3 style="font-size:15px;font-weight:600;margin-bottom:var(--space-md);">新增 SVN 仓库</h3>
+      <div class="modal" role="dialog" aria-label="新增仓库">
+        <h3 style="font-size:15px;font-weight:600;margin-bottom:var(--space-md);">新增仓库</h3>
         <form @submit.prevent="onAdd">
           <div class="form-grid">
+            <div class="form-group span-all">
+              <label for="add-type">仓库类型</label>
+              <select id="add-type" class="form-select" v-model="addForm.type">
+                <option value="SVN">SVN</option>
+                <option value="GIT">Git</option>
+              </select>
+            </div>
             <div class="form-group span-all">
               <label for="add-name">名称</label>
               <input id="add-name" class="form-input" v-model="addForm.name" placeholder="例如 PRS-7050场站智慧管控" required autocomplete="off" />
             </div>
             <div class="form-group span-all">
-              <label for="add-url">SVN 地址</label>
-              <input id="add-url" class="form-input" v-model="addForm.url" placeholder="https://svn.example.com/svn/project" required autocomplete="off" spellcheck="false" />
+              <label for="add-project">项目</label>
+              <select id="add-project" class="form-select" v-model="addForm.projectName" required>
+                <option value="" disabled>请选择所属项目</option>
+                <option v-for="p in projectOptions" :key="p.name" :value="p.name">{{ p.name }}</option>
+              </select>
+              <span style="font-size:11px;color:var(--c-text-muted);">同一项目的 SVN/Git 仓库选相同项目，可在「项目管理」页创建</span>
             </div>
-            <div class="form-group">
-              <label for="add-username">SVN 用户名（可选）</label>
-              <input id="add-username" class="form-input" v-model="addForm.svnUsername" placeholder="预设专用" autocomplete="off" spellcheck="false" />
-            </div>
-            <div class="form-group">
-              <label for="add-password">SVN 密码（可选）</label>
-              <input id="add-password" class="form-input" type="password" v-model="addForm.svnPassword" placeholder="预设专用" autocomplete="new-password" />
+            <div class="form-group span-all">
+              <label for="add-url">{{ addForm.type === 'GIT' ? 'Git 地址' : 'SVN 地址' }}</label>
+              <input id="add-url" class="form-input" v-model="addForm.url" :placeholder="addForm.type === 'GIT' ? 'https://git.example.com/org/project.git 或 git@host:org/project.git' : 'https://svn.example.com/svn/project'" required autocomplete="off" spellcheck="false" />
             </div>
+
+            <!-- SVN 字段 -->
+            <template v-if="addForm.type === 'SVN'">
+              <div class="form-group">
+                <label for="add-username">SVN 用户名（可选）</label>
+                <input id="add-username" class="form-input" v-model="addForm.svnUsername" placeholder="预设专用" autocomplete="off" spellcheck="false" />
+              </div>
+              <div class="form-group">
+                <label for="add-password">SVN 密码（可选）</label>
+                <input id="add-password" class="form-input" type="password" v-model="addForm.svnPassword" placeholder="预设专用" autocomplete="new-password" />
+              </div>
+            </template>
+
+            <!-- Git 字段 -->
+            <template v-else>
+              <div class="form-group">
+                <label for="add-branch">分支（可选）</label>
+                <input id="add-branch" class="form-input" v-model="addForm.gitBranch" placeholder="留空自动探测 master/main" autocomplete="off" spellcheck="false" />
+              </div>
+              <div class="form-group">
+                <label for="add-auth-type">认证方式</label>
+                <select id="add-auth-type" class="form-select" v-model="addForm.gitAuthType">
+                  <option value="PASSWORD">用户名 + Token</option>
+                  <option value="SSH_KEY">SSH 私钥</option>
+                </select>
+              </div>
+              <template v-if="addForm.gitAuthType === 'SSH_KEY'">
+                <div class="form-group span-all">
+                  <label for="add-ssh-key">SSH 私钥（可选）</label>
+                  <textarea id="add-ssh-key" class="form-input" v-model="addForm.gitSshKey" rows="5" placeholder="-----BEGIN OPENSSH PRIVATE KEY----- ..." autocomplete="off" spellcheck="false" style="font-family:var(--font-mono);font-size:12px;"></textarea>
+                </div>
+              </template>
+              <template v-else>
+                <div class="form-group">
+                  <label for="add-git-username">用户名（可选）</label>
+                  <input id="add-git-username" class="form-input" v-model="addForm.gitUsername" placeholder="默认 git" autocomplete="off" spellcheck="false" />
+                </div>
+                <div class="form-group">
+                  <label for="add-git-token">Token / 密码（可选）</label>
+                  <input id="add-git-token" class="form-input" type="password" v-model="addForm.gitToken" placeholder="预设专用" autocomplete="new-password" />
+                </div>
+              </template>
+            </template>
           </div>
           <div class="btn-group" style="margin-top:var(--space-lg);">
             <button type="submit" class="btn btn-primary" :disabled="adding">
@@ -55,8 +105,8 @@
 
     <!-- 编辑弹窗 -->
     <div v-if="editTarget" class="modal-overlay" @click.self="editTarget = null">
-      <div class="modal" role="dialog" aria-label="编辑 SVN 仓库">
-        <h3 style="font-size:15px;font-weight:600;margin-bottom:var(--space-md);">编辑仓库</h3>
+      <div class="modal" role="dialog" aria-label="编辑仓库">
+        <h3 style="font-size:15px;font-weight:600;margin-bottom:var(--space-md);">编辑仓库 <span :class="['tag', typeTagClass(editTarget.type)]" style="margin-left:8px;vertical-align:middle;">{{ editTarget.type === 'GIT' ? 'Git' : 'SVN' }}</span></h3>
         <form @submit.prevent="onEdit">
           <div class="form-grid">
             <div class="form-group span-all">
@@ -64,24 +114,80 @@
               <input id="edit-name" class="form-input" v-model="editForm.name" required autocomplete="off" />
             </div>
             <div class="form-group span-all">
-              <label for="edit-url">SVN 地址</label>
-              <input id="edit-url" class="form-input" v-model="editForm.url" required autocomplete="off" spellcheck="false" />
-            </div>
-            <div class="form-group">
-              <label for="edit-username">SVN 用户名</label>
-              <input id="edit-username" class="form-input" v-model="editForm.svnUsername" placeholder="留空不覆盖" autocomplete="off" spellcheck="false" />
-              <span v-if="editTarget.svnCredentialsConfigured" style="font-size:11px;color:var(--c-warning);">已有凭据，留空则保留原值</span>
-            </div>
-            <div class="form-group">
-              <label for="edit-password">SVN 密码</label>
-              <input id="edit-password" class="form-input" type="password" v-model="editForm.svnPassword" placeholder="留空不覆盖" autocomplete="new-password" />
+              <label for="edit-project">项目</label>
+              <select id="edit-project" class="form-select" v-model="editForm.projectName" required>
+                <option value="" disabled>请选择所属项目</option>
+                <option v-for="p in projectOptions" :key="p.name" :value="p.name">{{ p.name }}</option>
+              </select>
             </div>
             <div class="form-group span-all">
-              <label class="checkbox-label">
-                <input type="checkbox" v-model="editForm.clearSvnPassword" />
-                清空已保存的 SVN 密码
-              </label>
+              <label for="edit-url">{{ editTarget.type === 'GIT' ? 'Git 地址' : 'SVN 地址' }}</label>
+              <input id="edit-url" class="form-input" v-model="editForm.url" required autocomplete="off" spellcheck="false" />
             </div>
+
+            <!-- SVN 编辑字段 -->
+            <template v-if="editTarget.type === 'SVN'">
+              <div class="form-group">
+                <label for="edit-username">SVN 用户名</label>
+                <input id="edit-username" class="form-input" v-model="editForm.svnUsername" placeholder="留空不覆盖" autocomplete="off" spellcheck="false" />
+                <span v-if="editTarget.svnCredentialsConfigured" style="font-size:11px;color:var(--c-warning);">已有凭据，留空则保留原值</span>
+              </div>
+              <div class="form-group">
+                <label for="edit-password">SVN 密码</label>
+                <input id="edit-password" class="form-input" type="password" v-model="editForm.svnPassword" placeholder="留空不覆盖" autocomplete="new-password" />
+              </div>
+              <div class="form-group span-all">
+                <label class="checkbox-label">
+                  <input type="checkbox" v-model="editForm.clearSvnPassword" />
+                  清空已保存的 SVN 密码
+                </label>
+              </div>
+            </template>
+
+            <!-- Git 编辑字段 -->
+            <template v-else>
+              <div class="form-group">
+                <label for="edit-branch">分支</label>
+                <input id="edit-branch" class="form-input" v-model="editForm.gitBranch" placeholder="留空自动探测" autocomplete="off" spellcheck="false" />
+              </div>
+              <div class="form-group">
+                <label for="edit-auth-type">认证方式</label>
+                <select id="edit-auth-type" class="form-select" v-model="editForm.gitAuthType">
+                  <option value="PASSWORD">用户名 + Token</option>
+                  <option value="SSH_KEY">SSH 私钥</option>
+                </select>
+              </div>
+              <template v-if="editForm.gitAuthType === 'SSH_KEY'">
+                <div class="form-group span-all">
+                  <label for="edit-ssh-key">SSH 私钥</label>
+                  <textarea id="edit-ssh-key" class="form-input" v-model="editForm.gitSshKey" rows="5" placeholder="留空不覆盖" autocomplete="off" spellcheck="false" style="font-family:var(--font-mono);font-size:12px;"></textarea>
+                  <span v-if="editTarget.credentialsConfigured" style="font-size:11px;color:var(--c-warning);">已有私钥，留空则保留原值</span>
+                </div>
+                <div class="form-group span-all">
+                  <label class="checkbox-label">
+                    <input type="checkbox" v-model="editForm.clearGitSshKey" />
+                    清空已保存的 SSH 私钥
+                  </label>
+                </div>
+              </template>
+              <template v-else>
+                <div class="form-group">
+                  <label for="edit-git-username">用户名</label>
+                  <input id="edit-git-username" class="form-input" v-model="editForm.gitUsername" placeholder="留空不覆盖" autocomplete="off" spellcheck="false" />
+                </div>
+                <div class="form-group">
+                  <label for="edit-git-token">Token / 密码</label>
+                  <input id="edit-git-token" class="form-input" type="password" v-model="editForm.gitToken" placeholder="留空不覆盖" autocomplete="new-password" />
+                </div>
+                <div class="form-group span-all">
+                  <label class="checkbox-label">
+                    <input type="checkbox" v-model="editForm.clearGitToken" />
+                    清空已保存的 Token
+                  </label>
+                </div>
+              </template>
+            </template>
+
             <div class="form-group span-all">
               <label class="checkbox-label">
                 <input type="checkbox" v-model="editForm.enabled" />
@@ -122,9 +228,11 @@
       <table>
         <thead>
           <tr>
+            <th>类型</th>
             <th>名称</th>
-            <th>SVN 地址</th>
-            <th>SVN 账号</th>
+            <th>项目</th>
+            <th>地址</th>
+            <th>账号 / 分支</th>
             <th>凭据</th>
             <th>最后使用</th>
             <th>状态</th>
@@ -133,11 +241,18 @@
         </thead>
         <tbody>
           <tr v-for="item in items" :key="item.id" :style="{ opacity: item.enabled ? 1 : 0.5 }">
-            <td><strong>{{ item.name }}</strong></td>
-            <td style="max-width:300px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:var(--font-mono);font-size:12px;" :title="item.url">{{ item.url }}</td>
-            <td style="font-family:var(--font-mono);font-size:12px;">{{ item.svnUsername || '—' }}</td>
             <td>
-              <span :class="['tag', item.svnCredentialsConfigured ? 'tag-success' : 'tag-muted']">{{ item.svnCredentialsConfigured ? '已配置' : '未配置' }}</span>
+              <span :class="['tag', typeTagClass(item.type)]">{{ item.type === 'GIT' ? 'Git' : 'SVN' }}</span>
+            </td>
+            <td><strong>{{ item.name }}</strong></td>
+            <td style="max-width:180px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:12px;" :title="item.projectName">{{ item.projectName || '—' }}</td>
+            <td style="max-width:300px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:var(--font-mono);font-size:12px;" :title="item.url">{{ item.url }}</td>
+            <td style="font-family:var(--font-mono);font-size:12px;">
+              <template v-if="item.type === 'GIT'">{{ authLabel(item) }}</template>
+              <template v-else>{{ item.svnUsername || '—' }}</template>
+            </td>
+            <td>
+              <span :class="['tag', item.credentialsConfigured ? 'tag-success' : 'tag-muted']">{{ item.credentialsConfigured ? '已配置' : '未配置' }}</span>
             </td>
             <td style="font-size:12px;color:var(--c-text-muted);font-family:var(--font-mono);">{{ formatTime(item.lastUsedAt) }}</td>
             <td>
@@ -181,22 +296,53 @@ const deleting = ref(false)
 const testingId = ref(null)
 
 const showAddForm = ref(false)
-const addForm = ref({ name: '', url: '', svnUsername: '', svnPassword: '' })
+const addForm = ref(emptyAddForm())
 
 const editTarget = ref(null)
-const editForm = ref({ name: '', url: '', svnUsername: '', svnPassword: '', clearSvnPassword: false, enabled: true })
+const editForm = ref({})
 
 const deleteTarget = ref(null)
+const projectOptions = ref([])
 
 onMounted(async () => {
-  await loadItems()
+  await Promise.all([loadItems(), loadProjects()])
 })
 
+async function loadProjects() {
+  try {
+    const data = await apiFetch('/api/projects')
+    projectOptions.value = (data.projects || []).map(p => ({ name: p.name }))
+  } catch (err) {
+    toast(err.message, true)
+  }
+}
+
+function emptyAddForm() {
+  return {
+    type: 'SVN',
+    name: '',
+    url: '',
+    projectName: '',
+    svnUsername: '',
+    svnPassword: '',
+    gitBranch: '',
+    gitAuthType: 'PASSWORD',
+    gitUsername: '',
+    gitToken: '',
+    gitSshKey: '',
+  }
+}
+
 async function loadItems() {
   loading.value = true
   try {
-    const data = await apiFetch('/api/svn/presets/manage')
-    items.value = data || []
+    const [svnData, gitData] = await Promise.all([
+      apiFetch('/api/svn/presets/manage').catch(() => []),
+      apiFetch('/api/git/presets/manage').catch(() => []),
+    ])
+    const svnItems = (svnData || []).map(item => ({ ...item, type: 'SVN', credentialsConfigured: item.svnCredentialsConfigured }))
+    const gitItems = (gitData || []).map(item => ({ ...item, type: 'GIT' }))
+    items.value = [...svnItems, ...gitItems]
   } catch (err) {
     toast(err.message, true)
   } finally {
@@ -204,9 +350,13 @@ async function loadItems() {
   }
 }
 
+function openAdd() {
+  addForm.value = emptyAddForm()
+  showAddForm.value = true
+}
+
 function cancelAdd() {
   showAddForm.value = false
-  addForm.value = { name: '', url: '', svnUsername: '', svnPassword: '' }
 }
 
 async function onAdd() {
@@ -216,13 +366,19 @@ async function onAdd() {
   }
   adding.value = true
   try {
-    await apiFetch('/api/svn/presets', {
-      method: 'POST',
-      body: JSON.stringify(addForm.value),
-    })
+    if (addForm.value.type === 'GIT') {
+      await apiFetch('/api/git/presets', {
+        method: 'POST',
+        body: JSON.stringify(addForm.value),
+      })
+    } else {
+      await apiFetch('/api/svn/presets', {
+        method: 'POST',
+        body: JSON.stringify(addForm.value),
+      })
+    }
     toast('仓库创建成功')
     showAddForm.value = false
-    addForm.value = { name: '', url: '', svnUsername: '', svnPassword: '' }
     await loadItems()
   } catch (err) {
     toast(err.message, true)
@@ -236,9 +392,17 @@ function startEdit(item) {
   editForm.value = {
     name: item.name,
     url: item.url,
+    projectName: item.projectName || '',
     svnUsername: '',
     svnPassword: '',
     clearSvnPassword: false,
+    gitBranch: item.branch || '',
+    gitAuthType: item.authType || 'PASSWORD',
+    gitUsername: '',
+    gitToken: '',
+    gitSshKey: '',
+    clearGitToken: false,
+    clearGitSshKey: false,
     enabled: item.enabled,
   }
 }
@@ -247,10 +411,18 @@ async function onEdit() {
   if (!editTarget.value) return
   saving.value = true
   try {
-    await apiFetch(`/api/svn/presets/${encodeURIComponent(editTarget.value.id)}`, {
-      method: 'PUT',
-      body: JSON.stringify(editForm.value),
-    })
+    const id = encodeURIComponent(editTarget.value.id)
+    if (editTarget.value.type === 'GIT') {
+      await apiFetch(`/api/git/presets/${id}`, {
+        method: 'PUT',
+        body: JSON.stringify(editForm.value),
+      })
+    } else {
+      await apiFetch(`/api/svn/presets/${id}`, {
+        method: 'PUT',
+        body: JSON.stringify(editForm.value),
+      })
+    }
     toast('保存成功')
     editTarget.value = null
     await loadItems()
@@ -264,7 +436,12 @@ async function onEdit() {
 async function onTest(item) {
   testingId.value = item.id
   try {
-    await apiFetch(`/api/svn/presets/${encodeURIComponent(item.id)}/test`, { method: 'POST' })
+    const id = encodeURIComponent(item.id)
+    if (item.type === 'GIT') {
+      await apiFetch(`/api/git/presets/${id}/test`, { method: 'POST' })
+    } else {
+      await apiFetch(`/api/svn/presets/${id}/test`, { method: 'POST' })
+    }
     toast(`连接成功: ${item.name}`)
     await loadItems()
   } catch (err) {
@@ -278,7 +455,12 @@ async function onDelete() {
   if (!deleteTarget.value) return
   deleting.value = true
   try {
-    await apiFetch(`/api/svn/presets/${encodeURIComponent(deleteTarget.value.id)}`, { method: 'DELETE' })
+    const id = encodeURIComponent(deleteTarget.value.id)
+    if (deleteTarget.value.type === 'GIT') {
+      await apiFetch(`/api/git/presets/${id}`, { method: 'DELETE' })
+    } else {
+      await apiFetch(`/api/svn/presets/${id}`, { method: 'DELETE' })
+    }
     toast(`已停用: ${deleteTarget.value.name}`)
     deleteTarget.value = null
     await loadItems()
@@ -289,6 +471,16 @@ async function onDelete() {
   }
 }
 
+function authLabel(item) {
+  const branch = item.branch ? item.branch : '默认分支'
+  const auth = item.authType === 'SSH_KEY' ? 'SSH 私钥' : 'Token'
+  return `${auth} · ${branch}`
+}
+
+function typeTagClass(type) {
+  return type === 'GIT' ? 'tag-info' : 'tag-default'
+}
+
 function formatTime(ts) {
   if (!ts) return '从未使用'
   const d = new Date(ts)
@@ -314,7 +506,7 @@ function formatTime(ts) {
   border-radius: var(--radius-lg);
   padding: var(--space-lg);
   width: 100%;
-  max-width: 520px;
+  max-width: 560px;
   box-shadow: var(--shadow-elevated);
   max-height: 80vh;
   overflow-y: auto;
diff --git a/pom.xml b/pom.xml
index 1eabc67..f17ea15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,18 @@
             <version>1.10.11</version>
         </dependency>
 
+        <!-- JGit for Git operations (5.13.x 是兼容 Java 8 的最后一个版本线) -->
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>5.13.3.202401111512-r</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
+            <version>5.13.3.202401111512-r</version>
+        </dependency>
+
         <!-- Apache POI for Excel operations -->
         <dependency>
             <groupId>org.apache.poi</groupId>
diff --git a/src/main/java/com/svnlog/core/git/GitLogFetcher.java b/src/main/java/com/svnlog/core/git/GitLogFetcher.java
new file mode 100644
index 0000000..16f4786
--- /dev/null
+++ b/src/main/java/com/svnlog/core/git/GitLogFetcher.java
@@ -0,0 +1,540 @@
+package com.svnlog.core.git;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.security.PublicKey;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.eclipse.jgit.api.CloneCommand;
+import org.eclipse.jgit.api.FetchCommand;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.LsRemoteCommand;
+import org.eclipse.jgit.api.TransportConfigCallback;
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.transport.CredentialsProvider;
+import org.eclipse.jgit.transport.SshTransport;
+import org.eclipse.jgit.transport.Transport;
+import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+import org.eclipse.jgit.transport.sshd.ServerKeyDatabase;
+import org.eclipse.jgit.transport.sshd.SshdSessionFactory;
+import org.eclipse.jgit.transport.sshd.SshdSessionFactoryBuilder;
+import org.eclipse.jgit.treewalk.CanonicalTreeParser;
+import org.eclipse.jgit.treewalk.EmptyTreeIterator;
+import org.eclipse.jgit.util.io.DisabledOutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.svnlog.core.svn.LogEntry;
+
+/**
+ * Git 远程仓库日志抓取器（基于 JGit）。
+ *
+ * <p>缓存策略：以 mirror 方式克隆到临时目录 {@code ${java.io.tmpdir}/svnlog-git-cache/<presetId>/}，
+ * 每次抓取前增量 fetch，首次慢、后续快。</p>
+ */
+public class GitLogFetcher {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitLogFetcher.class);
+    private static final String PROP_ACCEPT_ANY_SSH_HOST = "svnlog.git.acceptAnySshHost";
+    private static final String ENV_ACCEPT_ANY_SSH_HOST = "SVN_LOG_TOOL_ACCEPT_ANY_SSH_HOST";
+    private static final String AUTH_TYPE_PASSWORD = "PASSWORD";
+    private static final String AUTH_TYPE_SSH_KEY = "SSH_KEY";
+    private static final int SHORT_HASH_LENGTH = 7;
+    private static final String[] DEFAULT_BRANCH_CANDIDATES = {"master", "main"};
+    private static final ConcurrentHashMap<String, Object> PRESET_LOCKS = new ConcurrentHashMap<String, Object>();
+
+    private static final ThreadLocal<SimpleDateFormat> DATE_FORMAT = new ThreadLocal<SimpleDateFormat>() {
+        @Override
+        protected SimpleDateFormat initialValue() {
+            return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        }
+    };
+
+    private final String url;
+    private final String presetId;
+    private final String branch;
+    private final String authType;
+    private final String username;
+    private final String token;
+    private final String sshPrivateKey;
+
+    public GitLogFetcher(String url,
+                         String presetId,
+                         String branch,
+                         String authType,
+                         String username,
+                         String token,
+                         String sshPrivateKey) {
+        this.url = trim(url);
+        this.presetId = trim(presetId);
+        this.branch = trim(branch);
+        this.authType = trim(authType);
+        this.username = trim(username);
+        this.token = trim(token);
+        this.sshPrivateKey = sshPrivateKey == null ? "" : sshPrivateKey;
+        if (this.url.isEmpty()) {
+            throw new IllegalArgumentException("Git 仓库 URL 不能为空");
+        }
+        if (this.presetId.isEmpty()) {
+            throw new IllegalArgumentException("presetId 不能为空");
+        }
+    }
+
+    /** 测试连接：执行 ls-remote 验证认证与可达性 */
+    public void testConnection() throws Exception {
+        final CredentialsProvider credentialsProvider = buildCredentialsProvider();
+        final TransportConfigCallback transportCallback = buildTransportCallback();
+        final LsRemoteCommand command = Git.lsRemoteRepository()
+                .setRemote(url)
+                .setHeads(true)
+                .setTags(false);
+        if (credentialsProvider != null) {
+            command.setCredentialsProvider(credentialsProvider);
+        }
+        if (transportCallback != null) {
+            command.setTransportConfigCallback(transportCallback);
+        }
+        final java.util.Collection<Ref> refs = command.call();
+        if (refs == null || refs.isEmpty()) {
+            throw new IllegalStateException("Git 仓库无任何分支引用: " + url);
+        }
+        LOGGER.info("Git 连接测试成功: url={} refCount={}", url, refs.size());
+    }
+
+    /**
+     * 获取指定时间范围内的提交范围信息。
+     *
+     * @param startInclusive 开始时间（包含）
+     * @param endExclusive 结束时间（不包含）
+     * @return 范围内提交数、最早提交 hash、最新提交 hash；无提交返回 null
+     */
+    public GitVersionRange getVersionRangeByTimeRange(Date startInclusive, Date endExclusive) throws Exception {
+        final long start = startInclusive.getTime();
+        final long end = endExclusive.getTime();
+        final Path cacheDir = ensureUpdatedCache();
+        final Git git = openGit(cacheDir);
+        try {
+            final Repository repository = git.getRepository();
+            final ObjectId branchId = resolveBranchId(repository);
+            final RevWalk walk = new RevWalk(repository);
+            try {
+                walk.markStart(walk.parseCommit(branchId));
+                int commitCount = 0;
+                ObjectId earliest = null;
+                ObjectId latest = null;
+                long earliestTime = Long.MAX_VALUE;
+                long latestTime = Long.MIN_VALUE;
+                for (RevCommit commit : walk) {
+                    final long commitTime = commit.getCommitTime() * 1000L;
+                    if (commitTime >= start && commitTime < end) {
+                        commitCount++;
+                        if (commitTime < earliestTime) {
+                            earliestTime = commitTime;
+                            earliest = commit.getId();
+                        }
+                        if (commitTime > latestTime) {
+                            latestTime = commitTime;
+                            latest = commit.getId();
+                        }
+                    }
+                }
+                if (commitCount == 0) {
+                    return null;
+                }
+                return new GitVersionRange(commitCount, earliest.getName(), latest.getName());
+            } finally {
+                walk.close();
+            }
+        } finally {
+            git.close();
+        }
+    }
+
+    /** 拉取指定时间范围的日志，按提交时间降序，支持作者模糊过滤（包含匹配，不区分大小写） */
+    public List<LogEntry> fetchLogs(Date startInclusive, Date endExclusive, String filterUser) throws Exception {
+        final long start = startInclusive.getTime();
+        final long end = endExclusive.getTime();
+        final String filter = filterUser == null ? "" : filterUser.trim();
+        final Path cacheDir = ensureUpdatedCache();
+        final Git git = openGit(cacheDir);
+        try {
+            final Repository repository = git.getRepository();
+            final ObjectId branchId = resolveBranchId(repository);
+            final List<LogEntry> entries = new ArrayList<LogEntry>();
+            final RevWalk walk = new RevWalk(repository);
+            final DiffFormatter diffFormatter = new DiffFormatter(DisabledOutputStream.INSTANCE);
+            diffFormatter.setRepository(repository);
+            diffFormatter.setDetectRenames(true);
+            try {
+                walk.markStart(walk.parseCommit(branchId));
+                for (RevCommit commit : walk) {
+                    final long commitTime = commit.getCommitTime() * 1000L;
+                    if (commitTime < start || commitTime >= end) {
+                        continue;
+                    }
+                    final String author = commit.getAuthorIdent() == null
+                            ? null : commit.getAuthorIdent().getName();
+                    if (!filter.isEmpty() && (author == null
+                            || !author.toLowerCase().contains(filter.toLowerCase()))) {
+                        continue;
+                    }
+                    final LogEntry entry = new LogEntry();
+                    entry.setCommitHash(commit.getName());
+                    entry.setAuthor(author != null ? author : "(无作者)");
+                    entry.setDate(new Date(commitTime));
+                    final String fullMessage = commit.getFullMessage();
+                    entry.setMessage(fullMessage != null ? fullMessage.trim() : "");
+                    entry.setChangedPaths(collectChangedPaths(repository, diffFormatter, commit));
+                    entries.add(entry);
+                }
+            } finally {
+                diffFormatter.close();
+                walk.close();
+            }
+            return entries;
+        } finally {
+            git.close();
+        }
+    }
+
+    public String formatDate(Date date) {
+        return DATE_FORMAT.get().format(date);
+    }
+
+    public static String shortHash(String fullHash) {
+        if (fullHash == null) {
+            return "";
+        }
+        return fullHash.length() <= SHORT_HASH_LENGTH
+                ? fullHash : fullHash.substring(0, SHORT_HASH_LENGTH);
+    }
+
+    // ========== 认证与传输 ==========
+
+    private CredentialsProvider buildCredentialsProvider() {
+        if (isPasswordAuth()) {
+            return new UsernamePasswordCredentialsProvider(
+                    username.isEmpty() ? "git" : username, token);
+        }
+        return null;
+    }
+
+    private boolean isPasswordAuth() {
+        return AUTH_TYPE_PASSWORD.equals(authType) && !token.isEmpty();
+    }
+
+    private boolean isSshKeyAuth() {
+        return AUTH_TYPE_SSH_KEY.equals(authType) && !sshPrivateKey.isEmpty();
+    }
+
+    private boolean isSshUrl() {
+        return url.startsWith("ssh://") || url.startsWith("git@")
+                || (url.contains("@") && url.contains(":") && !url.startsWith("http"));
+    }
+
+    private TransportConfigCallback buildTransportCallback() {
+        if (!isSshKeyAuth()) {
+            return null;
+        }
+        return new TransportConfigCallback() {
+            @Override
+            public void configure(Transport transport) {
+                if (transport instanceof SshTransport) {
+                    ((SshTransport) transport).setSshSessionFactory(createSshSessionFactory());
+                }
+            }
+        };
+    }
+
+    private SshdSessionFactory createSshSessionFactory() {
+        Path privateKeyFile = null;
+        try {
+            privateKeyFile = writePrivateKeyFile();
+            final Path keyFile = privateKeyFile;
+            final SshdSessionFactoryBuilder builder = new SshdSessionFactoryBuilder()
+                    .setHomeDirectory(new File(System.getProperty("user.home", ".")))
+                    .setSshDirectory(keyFile.getParent().toFile())
+                    .setPreferredAuthentications("publickey");
+            if (acceptAnySshHost()) {
+                builder.setServerKeyDatabase(new java.util.function.BiFunction<File, File, ServerKeyDatabase>() {
+                    @Override
+                    public ServerKeyDatabase apply(File ignored1, File ignored2) {
+                        return new ServerKeyDatabase() {
+                            @Override
+                            public List<PublicKey> lookup(String connectAddress,
+                                                          java.net.InetSocketAddress remoteAddress,
+                                                          Configuration config) {
+                                return Collections.emptyList();
+                            }
+
+                            @Override
+                            public boolean accept(String connectAddress,
+                                                  java.net.InetSocketAddress remoteAddress,
+                                                  PublicKey serverKey,
+                                                  Configuration config,
+                                                  CredentialsProvider provider) {
+                                return true;
+                            }
+                        };
+                    }
+                });
+            }
+            builder.setDefaultIdentities(new java.util.function.Function<File, List<Path>>() {
+                @Override
+                public List<Path> apply(File ignored) {
+                    return Collections.singletonList(keyFile);
+                }
+            });
+            final SshdSessionFactory factory = builder.build(null);
+            privateKeyFile = null;
+            return factory;
+        } catch (IOException e) {
+            throw new IllegalStateException("SSH 私钥处理失败: " + e.getMessage(), e);
+        } finally {
+            if (privateKeyFile != null) {
+                deleteQuietly(privateKeyFile);
+            }
+        }
+    }
+
+    private Path writePrivateKeyFile() throws IOException {
+        final Path dir = Paths.get(System.getProperty("java.io.tmpdir"), "svnlog-git-ssh");
+        Files.createDirectories(dir);
+        final Path keyFile = Files.createTempFile(dir, "key-" + presetId + "-", ".pem");
+        Files.write(keyFile, sshPrivateKey.getBytes(StandardCharsets.UTF_8));
+        try {
+            Files.setPosixFilePermissions(keyFile, EnumSet.of(
+                    PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE));
+        } catch (UnsupportedOperationException ignored) {
+            LOGGER.warn("无法设置私钥文件权限，跳过: {}", keyFile);
+        }
+        return keyFile;
+    }
+
+    // ========== 缓存仓库管理 ==========
+
+    private Path ensureUpdatedCache() throws Exception {
+        final Path cacheDir = Paths.get(
+                System.getProperty("java.io.tmpdir"), "svnlog-git-cache", presetId);
+        final Object lock = getPresetLock(presetId);
+        synchronized (lock) {
+            if (!Files.exists(cacheDir) || !Files.isDirectory(cacheDir)) {
+                cloneRepository(cacheDir);
+            } else {
+                fetchUpdates(cacheDir);
+            }
+            return cacheDir;
+        }
+    }
+
+    private void cloneRepository(Path cacheDir) throws Exception {
+        LOGGER.info("Git 首次克隆（mirror）: url={} presetId={}", url, presetId);
+        final CloneCommand command = Git.cloneRepository()
+                .setURI(url)
+                .setBare(true)
+                .setMirror(true)
+                .setDirectory(cacheDir.toFile())
+                .setCloneAllBranches(true)
+                .setNoCheckout(true);
+        final CredentialsProvider credentialsProvider = buildCredentialsProvider();
+        final TransportConfigCallback transportCallback = buildTransportCallback();
+        if (credentialsProvider != null) {
+            command.setCredentialsProvider(credentialsProvider);
+        }
+        if (transportCallback != null) {
+            command.setTransportConfigCallback(transportCallback);
+        }
+        try (Git ignored = command.call()) {
+            LOGGER.info("Git 克隆完成: presetId={}", presetId);
+        } catch (Exception e) {
+            deleteRecursivelyQuietly(cacheDir);
+            LOGGER.warn("Git 克隆失败，已清理缓存: presetId={}", presetId, e);
+            throw e;
+        }
+    }
+
+    private void fetchUpdates(Path cacheDir) throws Exception {
+        LOGGER.info("Git 增量 fetch: presetId={}", presetId);
+        final Git git = openGit(cacheDir);
+        try {
+            final FetchCommand command = git.fetch().setRemote("origin");
+            final CredentialsProvider credentialsProvider = buildCredentialsProvider();
+            final TransportConfigCallback transportCallback = buildTransportCallback();
+            if (credentialsProvider != null) {
+                command.setCredentialsProvider(credentialsProvider);
+            }
+            if (transportCallback != null) {
+                command.setTransportConfigCallback(transportCallback);
+            }
+            command.call();
+            LOGGER.info("Git fetch 完成: presetId={}", presetId);
+        } finally {
+            git.close();
+        }
+    }
+
+    private Git openGit(Path cacheDir) throws IOException {
+        return Git.open(cacheDir.toFile());
+    }
+
+    private ObjectId resolveBranchId(Repository repository) throws IOException {
+        final String configuredBranch = branch;
+        if (!configuredBranch.isEmpty()) {
+            final ObjectId objectId = resolveBranch(repository, configuredBranch);
+            if (objectId != null) {
+                return objectId;
+            }
+            throw new IllegalArgumentException("Git 分支不存在: " + configuredBranch);
+        }
+        final Ref head = repository.exactRef("HEAD");
+        if (head != null && head.getTarget() != null && head.isSymbolic()) {
+            final String headBranch = head.getTarget().getName();
+            final ObjectId objectId = repository.resolve(headBranch);
+            if (objectId != null) {
+                return objectId;
+            }
+        }
+        for (String candidate : DEFAULT_BRANCH_CANDIDATES) {
+            final ObjectId objectId = resolveBranch(repository, candidate);
+            if (objectId != null) {
+                return objectId;
+            }
+        }
+        throw new IllegalArgumentException("无法确定 Git 默认分支（尝试了 " + String.join(", ", DEFAULT_BRANCH_CANDIDATES) + "），请在预设中指定分支");
+    }
+
+    private ObjectId resolveBranch(Repository repository, String branchName) throws IOException {
+        if (branchName == null || branchName.trim().isEmpty()) {
+            return null;
+        }
+        final String normalized = branchName.startsWith("refs/")
+                ? branchName.trim() : "refs/heads/" + branchName.trim();
+        final ObjectId objectId = repository.resolve(normalized);
+        if (objectId == null) {
+            return repository.resolve(branchName.trim());
+        }
+        return objectId;
+    }
+
+    private String[] collectChangedPaths(Repository repository,
+                                         DiffFormatter diffFormatter,
+                                         RevCommit commit) throws IOException {
+        final RevCommit parent = commit.getParentCount() > 0 ? commit.getParent(0) : null;
+        final List<DiffEntry> diffs;
+        if (parent == null) {
+            final CanonicalTreeParser newTree = new CanonicalTreeParser();
+            newTree.reset(repository.newObjectReader(), commit.getTree());
+            diffs = diffFormatter.scan(new EmptyTreeIterator(), newTree);
+        } else {
+            diffs = diffFormatter.scan(parent.getTree(), commit.getTree());
+        }
+        if (diffs == null || diffs.isEmpty()) {
+            return new String[0];
+        }
+        final List<String> paths = new ArrayList<String>(diffs.size());
+        for (DiffEntry diff : diffs) {
+            final String newPath = diff.getNewPath();
+            if (newPath != null && !"/dev/null".equals(newPath)) {
+                paths.add(newPath);
+            } else if (diff.getOldPath() != null) {
+                paths.add(diff.getOldPath());
+            }
+        }
+        return paths.toArray(new String[0]);
+    }
+
+    private static Object getPresetLock(String presetId) {
+        Object lock = PRESET_LOCKS.get(presetId);
+        if (lock == null) {
+            final Object newLock = new Object();
+            lock = PRESET_LOCKS.putIfAbsent(presetId, newLock);
+            if (lock == null) {
+                lock = newLock;
+            }
+        }
+        return lock;
+    }
+
+    private static void deleteRecursivelyQuietly(Path path) {
+        if (path == null || !Files.exists(path)) {
+            return;
+        }
+        try {
+            if (Files.isDirectory(path)) {
+                Files.walk(path)
+                        .sorted(java.util.Comparator.reverseOrder())
+                        .forEach(p -> deleteQuietly(p));
+            } else {
+                deleteQuietly(path);
+            }
+        } catch (IOException e) {
+            LOGGER.warn("删除目录失败: {}", path, e);
+        }
+    }
+
+    private static void deleteQuietly(Path path) {
+        if (path == null) {
+            return;
+        }
+        try {
+            Files.deleteIfExists(path);
+        } catch (IOException e) {
+            LOGGER.warn("删除文件失败: {}", path, e);
+        }
+    }
+
+    private static boolean acceptAnySshHost() {
+        final String propertyValue = System.getProperty(PROP_ACCEPT_ANY_SSH_HOST);
+        if (propertyValue != null && !propertyValue.trim().isEmpty()) {
+            return Boolean.parseBoolean(propertyValue.trim());
+        }
+        final String envValue = System.getenv(ENV_ACCEPT_ANY_SSH_HOST);
+        return envValue != null && Boolean.parseBoolean(envValue.trim());
+    }
+
+    private static String trim(String value) {
+        return value == null ? "" : value.trim();
+    }
+
+    /** Git 版本范围结果：提交数 + 首尾提交 hash */
+    public static class GitVersionRange {
+        private final int commitCount;
+        private final String startCommit;
+        private final String endCommit;
+
+        public GitVersionRange(int commitCount, String startCommit, String endCommit) {
+            this.commitCount = commitCount;
+            this.startCommit = startCommit;
+            this.endCommit = endCommit;
+        }
+
+        public int getCommitCount() {
+            return commitCount;
+        }
+
+        public String getStartCommit() {
+            return startCommit;
+        }
+
+        public String getEndCommit() {
+            return endCommit;
+        }
+    }
+}
diff --git a/src/main/java/com/svnlog/core/range/DateRangeResolver.java b/src/main/java/com/svnlog/core/range/DateRangeResolver.java
new file mode 100644
index 0000000..710c6ef
--- /dev/null
+++ b/src/main/java/com/svnlog/core/range/DateRangeResolver.java
@@ -0,0 +1,132 @@
+package com.svnlog.core.range;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 按时间条件（月份/日期/周）解析 [startInclusive, endExclusive) 时间范围。
+ * SVN 与 Git 抓取流程共用。
+ */
+public final class DateRangeResolver {
+    private static final TimeZone RANGE_TIME_ZONE = TimeZone.getTimeZone("Asia/Shanghai");
+    private static final Pattern DATE_PATTERN = Pattern.compile("^(\\d{4})-(\\d{2})-(\\d{2})$");
+    private static final Pattern WEEK_PATTERN = Pattern.compile("^(\\d{4})-W(\\d{2})$");
+
+    private DateRangeResolver() {
+    }
+
+    public static class DateRange {
+        private final String rangeType;
+        private final Date startInclusive;
+        private final Date endExclusive;
+
+        public DateRange(String rangeType, Date startInclusive, Date endExclusive) {
+            this.rangeType = rangeType;
+            this.startInclusive = startInclusive;
+            this.endExclusive = endExclusive;
+        }
+
+        public String getRangeType() {
+            return rangeType;
+        }
+
+        public Date getStartInclusive() {
+            return startInclusive;
+        }
+
+        public Date getEndExclusive() {
+            return endExclusive;
+        }
+    }
+
+    public static DateRange resolve(String rangeTypeValue,
+                                    String dateValue,
+                                    String weekValue,
+                                    Integer year,
+                                    Integer month) {
+        final String rangeType = safe(rangeTypeValue).trim();
+        if ("date".equals(rangeType)) {
+            return resolveByDate(dateValue);
+        }
+        if ("week".equals(rangeType)) {
+            return resolveByWeek(weekValue);
+        }
+        return resolveByMonth(year, month);
+    }
+
+    private static DateRange resolveByDate(String value) {
+        final Matcher matcher = DATE_PATTERN.matcher(safe(value).trim());
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("日期格式错误，应为 yyyy-MM-dd");
+        }
+        final Calendar start = newCalendar();
+        start.set(
+                parseNumber(matcher.group(1), "年份"),
+                parseNumber(matcher.group(2), "月份") - 1,
+                parseNumber(matcher.group(3), "日期"),
+                0,
+                0,
+                0
+        );
+        start.set(Calendar.MILLISECOND, 0);
+        final Calendar end = (Calendar) start.clone();
+        end.add(Calendar.DATE, 1);
+        return new DateRange("date", start.getTime(), end.getTime());
+    }
+
+    private static DateRange resolveByWeek(String value) {
+        final Matcher matcher = WEEK_PATTERN.matcher(safe(value).trim());
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("周格式错误，应为 yyyy-Www");
+        }
+        final int year = parseNumber(matcher.group(1), "年份");
+        final int week = parseNumber(matcher.group(2), "周");
+        final GregorianCalendar start = new GregorianCalendar(RANGE_TIME_ZONE);
+        start.clear();
+        start.setFirstDayOfWeek(Calendar.MONDAY);
+        start.setMinimalDaysInFirstWeek(4);
+        start.setWeekDate(year, week, Calendar.MONDAY);
+        start.set(Calendar.HOUR_OF_DAY, 0);
+        start.set(Calendar.MINUTE, 0);
+        start.set(Calendar.SECOND, 0);
+        start.set(Calendar.MILLISECOND, 0);
+        final Calendar end = (Calendar) start.clone();
+        end.add(Calendar.DATE, 7);
+        return new DateRange("week", start.getTime(), end.getTime());
+    }
+
+    private static DateRange resolveByMonth(Integer yearValue, Integer monthValue) {
+        if (yearValue == null || monthValue == null) {
+            throw new IllegalArgumentException("月份范围缺少 year 或 month 参数");
+        }
+        final Calendar start = newCalendar();
+        start.set(yearValue.intValue(), monthValue.intValue() - 1, 1, 0, 0, 0);
+        start.set(Calendar.MILLISECOND, 0);
+        final Calendar end = (Calendar) start.clone();
+        end.add(Calendar.MONTH, 1);
+        return new DateRange("month", start.getTime(), end.getTime());
+    }
+
+    private static Calendar newCalendar() {
+        final Calendar calendar = Calendar.getInstance(RANGE_TIME_ZONE);
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setMinimalDaysInFirstWeek(4);
+        return calendar;
+    }
+
+    private static int parseNumber(String value, String fieldName) {
+        try {
+            return Integer.parseInt(value);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException(fieldName + "格式错误", e);
+        }
+    }
+
+    private static String safe(String value) {
+        return value == null ? "" : value;
+    }
+}
diff --git a/src/main/java/com/svnlog/core/report/MarkdownReportWriter.java b/src/main/java/com/svnlog/core/report/MarkdownReportWriter.java
index 3634236..faec808 100644
--- a/src/main/java/com/svnlog/core/report/MarkdownReportWriter.java
+++ b/src/main/java/com/svnlog/core/report/MarkdownReportWriter.java
@@ -6,7 +6,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Date;
 import java.util.List;
+import java.util.function.Function;
 
+import com.svnlog.core.git.GitLogFetcher;
 import com.svnlog.core.svn.LogEntry;
 import com.svnlog.core.svn.SVNLogFetcher;
 
@@ -42,6 +44,7 @@ public final class MarkdownReportWriter {
     private MarkdownReportWriter() {
     }
 
+    /** SVN 报告写入（保持既有签名与输出格式不变） */
     public static void write(Path path,
                              String url,
                              String username,
@@ -51,21 +54,76 @@ public final class MarkdownReportWriter {
                              List<LogEntry> logs,
                              SVNLogFetcher fetcher,
                              Options options) throws IOException {
+        write(path,
+                "SVN 日志报告",
+                "SVN地址",
+                null,
+                url,
+                username,
+                "版本范围",
+                "r" + startRevision + " - r" + endRevision,
+                filterUser,
+                logs,
+                fetcher::formatDate,
+                options);
+    }
+
+    /** Git 报告写入 */
+    public static void writeGit(Path path,
+                                String projectName,
+                                String url,
+                                String filterUser,
+                                int commitCount,
+                                String startCommit,
+                                String endCommit,
+                                List<LogEntry> logs,
+                                GitLogFetcher fetcher,
+                                Options options) throws IOException {
+        write(path,
+                "Git 日志报告",
+                "Git地址",
+                projectName,
+                url,
+                null,
+                "提交范围",
+                GitLogFetcher.shortHash(startCommit) + " - " + GitLogFetcher.shortHash(endCommit)
+                        + "（" + commitCount + " 条提交）",
+                filterUser,
+                logs,
+                fetcher::formatDate,
+                options);
+    }
+
+    private static void write(Path path,
+                              String title,
+                              String urlFieldLabel,
+                              String projectName,
+                              String url,
+                              String username,
+                              String rangeLabel,
+                              String rangeValue,
+                              String filterUser,
+                              List<LogEntry> logs,
+                              Function<Date, String> dateFormatter,
+                              Options options) throws IOException {
         final Options effectiveOptions = options == null ? new Options() : options;
         final StringBuilder markdown = new StringBuilder();
 
-        markdown.append("# SVN 日志报告\n\n");
+        markdown.append("# ").append(title).append("\n\n");
         markdown.append("## 查询条件\n\n");
-        markdown.append("- **SVN地址**: `").append(url).append("`\n");
-        if (effectiveOptions.includeAccount) {
+        if (projectName != null && !projectName.trim().isEmpty()) {
+            markdown.append("- **项目**: `").append(projectName.trim()).append("`\n");
+        }
+        markdown.append("- **").append(urlFieldLabel).append("**: `").append(url).append("`\n");
+        if (effectiveOptions.includeAccount && username != null && !username.isEmpty()) {
             markdown.append("- **账号**: `").append(safe(username)).append("`\n");
         }
-        markdown.append("- **版本范围**: r").append(startRevision).append(" - r").append(endRevision).append("\n");
+        markdown.append("- **").append(rangeLabel).append("**: ").append(rangeValue).append("\n");
         if (!safe(filterUser).isEmpty()) {
             markdown.append("- **过滤用户**: `").append(filterUser).append("`\n");
         }
         if (effectiveOptions.includeGeneratedTime) {
-            markdown.append("- **生成时间**: ").append(fetcher.formatDate(new Date())).append("\n");
+            markdown.append("- **生成时间**: ").append(dateFormatter.apply(new Date())).append("\n");
         }
         markdown.append("\n");
 
@@ -76,10 +134,18 @@ public final class MarkdownReportWriter {
 
         markdown.append("## 日志详情\n\n");
         for (LogEntry entry : logs) {
-            markdown.append("### r").append(entry.getRevision()).append("\n\n");
+            if (entry.getCommitHash() != null) {
+                markdown.append("### ").append(GitLogFetcher.shortHash(entry.getCommitHash())).append("\n\n");
+            } else {
+                markdown.append("### r").append(entry.getRevision()).append("\n\n");
+            }
             markdown.append("**作者**: `").append(safe(entry.getAuthor())).append("`  \n");
-            markdown.append("**时间**: ").append(fetcher.formatDate(entry.getDate())).append("  \n");
-            markdown.append("**版本**: r").append(entry.getRevision()).append("\n\n");
+            markdown.append("**时间**: ").append(dateFormatter.apply(entry.getDate())).append("  \n");
+            if (entry.getCommitHash() != null) {
+                markdown.append("**版本**: ").append(GitLogFetcher.shortHash(entry.getCommitHash())).append("\n\n");
+            } else {
+                markdown.append("**版本**: r").append(entry.getRevision()).append("\n\n");
+            }
 
             final String message = safe(entry.getMessage());
             if (message.isEmpty() && effectiveOptions.placeholderForEmptyMessage) {
diff --git a/src/main/java/com/svnlog/core/svn/LogEntry.java b/src/main/java/com/svnlog/core/svn/LogEntry.java
index edaf995..b5a1d9b 100644
--- a/src/main/java/com/svnlog/core/svn/LogEntry.java
+++ b/src/main/java/com/svnlog/core/svn/LogEntry.java
@@ -4,6 +4,7 @@ import java.util.Date;
 
 public class LogEntry {
     private long revision;
+    private String commitHash;
     private String author;
     private Date date;
     private String message;
@@ -27,6 +28,14 @@ public class LogEntry {
         this.revision = revision;
     }
 
+    public String getCommitHash() {
+        return commitHash;
+    }
+
+    public void setCommitHash(String commitHash) {
+        this.commitHash = commitHash;
+    }
+
     public String getAuthor() {
         return author;
     }
diff --git a/src/main/java/com/svnlog/web/controller/AppController.java b/src/main/java/com/svnlog/web/controller/AppController.java
index e3bf5ec..0cac4ec 100644
--- a/src/main/java/com/svnlog/web/controller/AppController.java
+++ b/src/main/java/com/svnlog/web/controller/AppController.java
@@ -6,6 +6,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,21 +32,34 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
+import com.svnlog.core.git.GitLogFetcher;
 import com.svnlog.web.dto.AiAnalyzeRequest;
+import com.svnlog.web.dto.GitConnectionRequest;
+import com.svnlog.web.dto.GitFetchRequest;
+import com.svnlog.web.dto.GitPresetCreateRequest;
+import com.svnlog.web.dto.GitPresetUpdateRequest;
+import com.svnlog.web.dto.GitVersionRangeRequest;
 import com.svnlog.web.dto.SettingsUpdateRequest;
 import com.svnlog.web.dto.SvnConnectionRequest;
 import com.svnlog.web.dto.SvnFetchRequest;
 import com.svnlog.web.dto.SvnPresetCreateRequest;
 import com.svnlog.web.dto.SvnPresetUpdateRequest;
 import com.svnlog.web.dto.SvnVersionRangeRequest;
+import com.svnlog.web.model.GitPresetManageItem;
+import com.svnlog.web.model.GitPresetSummary;
+import com.svnlog.web.model.ProjectConfig;
+import com.svnlog.web.model.RepositoryConfig;
 import com.svnlog.web.model.SvnPreset;
 import com.svnlog.web.model.SvnPresetManageItem;
 import com.svnlog.web.model.SvnPresetSummary;
 import com.svnlog.web.model.TaskInfo;
 import com.svnlog.web.model.TaskPageResult;
 import com.svnlog.web.service.AiWorkflowService;
+import com.svnlog.web.service.GitPresetService;
+import com.svnlog.web.service.GitWorkflowService;
 import com.svnlog.web.service.HealthService;
 import com.svnlog.web.service.OutputFileService;
+import com.svnlog.web.service.ProjectConfigService;
 import com.svnlog.web.service.SettingsService;
 import com.svnlog.web.service.SvnPresetService;
 import com.svnlog.web.service.SvnWorkflowService;
@@ -57,26 +71,35 @@ public class AppController {
     private static final Logger LOGGER = LoggerFactory.getLogger(AppController.class);
 
     private final SvnWorkflowService svnWorkflowService;
+    private final GitWorkflowService gitWorkflowService;
     private final AiWorkflowService aiWorkflowService;
     private final TaskService taskService;
     private final OutputFileService outputFileService;
     private final SettingsService settingsService;
     private final SvnPresetService svnPresetService;
+    private final GitPresetService gitPresetService;
+    private final ProjectConfigService projectConfigService;
     private final HealthService healthService;
 
     public AppController(SvnWorkflowService svnWorkflowService,
+                         GitWorkflowService gitWorkflowService,
                          AiWorkflowService aiWorkflowService,
                          TaskService taskService,
                          OutputFileService outputFileService,
                          SettingsService settingsService,
                          SvnPresetService svnPresetService,
+                         GitPresetService gitPresetService,
+                         ProjectConfigService projectConfigService,
                          HealthService healthService) {
         this.svnWorkflowService = svnWorkflowService;
+        this.gitWorkflowService = gitWorkflowService;
         this.aiWorkflowService = aiWorkflowService;
         this.taskService = taskService;
         this.outputFileService = outputFileService;
         this.settingsService = settingsService;
         this.svnPresetService = svnPresetService;
+        this.gitPresetService = gitPresetService;
+        this.projectConfigService = projectConfigService;
         this.healthService = healthService;
     }
 
@@ -164,6 +187,207 @@ public class AppController {
         return response;
     }
 
+    // ========== Git 接口 ==========
+
+    @PostMapping("/git/test-connection")
+    public Map<String, Object> testGitConnection(@Valid @RequestBody GitConnectionRequest request) throws Exception {
+        gitWorkflowService.testConnection(request);
+        final Map<String, Object> response = new HashMap<String, Object>();
+        response.put("success", true);
+        response.put("message", "Git 连接成功");
+        return response;
+    }
+
+    /** 查询指定时间范围的 Git 提交范围 */
+    @PostMapping("/git/version-range")
+    public Map<String, Object> getGitVersionRange(@Valid @RequestBody GitVersionRangeRequest request) throws Exception {
+        final String traceId = safe(request.getClientTraceId());
+        final GitPresetSummary presetSummary = findGitPresetSummary(request.getPresetId());
+
+        LOGGER.info(
+                "[GIT_VERSION_RANGE][REQUEST] traceId={} presetId={} presetName={} rangeType={} year={} month={} date={} week={}",
+                traceId,
+                request.getPresetId(),
+                presetSummary.getName(),
+                request.getRangeType(),
+                request.getYear(),
+                request.getMonth(),
+                request.getDate(),
+                request.getWeek()
+        );
+
+        final com.svnlog.core.git.GitLogFetcher.GitVersionRange range =
+                gitWorkflowService.getVersionRange(request);
+
+        final Map<String, Object> response = new HashMap<String, Object>();
+        response.put("presetId", request.getPresetId());
+        response.put("presetName", presetSummary.getName());
+        response.put("branch", presetSummary.getBranch());
+        response.put("rangeType", request.getRangeType());
+        response.put("year", request.getYear());
+        response.put("month", request.getMonth());
+        response.put("date", request.getDate());
+        response.put("week", request.getWeek());
+        response.put("traceId", traceId);
+        if (range != null) {
+            response.put("commitCount", Integer.valueOf(range.getCommitCount()));
+            response.put("startCommit", range.getStartCommit());
+            response.put("endCommit", range.getEndCommit());
+            LOGGER.info(
+                    "[GIT_VERSION_RANGE][RESPONSE] traceId={} presetId={} commitCount={} startCommit={} endCommit={}",
+                    traceId, request.getPresetId(), range.getCommitCount(),
+                    com.svnlog.core.git.GitLogFetcher.shortHash(range.getStartCommit()),
+                    com.svnlog.core.git.GitLogFetcher.shortHash(range.getEndCommit())
+            );
+        } else {
+            LOGGER.info(
+                    "[GIT_VERSION_RANGE][RESPONSE] traceId={} presetId={} noRangeFound=true",
+                    traceId, request.getPresetId()
+            );
+        }
+        return response;
+    }
+
+    @PostMapping("/git/fetch")
+    public Map<String, String> fetchGitLogs(@Valid @RequestBody GitFetchRequest request) {
+        final String taskId = taskService.submit("GIT_FETCH", context -> gitWorkflowService.fetchToMarkdown(request, context));
+        final Map<String, String> response = new HashMap<String, String>();
+        response.put("taskId", taskId);
+        return response;
+    }
+
+    @GetMapping("/git/presets")
+    public Map<String, Object> listGitPresets() {
+        final Map<String, Object> response = new HashMap<String, Object>();
+        response.put("presets", gitPresetService.listPresetSummaries());
+        return response;
+    }
+
+    /** 返回 Git 预设管理列表（含已禁用） */
+    @GetMapping("/git/presets/manage")
+    public List<GitPresetManageItem> listGitPresetsManage() {
+        return gitPresetService.listManage();
+    }
+
+    /** 新增 Git 预设 */
+    @PostMapping("/git/presets")
+    public ResponseEntity<GitPresetManageItem> createGitPreset(@Valid @RequestBody GitPresetCreateRequest request) {
+        final GitPresetManageItem item = gitPresetService.create(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(item);
+    }
+
+    /** 编辑 Git 预设 */
+    @PutMapping("/git/presets/{id}")
+    public GitPresetManageItem updateGitPreset(@PathVariable("id") String id,
+                                                @Valid @RequestBody GitPresetUpdateRequest request) {
+        return gitPresetService.update(id, request);
+    }
+
+    /** 删除（软删除）Git 预设 */
+    @DeleteMapping("/git/presets/{id}")
+    public Map<String, Object> deleteGitPreset(@PathVariable("id") String id) {
+        gitPresetService.delete(id);
+        final Map<String, Object> response = new HashMap<String, Object>();
+        response.put("id", id);
+        response.put("success", true);
+        return response;
+    }
+
+    /** 测试指定预设的 Git 连接 */
+    @PostMapping("/git/presets/{id}/test")
+    public Map<String, Object> testGitPresetConnection(@PathVariable("id") String id) throws Exception {
+        gitPresetService.getEnabledById(id);
+        final GitLogFetcher fetcher = buildGitFetcher(id);
+        fetcher.testConnection();
+        gitPresetService.touchLastUsedAt(id);
+
+        final Map<String, Object> response = new HashMap<String, Object>();
+        response.put("success", true);
+        response.put("message", "Git 连接成功");
+        return response;
+    }
+
+    // ========== 项目管理接口 ==========
+
+    /** 项目列表（含各项目下仓库摘要与未分配仓库） */
+    @GetMapping("/projects")
+    public Map<String, Object> listProjects() {
+        final Map<String, Object> response = new HashMap<String, Object>();
+        final List<Map<String, Object>> projectItems = new ArrayList<Map<String, Object>>();
+        for (ProjectConfig project : projectConfigService.listProjects()) {
+            final Map<String, Object> item = new HashMap<String, Object>();
+            item.put("id", project.getId());
+            item.put("name", project.getName());
+            item.put("sortOrder", Integer.valueOf(project.getSortOrder()));
+            final List<Map<String, Object>> repos = new ArrayList<Map<String, Object>>();
+            for (RepositoryConfig config : projectConfigService.listReposOfProject(project.getName())) {
+                repos.add(repoSummary(config));
+            }
+            item.put("repos", repos);
+            projectItems.add(item);
+        }
+        response.put("projects", projectItems);
+        final List<Map<String, Object>> unassigned = new ArrayList<Map<String, Object>>();
+        for (RepositoryConfig config : projectConfigService.listUnassignedRepos()) {
+            unassigned.add(repoSummary(config));
+        }
+        response.put("unassigned", unassigned);
+        return response;
+    }
+
+    /** 创建项目 */
+    @PostMapping("/projects")
+    public ResponseEntity<ProjectConfig> createProject(@RequestBody Map<String, String> body) throws Exception {
+        final String name = body == null ? null : body.get("name");
+        final ProjectConfig project = projectConfigService.create(name);
+        return ResponseEntity.status(HttpStatus.CREATED).body(project);
+    }
+
+    /** 重命名项目（同步仓库归属） */
+    @PutMapping("/projects/{id}")
+    public ProjectConfig renameProject(@PathVariable("id") String id, @RequestBody Map<String, String> body) throws Exception {
+        final String name = body == null ? null : body.get("name");
+        return projectConfigService.rename(id, name);
+    }
+
+    /** 删除项目（非空项目禁删） */
+    @DeleteMapping("/projects/{id}")
+    public Map<String, Object> deleteProject(@PathVariable("id") String id) {
+        projectConfigService.delete(id);
+        final Map<String, Object> response = new HashMap<String, Object>();
+        response.put("id", id);
+        response.put("success", true);
+        return response;
+    }
+
+    /** 项目排序 */
+    @PostMapping("/projects/{id}/move")
+    public List<ProjectConfig> moveProject(@PathVariable("id") String id, @RequestBody Map<String, String> body) throws Exception {
+        final String direction = body == null ? null : body.get("direction");
+        return projectConfigService.move(id, direction);
+    }
+
+    /** 分配仓库到项目（拖拽调用） */
+    @PostMapping("/projects/assign")
+    public Map<String, Object> assignRepo(@RequestBody Map<String, String> body) {
+        final String repoId = body == null ? null : body.get("repoId");
+        final String projectId = body == null ? null : body.get("projectId");
+        projectConfigService.assign(repoId, projectId);
+        final Map<String, Object> response = new HashMap<String, Object>();
+        response.put("success", true);
+        return response;
+    }
+
+    private Map<String, Object> repoSummary(RepositoryConfig config) {
+        final Map<String, Object> summary = new HashMap<String, Object>();
+        summary.put("id", config.getId());
+        summary.put("name", config.getName() == null ? "" : config.getName());
+        summary.put("type", config.isGit() ? "GIT" : "SVN");
+        summary.put("url", config.getSvnUrl() == null ? "" : config.getSvnUrl());
+        summary.put("enabled", Boolean.valueOf(config.isEnabled()));
+        return summary;
+    }
+
     @GetMapping("/svn/presets")
     public Map<String, Object> listSvnPresets() {
         final Map<String, Object> response = new HashMap<String, Object>();
@@ -355,6 +579,30 @@ public class AppController {
         return "***len=" + password.length();
     }
 
+    private GitPresetSummary findGitPresetSummary(String presetId) {
+        final List<GitPresetSummary> presets = gitPresetService.listPresetSummaries();
+        for (GitPresetSummary preset : presets) {
+            if (preset.getId().equals(presetId)) {
+                return preset;
+            }
+        }
+        throw new IllegalArgumentException("Git 预设不存在或已停用: " + presetId);
+    }
+
+    private GitLogFetcher buildGitFetcher(String presetId) {
+        final com.svnlog.web.model.GitPreset preset = gitPresetService.getEnabledById(presetId);
+        final GitPresetService.GitCredentials credentials = gitPresetService.resolveCredentials(presetId);
+        return new GitLogFetcher(
+                preset.getUrl(),
+                presetId,
+                preset.getBranch(),
+                preset.getAuthType(),
+                credentials.getUsername(),
+                credentials.getToken(),
+                credentials.getSshKey()
+        );
+    }
+
     private String safe(String value) {
         return value == null ? "" : value.trim();
     }
diff --git a/src/main/java/com/svnlog/web/dto/GitConnectionRequest.java b/src/main/java/com/svnlog/web/dto/GitConnectionRequest.java
new file mode 100644
index 0000000..98a913f
--- /dev/null
+++ b/src/main/java/com/svnlog/web/dto/GitConnectionRequest.java
@@ -0,0 +1,17 @@
+package com.svnlog.web.dto;
+
+import javax.validation.constraints.NotBlank;
+
+public class GitConnectionRequest {
+
+    @NotBlank
+    private String presetId;
+
+    public String getPresetId() {
+        return presetId;
+    }
+
+    public void setPresetId(String presetId) {
+        this.presetId = presetId;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/dto/GitFetchRequest.java b/src/main/java/com/svnlog/web/dto/GitFetchRequest.java
new file mode 100644
index 0000000..ade6a4a
--- /dev/null
+++ b/src/main/java/com/svnlog/web/dto/GitFetchRequest.java
@@ -0,0 +1,87 @@
+package com.svnlog.web.dto;
+
+import javax.validation.constraints.NotBlank;
+
+public class GitFetchRequest {
+
+    @NotBlank
+    private String presetId;
+
+    private String projectName;
+
+    private Integer year;
+
+    private Integer month;
+
+    private String rangeType;
+
+    private String date;
+
+    private String week;
+
+    private String filterUser;
+
+    public String getPresetId() {
+        return presetId;
+    }
+
+    public void setPresetId(String presetId) {
+        this.presetId = presetId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public String getRangeType() {
+        return rangeType;
+    }
+
+    public void setRangeType(String rangeType) {
+        this.rangeType = rangeType;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getWeek() {
+        return week;
+    }
+
+    public void setWeek(String week) {
+        this.week = week;
+    }
+
+    public String getFilterUser() {
+        return filterUser;
+    }
+
+    public void setFilterUser(String filterUser) {
+        this.filterUser = filterUser;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/dto/GitPresetCreateRequest.java b/src/main/java/com/svnlog/web/dto/GitPresetCreateRequest.java
new file mode 100644
index 0000000..54260b6
--- /dev/null
+++ b/src/main/java/com/svnlog/web/dto/GitPresetCreateRequest.java
@@ -0,0 +1,90 @@
+package com.svnlog.web.dto;
+
+import javax.validation.constraints.NotBlank;
+
+public class GitPresetCreateRequest {
+
+    @NotBlank(message = "名称为必填项")
+    private String name;
+
+    @NotBlank(message = "Git 地址为必填项")
+    private String url;
+
+    @NotBlank(message = "项目为必填项")
+    private String projectName;
+
+    private String branch;
+    private String authType;
+    private String gitUsername;
+    private String gitToken;
+    private String gitSshKey;
+    private Boolean enabled;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
+    public String getAuthType() {
+        return authType;
+    }
+
+    public void setAuthType(String authType) {
+        this.authType = authType;
+    }
+
+    public String getGitUsername() {
+        return gitUsername;
+    }
+
+    public void setGitUsername(String gitUsername) {
+        this.gitUsername = gitUsername;
+    }
+
+    public String getGitToken() {
+        return gitToken;
+    }
+
+    public void setGitToken(String gitToken) {
+        this.gitToken = gitToken;
+    }
+
+    public String getGitSshKey() {
+        return gitSshKey;
+    }
+
+    public void setGitSshKey(String gitSshKey) {
+        this.gitSshKey = gitSshKey;
+    }
+
+    public boolean isEnabled() {
+        return enabled == null || enabled.booleanValue();
+    }
+}
diff --git a/src/main/java/com/svnlog/web/dto/GitPresetUpdateRequest.java b/src/main/java/com/svnlog/web/dto/GitPresetUpdateRequest.java
new file mode 100644
index 0000000..9cbd6de
--- /dev/null
+++ b/src/main/java/com/svnlog/web/dto/GitPresetUpdateRequest.java
@@ -0,0 +1,104 @@
+package com.svnlog.web.dto;
+
+public class GitPresetUpdateRequest {
+
+    private String name;
+    private String url;
+    private String projectName;
+    private String branch;
+    private String authType;
+    private String gitUsername;
+    private String gitToken;
+    private String gitSshKey;
+    private Boolean clearGitToken;
+    private Boolean clearGitSshKey;
+    private Boolean enabled;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
+    public String getAuthType() {
+        return authType;
+    }
+
+    public void setAuthType(String authType) {
+        this.authType = authType;
+    }
+
+    public String getGitUsername() {
+        return gitUsername;
+    }
+
+    public void setGitUsername(String gitUsername) {
+        this.gitUsername = gitUsername;
+    }
+
+    public String getGitToken() {
+        return gitToken;
+    }
+
+    public void setGitToken(String gitToken) {
+        this.gitToken = gitToken;
+    }
+
+    public String getGitSshKey() {
+        return gitSshKey;
+    }
+
+    public void setGitSshKey(String gitSshKey) {
+        this.gitSshKey = gitSshKey;
+    }
+
+    public boolean isClearGitToken() {
+        return clearGitToken != null && clearGitToken.booleanValue();
+    }
+
+    public void setClearGitToken(Boolean clearGitToken) {
+        this.clearGitToken = clearGitToken;
+    }
+
+    public boolean isClearGitSshKey() {
+        return clearGitSshKey != null && clearGitSshKey.booleanValue();
+    }
+
+    public void setClearGitSshKey(Boolean clearGitSshKey) {
+        this.clearGitSshKey = clearGitSshKey;
+    }
+
+    public Boolean getEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/dto/GitVersionRangeRequest.java b/src/main/java/com/svnlog/web/dto/GitVersionRangeRequest.java
new file mode 100644
index 0000000..085c94d
--- /dev/null
+++ b/src/main/java/com/svnlog/web/dto/GitVersionRangeRequest.java
@@ -0,0 +1,77 @@
+package com.svnlog.web.dto;
+
+import javax.validation.constraints.NotBlank;
+
+public class GitVersionRangeRequest {
+
+    @NotBlank
+    private String presetId;
+
+    private Integer year;
+
+    private Integer month;
+
+    private String rangeType;
+
+    private String date;
+
+    private String week;
+
+    private String clientTraceId;
+
+    public String getPresetId() {
+        return presetId;
+    }
+
+    public void setPresetId(String presetId) {
+        this.presetId = presetId;
+    }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    public String getRangeType() {
+        return rangeType;
+    }
+
+    public void setRangeType(String rangeType) {
+        this.rangeType = rangeType;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getWeek() {
+        return week;
+    }
+
+    public void setWeek(String week) {
+        this.week = week;
+    }
+
+    public String getClientTraceId() {
+        return clientTraceId;
+    }
+
+    public void setClientTraceId(String clientTraceId) {
+        this.clientTraceId = clientTraceId;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/dto/SvnPresetCreateRequest.java b/src/main/java/com/svnlog/web/dto/SvnPresetCreateRequest.java
index 8bb9619..027316c 100644
--- a/src/main/java/com/svnlog/web/dto/SvnPresetCreateRequest.java
+++ b/src/main/java/com/svnlog/web/dto/SvnPresetCreateRequest.java
@@ -10,6 +10,9 @@ public class SvnPresetCreateRequest {
     @NotBlank(message = "SVN URL 为必填项")
     private String url;
 
+    @NotBlank(message = "项目为必填项")
+    private String projectName;
+
     private String svnUsername;
     private String svnPassword;
     private Boolean enabled;
@@ -30,6 +33,14 @@ public class SvnPresetCreateRequest {
         this.url = url;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     public String getSvnUsername() {
         return svnUsername;
     }
diff --git a/src/main/java/com/svnlog/web/dto/SvnPresetUpdateRequest.java b/src/main/java/com/svnlog/web/dto/SvnPresetUpdateRequest.java
index 8886d39..97ea768 100644
--- a/src/main/java/com/svnlog/web/dto/SvnPresetUpdateRequest.java
+++ b/src/main/java/com/svnlog/web/dto/SvnPresetUpdateRequest.java
@@ -4,6 +4,7 @@ public class SvnPresetUpdateRequest {
 
     private String name;
     private String url;
+    private String projectName;
     private String svnUsername;
     private String svnPassword;
     private Boolean enabled;
@@ -25,6 +26,14 @@ public class SvnPresetUpdateRequest {
         this.url = url;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     public String getSvnUsername() {
         return svnUsername;
     }
diff --git a/src/main/java/com/svnlog/web/model/GitPreset.java b/src/main/java/com/svnlog/web/model/GitPreset.java
new file mode 100644
index 0000000..ba66d90
--- /dev/null
+++ b/src/main/java/com/svnlog/web/model/GitPreset.java
@@ -0,0 +1,71 @@
+package com.svnlog.web.model;
+
+public class GitPreset {
+
+    private String id;
+    private String name;
+    private String projectName;
+    private String url;
+    private String branch;
+    private String authType;
+
+    public GitPreset() {
+    }
+
+    public GitPreset(String id, String name, String projectName, String url, String branch, String authType) {
+        this.id = id;
+        this.name = name;
+        this.projectName = projectName;
+        this.url = url;
+        this.branch = branch;
+        this.authType = authType;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
+    public String getAuthType() {
+        return authType;
+    }
+
+    public void setAuthType(String authType) {
+        this.authType = authType;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/model/GitPresetManageItem.java b/src/main/java/com/svnlog/web/model/GitPresetManageItem.java
new file mode 100644
index 0000000..2f4356f
--- /dev/null
+++ b/src/main/java/com/svnlog/web/model/GitPresetManageItem.java
@@ -0,0 +1,124 @@
+package com.svnlog.web.model;
+
+public class GitPresetManageItem {
+
+    private String id;
+    private String name;
+    private String projectName;
+    private String url;
+    private String branch;
+    private String authType;
+    private String gitUsername;
+    private boolean credentialsConfigured;
+    private boolean enabled;
+    private long createdAt;
+    private long lastUsedAt;
+
+    public GitPresetManageItem() {
+    }
+
+    public GitPresetManageItem(String id, String name, String projectName, String url, String branch,
+                                String authType, String gitUsername,
+                                boolean credentialsConfigured, boolean enabled,
+                                long createdAt, long lastUsedAt) {
+        this.id = id;
+        this.name = name;
+        this.projectName = projectName;
+        this.url = url;
+        this.branch = branch;
+        this.authType = authType;
+        this.gitUsername = gitUsername;
+        this.credentialsConfigured = credentialsConfigured;
+        this.enabled = enabled;
+        this.createdAt = createdAt;
+        this.lastUsedAt = lastUsedAt;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
+    public String getAuthType() {
+        return authType;
+    }
+
+    public void setAuthType(String authType) {
+        this.authType = authType;
+    }
+
+    public String getGitUsername() {
+        return gitUsername;
+    }
+
+    public void setGitUsername(String gitUsername) {
+        this.gitUsername = gitUsername;
+    }
+
+    public boolean isCredentialsConfigured() {
+        return credentialsConfigured;
+    }
+
+    public void setCredentialsConfigured(boolean credentialsConfigured) {
+        this.credentialsConfigured = credentialsConfigured;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public long getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(long createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public long getLastUsedAt() {
+        return lastUsedAt;
+    }
+
+    public void setLastUsedAt(long lastUsedAt) {
+        this.lastUsedAt = lastUsedAt;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/model/GitPresetSummary.java b/src/main/java/com/svnlog/web/model/GitPresetSummary.java
new file mode 100644
index 0000000..06b46e2
--- /dev/null
+++ b/src/main/java/com/svnlog/web/model/GitPresetSummary.java
@@ -0,0 +1,41 @@
+package com.svnlog.web.model;
+
+public class GitPresetSummary {
+
+    private String id;
+    private String name;
+    private String branch;
+
+    public GitPresetSummary() {
+    }
+
+    public GitPresetSummary(String id, String name, String branch) {
+        this.id = id;
+        this.name = name;
+        this.branch = branch;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/model/ProjectConfig.java b/src/main/java/com/svnlog/web/model/ProjectConfig.java
new file mode 100644
index 0000000..7d97159
--- /dev/null
+++ b/src/main/java/com/svnlog/web/model/ProjectConfig.java
@@ -0,0 +1,48 @@
+package com.svnlog.web.model;
+
+import java.util.UUID;
+
+public class ProjectConfig {
+
+    private String id;
+    private String name;
+    private int sortOrder;
+    private long createdAt;
+
+    public ProjectConfig() {
+        this.id = UUID.randomUUID().toString();
+        this.createdAt = System.currentTimeMillis();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(int sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
+    public long getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(long createdAt) {
+        this.createdAt = createdAt;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/model/RepositoryConfig.java b/src/main/java/com/svnlog/web/model/RepositoryConfig.java
index 55d1d84..4411c68 100644
--- a/src/main/java/com/svnlog/web/model/RepositoryConfig.java
+++ b/src/main/java/com/svnlog/web/model/RepositoryConfig.java
@@ -8,9 +8,14 @@ public class RepositoryConfig {
     private String name;
     private String type;
     private boolean enabled;
+    private String projectName;
     private String svnUrl;
     private String svnUsername;
     private String svnPasswordEncrypted;
+    private String gitBranch;
+    private String gitAuthType;
+    private String gitTokenEncrypted;
+    private String gitSshKeyEncrypted;
     private long createdAt;
     private long lastUsedAt;
 
@@ -52,6 +57,14 @@ public class RepositoryConfig {
         this.enabled = enabled;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     public String getSvnUrl() {
         return svnUrl;
     }
@@ -76,6 +89,38 @@ public class RepositoryConfig {
         this.svnPasswordEncrypted = svnPasswordEncrypted;
     }
 
+    public String getGitBranch() {
+        return gitBranch;
+    }
+
+    public void setGitBranch(String gitBranch) {
+        this.gitBranch = gitBranch;
+    }
+
+    public String getGitAuthType() {
+        return gitAuthType;
+    }
+
+    public void setGitAuthType(String gitAuthType) {
+        this.gitAuthType = gitAuthType;
+    }
+
+    public String getGitTokenEncrypted() {
+        return gitTokenEncrypted;
+    }
+
+    public void setGitTokenEncrypted(String gitTokenEncrypted) {
+        this.gitTokenEncrypted = gitTokenEncrypted;
+    }
+
+    public String getGitSshKeyEncrypted() {
+        return gitSshKeyEncrypted;
+    }
+
+    public void setGitSshKeyEncrypted(String gitSshKeyEncrypted) {
+        this.gitSshKeyEncrypted = gitSshKeyEncrypted;
+    }
+
     public long getCreatedAt() {
         return createdAt;
     }
@@ -95,4 +140,8 @@ public class RepositoryConfig {
     public boolean isSvn() {
         return "SVN".equalsIgnoreCase(type);
     }
+
+    public boolean isGit() {
+        return "GIT".equalsIgnoreCase(type);
+    }
 }
diff --git a/src/main/java/com/svnlog/web/model/SvnPreset.java b/src/main/java/com/svnlog/web/model/SvnPreset.java
index 8e2d1f0..32ca133 100644
--- a/src/main/java/com/svnlog/web/model/SvnPreset.java
+++ b/src/main/java/com/svnlog/web/model/SvnPreset.java
@@ -4,14 +4,16 @@ public class SvnPreset {
 
     private String id;
     private String name;
+    private String projectName;
     private String url;
 
     public SvnPreset() {
     }
 
-    public SvnPreset(String id, String name, String url) {
+    public SvnPreset(String id, String name, String projectName, String url) {
         this.id = id;
         this.name = name;
+        this.projectName = projectName;
         this.url = url;
     }
 
@@ -31,6 +33,14 @@ public class SvnPreset {
         this.name = name;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     public String getUrl() {
         return url;
     }
diff --git a/src/main/java/com/svnlog/web/model/SvnPresetManageItem.java b/src/main/java/com/svnlog/web/model/SvnPresetManageItem.java
index d6b2129..d9c6019 100644
--- a/src/main/java/com/svnlog/web/model/SvnPresetManageItem.java
+++ b/src/main/java/com/svnlog/web/model/SvnPresetManageItem.java
@@ -4,6 +4,7 @@ public class SvnPresetManageItem {
 
     private String id;
     private String name;
+    private String projectName;
     private String url;
     private String svnUsername;
     private boolean svnCredentialsConfigured;
@@ -14,11 +15,12 @@ public class SvnPresetManageItem {
     public SvnPresetManageItem() {
     }
 
-    public SvnPresetManageItem(String id, String name, String url,
+    public SvnPresetManageItem(String id, String name, String projectName, String url,
                                 String svnUsername, boolean svnCredentialsConfigured,
                                 boolean enabled, long createdAt, long lastUsedAt) {
         this.id = id;
         this.name = name;
+        this.projectName = projectName;
         this.url = url;
         this.svnUsername = svnUsername;
         this.svnCredentialsConfigured = svnCredentialsConfigured;
@@ -43,6 +45,14 @@ public class SvnPresetManageItem {
         this.name = name;
     }
 
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     public String getUrl() {
         return url;
     }
diff --git a/src/main/java/com/svnlog/web/service/AiWorkflowService.java b/src/main/java/com/svnlog/web/service/AiWorkflowService.java
index 4d83a99..552e50d 100644
--- a/src/main/java/com/svnlog/web/service/AiWorkflowService.java
+++ b/src/main/java/com/svnlog/web/service/AiWorkflowService.java
@@ -7,6 +7,8 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -38,18 +40,18 @@ public class AiWorkflowService {
             "PRS-7950在线巡视",
             "PRS-7950在线巡视电科院测试版"
     };
-    private static final String FIXED_PROJECT_VALUE =
-            "PRS-7950在线巡视电科院测试版/PRS-7950在线巡视/PRS-7050场站智慧管控";
     private static final Pattern NUMBERED_ITEM_PATTERN = Pattern.compile("^\\s*(\\d+)[\\.、\\)]\\s*(.+)$");
     private static final Pattern BULLET_ITEM_PATTERN = Pattern.compile("^\\s*[-*•]\\s*(.+)$");
-    private static final Pattern REVISION_ITEM_PATTERN = Pattern.compile("^\\s*(?:\\*\\s*)?r\\d+\\s*[-:：]+\\s*(.+)$");
+    private static final Pattern REVISION_ITEM_PATTERN = Pattern.compile("^\\s*(?:\\*\\s*)?(?:r\\d+|[0-9a-f]{7,40})\\s*[-:：]+\\s*(.+)$");
     private static final Pattern FILE_SECTION_PATTERN =
             Pattern.compile("(?s)=== 文件:\\s*(.*?)\\s*===\\s*(.*?)(?=(?:\\n\\s*=== 文件:)|\\z)");
     private static final Pattern COMMIT_ENTRY_PATTERN =
-            Pattern.compile("(?s)###\\s+r(\\d+)\\b.*?\\*\\*提交信息\\*\\*:\\s*```\\s*(.*?)\\s*```");
-    private static final Pattern REVISION_REF_PATTERN = Pattern.compile("r\\d+");
+            Pattern.compile("(?s)###\\s+(r\\d+|[0-9a-f]{7,40})\\b.*?\\*\\*提交信息\\*\\*:\\s*```\\s*(.*?)\\s*```");
+    private static final Pattern PROJECT_META_PATTERN =
+            Pattern.compile("^\\s*-\\s*\\*\\*项目\\*\\*:\\s*`?([^`\\n]+)`?\\s*$");
+    private static final Pattern REVISION_REF_PATTERN = Pattern.compile("(?:r\\d+|[0-9a-f]{7,40})");
     private static final Pattern TOTAL_RECORDS_PATTERN = Pattern.compile("总记录数\\*\\*:\\s*(\\d+)\\s*条");
-    private static final Pattern REVISION_HEADING_PATTERN = Pattern.compile("^###\\s+r\\d+.*$");
+    private static final Pattern REVISION_HEADING_PATTERN = Pattern.compile("^###\\s+(?:r\\d+|[0-9a-f]{7,40}).*$");
     private static final int SUMMARY_RECORDS_PER_ITEM = 4;
     private static final int SUMMARY_MIN_ITEMS = 2;
     private static final int SUMMARY_MAX_ITEMS = 200;
@@ -58,15 +60,18 @@ public class AiWorkflowService {
     private final AiInputValidator aiInputValidator;
     private final AiApiService aiApiService;
     private final ExcelExportService excelExportService;
+    private final ProjectConfigService projectConfigService;
 
     public AiWorkflowService(OutputFileService outputFileService,
                              AiInputValidator aiInputValidator,
                              AiApiService aiApiService,
-                             ExcelExportService excelExportService) {
+                             ExcelExportService excelExportService,
+                             ProjectConfigService projectConfigService) {
         this.outputFileService = outputFileService;
         this.aiInputValidator = aiInputValidator;
         this.aiApiService = aiApiService;
         this.excelExportService = excelExportService;
+        this.projectConfigService = projectConfigService;
     }
 
     public TaskResult analyzeAndExport(AiAnalyzeRequest request, TaskContext context) throws Exception {
@@ -90,9 +95,10 @@ public class AiWorkflowService {
                 ? request.getPeriod().trim()
                 : new SimpleDateFormat("yyyy年MM月").format(new Date());
 
+        final List<String> projectNames = resolveActiveProjects(projectCommits);
         final Map<String, LinkedHashSet<String>> groupedFromAi = createGroupedItems();
-        for (int i = 0; i < FIXED_PROJECTS.length; i++) {
-            final String project = FIXED_PROJECTS[i];
+        for (int i = 0; i < projectNames.size(); i++) {
+            final String project = projectNames.get(i);
             final int targetItems = projectMinItems.containsKey(project)
                     ? projectMinItems.get(project).intValue()
                     : SUMMARY_MIN_ITEMS;
@@ -148,7 +154,7 @@ public class AiWorkflowService {
 
         final String excelContent = buildContentFromPayload(payload);
         excelExportService.writeExcel(outputFile, excelContent, period,
-                DEFAULT_TEAM, DEFAULT_CONTACT, DEFAULT_DEVELOPER, FIXED_PROJECT_VALUE);
+                DEFAULT_TEAM, DEFAULT_CONTACT, DEFAULT_DEVELOPER, buildProjectValue(projectNames));
 
         context.setProgress(100, "AI 分析已完成");
         final TaskResult result = new TaskResult("工作量统计已生成");
@@ -534,13 +540,16 @@ public class AiWorkflowService {
         while (fileMatcher.find()) {
             final String filename = fileMatcher.group(1);
             final String section = fileMatcher.group(2);
-            final String project = normalizeProject(filename);
+            String project = readProjectMeta(section);
+            if (project == null) {
+                project = normalizeProject(filename);
+            }
             if (project == null) continue;
             final List<CommitEntry> commits = grouped.get(project);
             if (commits == null) continue;
             final Matcher commitMatcher = COMMIT_ENTRY_PATTERN.matcher(section == null ? "" : section);
             while (commitMatcher.find()) {
-                final String revision = "r" + commitMatcher.group(1);
+                final String revision = commitMatcher.group(1).toLowerCase();
                 final String message = normalizeCommitMessage(commitMatcher.group(2));
                 if (message.isEmpty()) continue;
                 commits.add(new CommitEntry(revision, message));
@@ -549,9 +558,21 @@ public class AiWorkflowService {
         return grouped;
     }
 
+    /** 从报告查询条件中读取项目元信息（- **项目**: xxx），无则返回 null */
+    private String readProjectMeta(String section) {
+        if (section == null || section.isEmpty()) {
+            return null;
+        }
+        final Matcher matcher = PROJECT_META_PATTERN.matcher(section);
+        if (matcher.find()) {
+            return normalizeProject(matcher.group(1));
+        }
+        return null;
+    }
+
     private Map<String, Integer> buildProjectLogCountsFromCommits(Map<String, List<CommitEntry>> projectCommits) {
         final Map<String, Integer> counts = new LinkedHashMap<String, Integer>();
-        for (String project : FIXED_PROJECTS) {
+        for (String project : resolveProjectNames()) {
             final List<CommitEntry> commits = projectCommits == null ? null : projectCommits.get(project);
             counts.put(project, Integer.valueOf(commits == null ? 0 : commits.size()));
         }
@@ -560,7 +581,7 @@ public class AiWorkflowService {
 
     private Map<String, List<CommitEntry>> createProjectCommitMap() {
         final Map<String, List<CommitEntry>> map = new LinkedHashMap<String, List<CommitEntry>>();
-        for (String project : FIXED_PROJECTS) map.put(project, new ArrayList<CommitEntry>());
+        for (String project : resolveProjectNames()) map.put(project, new ArrayList<CommitEntry>());
         return map;
     }
 
@@ -594,7 +615,7 @@ public class AiWorkflowService {
         final JsonArray records = new JsonArray();
         final JsonObject record = new JsonObject();
         record.addProperty("sequence", 1);
-        record.addProperty("project", FIXED_PROJECT_VALUE);
+        record.addProperty("project", buildProjectValue(resolveProjectNames()));
         record.addProperty("content", "");
         records.add(record);
         payload.add("records", records);
@@ -603,7 +624,7 @@ public class AiWorkflowService {
 
     private Map<String, Integer> buildProjectMinItems(Map<String, Integer> projectLogCounts) {
         final Map<String, Integer> minimums = new LinkedHashMap<String, Integer>();
-        for (String project : FIXED_PROJECTS) {
+        for (String project : resolveProjectNames()) {
             final int logCount = projectLogCounts.containsKey(project)
                     ? projectLogCounts.get(project).intValue() : 0;
             minimums.put(project, Integer.valueOf(computeRequiredSummaryItems(
@@ -634,7 +655,7 @@ public class AiWorkflowService {
         }
 
         final StringBuilder builder = new StringBuilder();
-        for (String project : FIXED_PROJECTS) {
+        for (String project : resolveProjectNames()) {
             final LinkedHashSet<String> items = groupedItems.get(project);
             if (items == null || items.isEmpty()) continue;
             if (builder.length() > 0) builder.append("\n\n");
@@ -660,7 +681,7 @@ public class AiWorkflowService {
         }
 
         final Map<String, LinkedHashSet<String>> groupedFromMarkdown = parseItemsFromMarkdown(markdownContent);
-        for (String project : FIXED_PROJECTS) {
+        for (String project : resolveProjectNames()) {
             final int targetItems = projectMinItems.containsKey(project)
                     ? projectMinItems.get(project).intValue() : 2;
             final LinkedHashSet<String> current = groupedFromPayload.get(project);
@@ -669,6 +690,10 @@ public class AiWorkflowService {
             if (current.isEmpty() && source != null) {
                 for (String item : source) current.add(item);
             }
+            // 无数据项目跳过：不补占位项，避免无提交项目出现在最终 Excel
+            if (current.isEmpty()) {
+                continue;
+            }
             final LinkedHashSet<String> normalized = normalizeToTargetItemCount(project, current, targetItems);
             current.clear();
             current.addAll(normalized);
@@ -691,7 +716,7 @@ public class AiWorkflowService {
             if (headingProject != null) { currentProject = headingProject; continue; }
             final String extracted = parseWorkItem(line);
             if (extracted == null || extracted.isEmpty()) continue;
-            final String targetProject = currentProject == null ? FIXED_PROJECTS[0] : currentProject;
+            final String targetProject = currentProject == null ? firstProject() : currentProject;
             groupedItems.get(targetProject).add(extracted);
         }
         return groupedItems;
@@ -699,7 +724,7 @@ public class AiWorkflowService {
 
     private void applyGroupedItemsToPayload(JsonObject payload, Map<String, LinkedHashSet<String>> groupedItems) {
         final StringBuilder mergedContent = new StringBuilder();
-        for (String project : FIXED_PROJECTS) {
+        for (String project : resolveProjectNames()) {
             final LinkedHashSet<String> items = groupedItems.get(project);
             if (items == null || items.isEmpty()) continue;
             if (mergedContent.length() > 0) mergedContent.append("\n\n");
@@ -719,7 +744,7 @@ public class AiWorkflowService {
             record.addProperty("sequence", 1);
             records.add(record);
         }
-        record.addProperty("project", FIXED_PROJECT_VALUE);
+        record.addProperty("project", buildProjectValue(resolveProjectNames()));
         record.addProperty("content", merged);
     }
 
@@ -730,7 +755,7 @@ public class AiWorkflowService {
     private Map<String, LinkedHashSet<String>> createGroupedItems() {
         final Map<String, LinkedHashSet<String>> groupedItems =
                 new LinkedHashMap<String, LinkedHashSet<String>>();
-        for (String project : FIXED_PROJECTS) groupedItems.put(project, new LinkedHashSet<String>());
+        for (String project : resolveProjectNames()) groupedItems.put(project, new LinkedHashSet<String>());
         return groupedItems;
     }
 
@@ -745,7 +770,7 @@ public class AiWorkflowService {
             if (headingProject != null) { currentProject = headingProject; continue; }
             final String extracted = parseWorkItem(line);
             if (extracted == null || extracted.isEmpty()) continue;
-            final String targetProject = currentProject == null ? FIXED_PROJECTS[0] : currentProject;
+            final String targetProject = currentProject == null ? firstProject() : currentProject;
             groupedItems.get(targetProject).add(extracted);
         }
     }
@@ -775,7 +800,10 @@ public class AiWorkflowService {
         return line.startsWith("SVN") || line.startsWith("仓库") || line.startsWith("分支")
                 || line.startsWith("版本") || line.startsWith("提交总数") || line.startsWith("日志详情")
                 || line.startsWith("作者") || line.startsWith("时间") || line.startsWith("消息")
-                || line.startsWith("文件") || line.startsWith("=== 文件:");
+                || line.startsWith("文件") || line.startsWith("=== 文件:")
+                || line.startsWith("**项目**") || line.startsWith("- **项目**")
+                || line.startsWith("**Git地址**") || line.startsWith("- **Git地址**")
+                || line.startsWith("**提交范围**") || line.startsWith("- **提交范围**");
     }
 
     private String cleanWorkItem(String item) {
@@ -791,12 +819,74 @@ public class AiWorkflowService {
         if (value == null) return null;
         final String input = value.trim();
         if (input.isEmpty()) return null;
+        final List<String> projectNames = resolveProjectNames();
+        // 1) 项目名精确匹配（显式项目字段优先）
+        for (String project : projectNames) {
+            if (input.equalsIgnoreCase(project)) {
+                return project;
+            }
+        }
+        // 2) 项目名包含匹配（长名优先，避免子串误匹配）
+        final List<String> sortedByNameLength = new ArrayList<String>(projectNames);
+        Collections.sort(sortedByNameLength, new Comparator<String>() {
+            @Override
+            public int compare(String a, String b) {
+                return Integer.compare(b.length(), a.length());
+            }
+        });
+        for (String project : sortedByNameLength) {
+            if (input.contains(project)) {
+                return project;
+            }
+        }
+        // 3) 关键词匹配固定项目（兼容未配置项目字段的旧报告）
         if (input.contains("7050")) return "PRS-7050场站智慧管控";
         if (input.contains("电科院")) return "PRS-7950在线巡视电科院测试版";
         if (input.contains("7950")) return "PRS-7950在线巡视";
         return null;
     }
 
+    /**
+     * 动态项目列表：取自项目管理配置（按 sortOrder 排序），
+     * 迁移后固定 3 个 SVN 项目保持原顺序，Excel 版式不变。
+     */
+    private List<String> resolveProjectNames() {
+        return projectConfigService.listProjectNames();
+    }
+
+    private String buildProjectValue(List<String> projectNames) {
+        final List<String> names = projectNames == null ? new ArrayList<String>() : projectNames;
+        if (names.isEmpty()) {
+            return "";
+        }
+        final StringBuilder builder = new StringBuilder();
+        for (String name : names) {
+            if (builder.length() > 0) builder.append('/');
+            builder.append(name);
+        }
+        return builder.toString();
+    }
+
+    /**
+     * 有提交数据的项目列表（保持项目配置顺序）；无数据项目不参与 AI 分析，
+     * 最终 Excel 中也不会出现。
+     */
+    private List<String> resolveActiveProjects(Map<String, List<CommitEntry>> projectCommits) {
+        final List<String> active = new ArrayList<String>();
+        for (String project : resolveProjectNames()) {
+            final List<CommitEntry> commits = projectCommits == null ? null : projectCommits.get(project);
+            if (commits != null && !commits.isEmpty()) {
+                active.add(project);
+            }
+        }
+        return active;
+    }
+
+    private String firstProject() {
+        final List<String> names = resolveProjectNames();
+        return names.isEmpty() ? "" : names.get(0);
+    }
+
     private String buildOutputFilename(String outputFileName) {
         if (outputFileName != null && !outputFileName.trim().isEmpty()) {
             String name = outputFileName.trim();
diff --git a/src/main/java/com/svnlog/web/service/GitPresetService.java b/src/main/java/com/svnlog/web/service/GitPresetService.java
new file mode 100644
index 0000000..82b758a
--- /dev/null
+++ b/src/main/java/com/svnlog/web/service/GitPresetService.java
@@ -0,0 +1,254 @@
+package com.svnlog.web.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import com.svnlog.web.dto.GitPresetCreateRequest;
+import com.svnlog.web.dto.GitPresetUpdateRequest;
+import com.svnlog.web.model.GitPreset;
+import com.svnlog.web.model.GitPresetManageItem;
+import com.svnlog.web.model.GitPresetSummary;
+import com.svnlog.web.model.RepositoryConfig;
+import com.svnlog.web.util.CryptoUtils;
+
+@Service
+public class GitPresetService {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitPresetService.class);
+    private static final String AUTH_TYPE_PASSWORD = "PASSWORD";
+    private static final String AUTH_TYPE_SSH_KEY = "SSH_KEY";
+
+    private final RepositoryConfigService repositoryConfigService;
+    private final ProjectConfigService projectConfigService;
+
+    public GitPresetService(RepositoryConfigService repositoryConfigService,
+                            ProjectConfigService projectConfigService) {
+        this.repositoryConfigService = repositoryConfigService;
+        this.projectConfigService = projectConfigService;
+    }
+
+    /** Git 凭据（明文，解密后） */
+    public static class GitCredentials {
+        private final String username;
+        private final String token;
+        private final String sshKey;
+
+        public GitCredentials(String username, String token, String sshKey) {
+            this.username = username == null ? "" : username;
+            this.token = token == null ? "" : token;
+            this.sshKey = sshKey == null ? "" : sshKey;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public String getToken() {
+            return token;
+        }
+
+        public String getSshKey() {
+            return sshKey;
+        }
+    }
+
+    // ========== 只读接口（供抓取页使用，只允许 enabled 预设） ==========
+
+    public List<GitPresetSummary> listPresetSummaries() {
+        final List<GitPreset> presets = listEnabledPresets();
+        final List<GitPresetSummary> summaries = new ArrayList<GitPresetSummary>();
+        for (GitPreset preset : presets) {
+            summaries.add(new GitPresetSummary(preset.getId(), preset.getName(), preset.getBranch()));
+        }
+        return summaries;
+    }
+
+    public List<GitPreset> listEnabledPresets() {
+        final List<RepositoryConfig> configs = repositoryConfigService.listByType("GIT");
+        final List<GitPreset> presets = new ArrayList<GitPreset>();
+        for (RepositoryConfig config : configs) {
+            if (config.isEnabled()) {
+                presets.add(toGitPreset(config));
+            }
+        }
+        return presets;
+    }
+
+    public GitPreset getEnabledById(String presetId) {
+        final RepositoryConfig config = repositoryConfigService.getById(trim(presetId));
+        if (!config.isEnabled()) {
+            throw new IllegalArgumentException("仓库已停用: " + presetId);
+        }
+        if (!config.isGit()) {
+            throw new IllegalArgumentException("仓库类型不是 Git: " + presetId);
+        }
+        return toGitPreset(config);
+    }
+
+    public GitCredentials resolveCredentials(String presetId) {
+        final RepositoryConfig config = repositoryConfigService.getById(trim(presetId));
+        final String username = config.getSvnUsername() == null ? "" : config.getSvnUsername();
+        final String token = isBlank(config.getGitTokenEncrypted())
+                ? "" : CryptoUtils.decrypt(config.getGitTokenEncrypted());
+        final String sshKey = isBlank(config.getGitSshKeyEncrypted())
+                ? "" : CryptoUtils.decrypt(config.getGitSshKeyEncrypted());
+        return new GitCredentials(username, token, sshKey);
+    }
+
+    // ========== 管理接口 ==========
+
+    public List<GitPresetManageItem> listManage() {
+        final List<RepositoryConfig> configs = repositoryConfigService.listManage();
+        final List<GitPresetManageItem> items = new ArrayList<GitPresetManageItem>();
+        for (RepositoryConfig config : configs) {
+            if (!config.isGit()) {
+                continue;
+            }
+            items.add(toManageItem(config));
+        }
+        return items;
+    }
+
+    public GitPresetManageItem create(GitPresetCreateRequest request) {
+        final RepositoryConfig config = new RepositoryConfig();
+        config.setType("GIT");
+        config.setName(trim(request.getName()));
+        // 兼容旧调用：项目字段为空时回退为仓库名（控制器 @NotBlank 已强制必填）
+        final String projectName = isBlank(request.getProjectName())
+                ? config.getName() : trim(request.getProjectName());
+        projectConfigService.ensureProject(projectName);
+        config.setProjectName(projectName);
+        config.setSvnUrl(trim(request.getUrl()));
+        config.setGitBranch(trim(request.getBranch()));
+        config.setGitAuthType(resolveAuthType(request.getAuthType()));
+        config.setEnabled(request.isEnabled());
+        config.setSvnUsername(trim(request.getGitUsername()));
+        if (!isBlank(request.getGitToken())) {
+            config.setGitTokenEncrypted(CryptoUtils.encrypt(trim(request.getGitToken())));
+        }
+        if (!isBlank(request.getGitSshKey())) {
+            config.setGitSshKeyEncrypted(CryptoUtils.encrypt(request.getGitSshKey().trim()));
+        }
+        repositoryConfigService.create(config);
+        LOGGER.info("新建 Git 预设: id={} name={}", config.getId(), config.getName());
+        return toManageItem(config);
+    }
+
+    public GitPresetManageItem update(String id, GitPresetUpdateRequest request) {
+        if (request.getName() != null && isBlank(request.getName())) {
+            throw new IllegalArgumentException("名称不能为空");
+        }
+        if (request.getUrl() != null && isBlank(request.getUrl())) {
+            throw new IllegalArgumentException("Git 地址不能为空");
+        }
+        if (request.getProjectName() != null && isBlank(request.getProjectName())) {
+            throw new IllegalArgumentException("项目不能为空");
+        }
+        String tokenEncrypted = null;
+        if (!isBlank(request.getGitToken())) {
+            tokenEncrypted = CryptoUtils.encrypt(trim(request.getGitToken()));
+        }
+        String sshKeyEncrypted = null;
+        if (!isBlank(request.getGitSshKey())) {
+            sshKeyEncrypted = CryptoUtils.encrypt(request.getGitSshKey().trim());
+        }
+        String gitUsername = null;
+        if (request.getGitUsername() != null) {
+            gitUsername = trim(request.getGitUsername());
+        }
+        String gitAuthType = null;
+        if (request.getAuthType() != null) {
+            gitAuthType = resolveAuthType(request.getAuthType());
+        }
+        repositoryConfigService.updateGit(
+                id,
+                request.getName(),
+                request.getUrl(),
+                request.getBranch(),
+                gitAuthType,
+                tokenEncrypted,
+                sshKeyEncrypted,
+                request.isClearGitToken(),
+                request.isClearGitSshKey(),
+                request.getEnabled()
+        );
+        if (!isBlank(gitUsername)) {
+            final RepositoryConfig existing = repositoryConfigService.getById(id);
+            if (!existing.getSvnUsername().equals(gitUsername)) {
+                repositoryConfigService.update(id, null, null, gitUsername, null, false, null);
+            }
+        }
+        if (!isBlank(request.getProjectName())) {
+            final RepositoryConfig updated = repositoryConfigService.getById(id);
+            if (!trim(request.getProjectName()).equals(updated.getProjectName())) {
+                projectConfigService.ensureProject(request.getProjectName());
+                repositoryConfigService.updateProjectName(id, request.getProjectName());
+            }
+        }
+        LOGGER.info("更新 Git 预设: id={}", id);
+        return toManageItem(repositoryConfigService.getById(id));
+    }
+
+    public void delete(String id) {
+        repositoryConfigService.disable(id);
+        LOGGER.info("删除 Git 预设: id={}", id);
+    }
+
+    public void touchLastUsedAt(String id) {
+        repositoryConfigService.updateLastUsedAt(id);
+    }
+
+    // ========== 内部方法 ==========
+
+    private GitPreset toGitPreset(RepositoryConfig config) {
+        return new GitPreset(
+                config.getId(),
+                config.getName(),
+                config.getProjectName() == null ? "" : config.getProjectName(),
+                config.getSvnUrl() == null ? "" : config.getSvnUrl(),
+                config.getGitBranch() == null ? "" : config.getGitBranch(),
+                config.getGitAuthType() == null ? "" : config.getGitAuthType()
+        );
+    }
+
+    private GitPresetManageItem toManageItem(RepositoryConfig config) {
+        final boolean credentialsConfigured;
+        if (AUTH_TYPE_SSH_KEY.equals(config.getGitAuthType())) {
+            credentialsConfigured = !isBlank(config.getGitSshKeyEncrypted());
+        } else {
+            credentialsConfigured = !isBlank(config.getGitTokenEncrypted());
+        }
+        return new GitPresetManageItem(
+                config.getId(),
+                config.getName() == null ? "" : config.getName(),
+                config.getProjectName() == null ? "" : config.getProjectName(),
+                config.getSvnUrl() == null ? "" : config.getSvnUrl(),
+                config.getGitBranch() == null ? "" : config.getGitBranch(),
+                config.getGitAuthType() == null ? "" : config.getGitAuthType(),
+                config.getSvnUsername() == null ? "" : config.getSvnUsername(),
+                credentialsConfigured,
+                config.isEnabled(),
+                config.getCreatedAt(),
+                config.getLastUsedAt()
+        );
+    }
+
+    private String resolveAuthType(String authType) {
+        final String normalized = trim(authType);
+        if (AUTH_TYPE_SSH_KEY.equals(normalized)) {
+            return AUTH_TYPE_SSH_KEY;
+        }
+        return AUTH_TYPE_PASSWORD;
+    }
+
+    private static boolean isBlank(String value) {
+        return value == null || value.trim().isEmpty();
+    }
+
+    private static String trim(String value) {
+        return value == null ? "" : value.trim();
+    }
+}
diff --git a/src/main/java/com/svnlog/web/service/GitWorkflowService.java b/src/main/java/com/svnlog/web/service/GitWorkflowService.java
new file mode 100644
index 0000000..c721856
--- /dev/null
+++ b/src/main/java/com/svnlog/web/service/GitWorkflowService.java
@@ -0,0 +1,165 @@
+package com.svnlog.web.service;
+
+import java.nio.file.Path;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import com.svnlog.core.git.GitLogFetcher;
+import com.svnlog.core.range.DateRangeResolver;
+import com.svnlog.core.report.MarkdownReportWriter;
+import com.svnlog.core.svn.LogEntry;
+import com.svnlog.web.dto.GitConnectionRequest;
+import com.svnlog.web.dto.GitFetchRequest;
+import com.svnlog.web.dto.GitVersionRangeRequest;
+import com.svnlog.web.model.GitPreset;
+import com.svnlog.web.model.TaskResult;
+
+@Service
+public class GitWorkflowService {
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitWorkflowService.class);
+
+    private final OutputFileService outputFileService;
+    private final GitPresetService gitPresetService;
+
+    public GitWorkflowService(OutputFileService outputFileService,
+                              GitPresetService gitPresetService) {
+        this.outputFileService = outputFileService;
+        this.gitPresetService = gitPresetService;
+    }
+
+    public void testConnection(GitConnectionRequest request) throws Exception {
+        final GitLogFetcher fetcher = createFetcher(request.getPresetId());
+        fetcher.testConnection();
+        gitPresetService.touchLastUsedAt(request.getPresetId());
+    }
+
+    public GitLogFetcher.GitVersionRange getVersionRange(GitVersionRangeRequest request) throws Exception {
+        final GitLogFetcher fetcher = createFetcher(request.getPresetId());
+        final DateRangeResolver.DateRange dateRange = resolveDateRange(request);
+        final GitLogFetcher.GitVersionRange result = fetcher.getVersionRangeByTimeRange(
+                dateRange.getStartInclusive(),
+                dateRange.getEndExclusive()
+        );
+        if (result != null) {
+            gitPresetService.touchLastUsedAt(request.getPresetId());
+        }
+        return result;
+    }
+
+    public TaskResult fetchToMarkdown(GitFetchRequest request, TaskContext context) throws Exception {
+        final GitPreset preset = gitPresetService.getEnabledById(request.getPresetId());
+        context.setProgress(10, "正在连接 Git 仓库: " + preset.getName());
+        final GitLogFetcher fetcher = createFetcher(request.getPresetId());
+        fetcher.testConnection();
+        gitPresetService.touchLastUsedAt(request.getPresetId());
+
+        final DateRangeResolver.DateRange dateRange = resolveDateRange(request);
+        final String projectName = resolveReportProjectName(preset, request.getProjectName());
+
+        context.setProgress(30, "正在拉取 Git 日志");
+        final GitLogFetcher.GitVersionRange versionRange = fetcher.getVersionRangeByTimeRange(
+                dateRange.getStartInclusive(),
+                dateRange.getEndExclusive()
+        );
+        if (versionRange == null) {
+            context.setProgress(100, "该仓库在所选时间范围内无符合条件日志");
+            final TaskResult skipped = new TaskResult("未查询到符合条件的日志");
+            return skipped;
+        }
+
+        final List<LogEntry> logs = fetcher.fetchLogs(
+                dateRange.getStartInclusive(),
+                dateRange.getEndExclusive(),
+                safe(request.getFilterUser())
+        );
+        if (logs.isEmpty()) {
+            context.setProgress(100, "该仓库在所选时间范围内无符合条件日志");
+            final TaskResult skipped = new TaskResult("未查询到符合条件的日志");
+            return skipped;
+        }
+
+        context.setProgress(70, "正在生成 Markdown 文件");
+        final String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+        final String fileName = "md/git_log_" + sanitize(projectName) + "_" + timestamp + ".md";
+        final Path outputPath = outputFileService.resolveInOutput(fileName);
+
+        MarkdownReportWriter.writeGit(
+                outputPath,
+                projectName,
+                preset.getUrl(),
+                request.getFilterUser(),
+                versionRange.getCommitCount(),
+                versionRange.getStartCommit(),
+                versionRange.getEndCommit(),
+                logs,
+                fetcher,
+                new MarkdownReportWriter.Options()
+                        .includeAccount(false)
+                        .includeGeneratedTime(true)
+                        .includeStatistics(true)
+        );
+
+        context.setProgress(100, "Git 日志导出完成");
+        final TaskResult result = new TaskResult("成功导出 " + logs.size() + " 条日志");
+        result.addFile(fileName);
+        return result;
+    }
+
+    private GitLogFetcher createFetcher(String presetId) {
+        final GitPreset preset = gitPresetService.getEnabledById(presetId);
+        final GitPresetService.GitCredentials credentials = gitPresetService.resolveCredentials(presetId);
+        return new GitLogFetcher(
+                preset.getUrl(),
+                presetId,
+                preset.getBranch(),
+                preset.getAuthType(),
+                credentials.getUsername(),
+                credentials.getToken(),
+                credentials.getSshKey()
+        );
+    }
+
+    private DateRangeResolver.DateRange resolveDateRange(GitVersionRangeRequest request) {
+        return DateRangeResolver.resolve(
+                request.getRangeType(),
+                request.getDate(),
+                request.getWeek(),
+                request.getYear(),
+                request.getMonth()
+        );
+    }
+
+    private DateRangeResolver.DateRange resolveDateRange(GitFetchRequest request) {
+        return DateRangeResolver.resolve(
+                request.getRangeType(),
+                request.getDate(),
+                request.getWeek(),
+                request.getYear(),
+                request.getMonth()
+        );
+    }
+
+    /** 报告归属项目：预设项目字段优先，其次请求参数，最后仓库名 */
+    private String resolveReportProjectName(GitPreset preset, String requestProjectName) {
+        if (preset.getProjectName() != null && !preset.getProjectName().trim().isEmpty()) {
+            return preset.getProjectName().trim();
+        }
+        if (requestProjectName != null && !requestProjectName.trim().isEmpty()) {
+            return requestProjectName.trim();
+        }
+        return preset.getName();
+    }
+
+    private String sanitize(String value) {
+        return value.replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5_-]", "_");
+    }
+
+    private String safe(String value) {
+        return value == null ? "" : value;
+    }
+}
diff --git a/src/main/java/com/svnlog/web/service/ProjectConfigService.java b/src/main/java/com/svnlog/web/service/ProjectConfigService.java
new file mode 100644
index 0000000..81a04f7
--- /dev/null
+++ b/src/main/java/com/svnlog/web/service/ProjectConfigService.java
@@ -0,0 +1,353 @@
+package com.svnlog.web.service;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import com.svnlog.web.model.ProjectConfig;
+import com.svnlog.web.model.RepositoryConfig;
+
+@Service
+public class ProjectConfigService {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProjectConfigService.class);
+    private static final String CONFIG_FILE_NAME = "projects.json";
+    private static final String[] FIXED_PROJECTS = {
+            "PRS-7050场站智慧管控",
+            "PRS-7950在线巡视",
+            "PRS-7950在线巡视电科院测试版"
+    };
+
+    private final OutputFileService outputFileService;
+    private final RepositoryConfigService repositoryConfigService;
+    private final Gson gson;
+    private final List<ProjectConfig> projects;
+
+    public ProjectConfigService(OutputFileService outputFileService,
+                                RepositoryConfigService repositoryConfigService) {
+        this.outputFileService = outputFileService;
+        this.repositoryConfigService = repositoryConfigService;
+        this.gson = new GsonBuilder().setPrettyPrinting().create();
+        this.projects = new ArrayList<ProjectConfig>();
+    }
+
+    @PostConstruct
+    public void init() {
+        loadOrMigrate();
+    }
+
+    // ========== 查询 ==========
+
+    /** 项目列表（按 sortOrder 升序） */
+    public synchronized List<ProjectConfig> listProjects() {
+        final List<ProjectConfig> result = new ArrayList<ProjectConfig>(projects);
+        Collections.sort(result, new Comparator<ProjectConfig>() {
+            @Override
+            public int compare(ProjectConfig a, ProjectConfig b) {
+                return Integer.compare(a.getSortOrder(), b.getSortOrder());
+            }
+        });
+        return result;
+    }
+
+    /** 有序项目名列表（供 AI 分析/Excel 按项目顺序使用） */
+    public synchronized List<String> listProjectNames() {
+        final List<String> names = new ArrayList<String>();
+        for (ProjectConfig project : listProjects()) {
+            names.add(project.getName());
+        }
+        return names;
+    }
+
+    public synchronized ProjectConfig getById(String projectId) {
+        for (ProjectConfig project : projects) {
+            if (projectId != null && projectId.equals(project.getId())) {
+                return project;
+            }
+        }
+        throw new IllegalArgumentException("项目不存在: " + projectId);
+    }
+
+    public synchronized boolean containsName(String name) {
+        if (name == null || name.trim().isEmpty()) {
+            return false;
+        }
+        for (ProjectConfig project : projects) {
+            if (name.trim().equals(project.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /** 指定项目下的仓库列表（按创建时间升序） */
+    public synchronized List<RepositoryConfig> listReposOfProject(String projectName) {
+        final List<RepositoryConfig> result = new ArrayList<RepositoryConfig>();
+        for (RepositoryConfig config : repositoryConfigService.listAll()) {
+            if (projectName != null && projectName.equals(config.getProjectName())) {
+                result.add(config);
+            }
+        }
+        return result;
+    }
+
+    /** 未分配项目字段的仓库列表 */
+    public synchronized List<RepositoryConfig> listUnassignedRepos() {
+        final List<RepositoryConfig> result = new ArrayList<RepositoryConfig>();
+        for (RepositoryConfig config : repositoryConfigService.listAll()) {
+            if (config.getProjectName() == null || config.getProjectName().trim().isEmpty()) {
+                result.add(config);
+            }
+        }
+        return result;
+    }
+
+    // ========== 管理操作 ==========
+
+    /** 确保项目存在：已存在直接返回，否则创建（创建预设时自动注册） */
+    public synchronized ProjectConfig ensureProject(String name) {
+        final String trimmed = trim(name);
+        if (trimmed.isEmpty()) {
+            throw new IllegalArgumentException("项目名称不能为空");
+        }
+        for (ProjectConfig project : projects) {
+            if (trimmed.equals(project.getName())) {
+                return project;
+            }
+        }
+        return create(trimmed);
+    }
+
+    /** 创建项目（名称必填且不重复） */
+    public synchronized ProjectConfig create(String name) {
+        final String trimmed = trim(name);
+        if (trimmed.isEmpty()) {
+            throw new IllegalArgumentException("项目名称不能为空");
+        }
+        if (containsName(trimmed)) {
+            throw new IllegalArgumentException("项目已存在: " + trimmed);
+        }
+        final ProjectConfig project = new ProjectConfig();
+        project.setName(trimmed);
+        project.setSortOrder(nextSortOrder());
+        persistAndSwap(projectsWith(project));
+        LOGGER.info("新建项目: id={} name={}", project.getId(), project.getName());
+        return project;
+    }
+
+    /** 重命名项目（同步该项目下所有仓库的 projectName） */
+    public synchronized ProjectConfig rename(String id, String name) {
+        final String trimmed = trim(name);
+        if (trimmed.isEmpty()) {
+            throw new IllegalArgumentException("项目名称不能为空");
+        }
+        final ProjectConfig existing = getById(id);
+        if (trimmed.equals(existing.getName())) {
+            return existing;
+        }
+        if (containsName(trimmed)) {
+            throw new IllegalArgumentException("项目已存在: " + trimmed);
+        }
+        final ProjectConfig copy = copy(existing);
+        copy.setName(trimmed);
+        persistAndSwap(replaceInList(projects, id, copy));
+        // 同步仓库归属
+        for (RepositoryConfig config : repositoryConfigService.listAll()) {
+            if (existing.getName().equals(config.getProjectName())) {
+                repositoryConfigService.updateProjectName(config.getId(), trimmed);
+            }
+        }
+        LOGGER.info("重命名项目: id={} {} -> {}", id, existing.getName(), trimmed);
+        return copy;
+    }
+
+    /** 删除项目（非空项目禁止删除） */
+    public synchronized void delete(String id) {
+        final ProjectConfig existing = getById(id);
+        final List<RepositoryConfig> repos = listReposOfProject(existing.getName());
+        if (!repos.isEmpty()) {
+            throw new IllegalArgumentException("项目下仍有 " + repos.size() + " 个仓库，请先移出后再删除");
+        }
+        final List<ProjectConfig> newList = new ArrayList<ProjectConfig>();
+        for (ProjectConfig project : projects) {
+            if (!id.equals(project.getId())) {
+                newList.add(project);
+            }
+        }
+        // 删除后重新编号，保持连续
+        int order = 0;
+        for (ProjectConfig project : newList) {
+            project.setSortOrder(order++);
+        }
+        persistAndSwap(newList);
+        LOGGER.info("删除项目: id={} name={}", id, existing.getName());
+    }
+
+    /** 项目排序（direction: up/down） */
+    public synchronized List<ProjectConfig> move(String id, String direction) {
+        final List<ProjectConfig> sorted = listProjects();
+        int index = -1;
+        for (int i = 0; i < sorted.size(); i++) {
+            if (id.equals(sorted.get(i).getId())) {
+                index = i;
+                break;
+            }
+        }
+        if (index < 0) {
+            throw new IllegalArgumentException("项目不存在: " + id);
+        }
+        final int target;
+        if ("up".equals(direction)) {
+            target = index - 1;
+        } else if ("down".equals(direction)) {
+            target = index + 1;
+        } else {
+            throw new IllegalArgumentException("排序方向无效: " + direction);
+        }
+        if (target < 0 || target >= sorted.size()) {
+            return sorted;
+        }
+        Collections.swap(sorted, index, target);
+        for (int i = 0; i < sorted.size(); i++) {
+            sorted.get(i).setSortOrder(i);
+        }
+        persistAndSwap(sorted);
+        return listProjects();
+    }
+
+    /** 分配仓库到项目（projectId 为空表示移出为未分配；本项目规定必须分配，故空值拒绝） */
+    public synchronized void assign(String repoId, String projectId) {
+        final RepositoryConfig config = repositoryConfigService.getById(repoId);
+        if (projectId == null || projectId.trim().isEmpty()) {
+            throw new IllegalArgumentException("仓库必须分配到项目");
+        }
+        final ProjectConfig project = getById(projectId);
+        repositoryConfigService.updateProjectName(repoId, project.getName());
+        LOGGER.info("分配仓库到项目: repoId={} repoName={} projectId={} projectName={}",
+                repoId, config.getName(), projectId, project.getName());
+    }
+
+    // ========== 内部方法 ==========
+
+    private int nextSortOrder() {
+        int max = -1;
+        for (ProjectConfig project : projects) {
+            if (project.getSortOrder() > max) {
+                max = project.getSortOrder();
+            }
+        }
+        return max + 1;
+    }
+
+    private List<ProjectConfig> projectsWith(ProjectConfig project) {
+        final List<ProjectConfig> newList = new ArrayList<ProjectConfig>(projects);
+        newList.add(project);
+        return newList;
+    }
+
+    private static List<ProjectConfig> replaceInList(List<ProjectConfig> source, String id, ProjectConfig replacement) {
+        final List<ProjectConfig> newList = new ArrayList<ProjectConfig>(source.size());
+        for (ProjectConfig project : source) {
+            if (id != null && id.equals(project.getId())) {
+                newList.add(replacement);
+            } else {
+                newList.add(project);
+            }
+        }
+        return newList;
+    }
+
+    private static ProjectConfig copy(ProjectConfig source) {
+        final ProjectConfig copy = new ProjectConfig();
+        copy.setId(source.getId());
+        copy.setName(source.getName());
+        copy.setSortOrder(source.getSortOrder());
+        copy.setCreatedAt(source.getCreatedAt());
+        return copy;
+    }
+
+    private void persistAndSwap(List<ProjectConfig> newList) {
+        try {
+            final Path configFile = outputFileService.resolveInOutput(CONFIG_FILE_NAME);
+            Files.createDirectories(configFile.getParent());
+            Files.write(configFile, gson.toJson(newList).getBytes(StandardCharsets.UTF_8));
+            projects.clear();
+            projects.addAll(newList);
+        } catch (IOException e) {
+            throw new IllegalStateException("保存项目配置失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 加载 projects.json；不存在时从现有仓库的 projectName 去重自动迁移生成
+     * （固定 3 个 SVN 项目顺序优先，其余按仓库创建顺序追加）。
+     */
+    private synchronized void loadOrMigrate() {
+        try {
+            final Path configFile = outputFileService.resolveInOutput(CONFIG_FILE_NAME);
+            if (Files.exists(configFile) && Files.isRegularFile(configFile)) {
+                final String json = new String(Files.readAllBytes(configFile), StandardCharsets.UTF_8);
+                final List<ProjectConfig> loaded = gson.fromJson(
+                        json,
+                        new TypeToken<List<ProjectConfig>>() { }.getType()
+                );
+                projects.clear();
+                if (loaded != null) {
+                    projects.addAll(loaded);
+                }
+                LOGGER.info("加载项目配置: {} 条", projects.size());
+                return;
+            }
+            migrateFromRepositories();
+        } catch (Exception e) {
+            LOGGER.warn("加载项目配置失败，尝试从仓库迁移", e);
+            migrateFromRepositories();
+        }
+    }
+
+    private void migrateFromRepositories() {
+        LOGGER.info("项目配置文件不存在，从仓库配置迁移生成");
+        final LinkedHashSet<String> names = new LinkedHashSet<String>();
+        for (String fixed : FIXED_PROJECTS) {
+            names.add(fixed);
+        }
+        for (RepositoryConfig config : repositoryConfigService.listAll()) {
+            final String projectName = config.getProjectName();
+            if (projectName != null && !projectName.trim().isEmpty()) {
+                names.add(projectName.trim());
+            }
+        }
+        final List<ProjectConfig> migrated = new ArrayList<ProjectConfig>();
+        int order = 0;
+        for (String name : names) {
+            final ProjectConfig project = new ProjectConfig();
+            project.setName(name);
+            project.setSortOrder(order++);
+            migrated.add(project);
+        }
+        if (migrated.isEmpty()) {
+            LOGGER.info("无仓库配置，跳过项目迁移");
+            return;
+        }
+        persistAndSwap(migrated);
+        LOGGER.info("项目迁移完成: {} 个", migrated.size());
+    }
+
+    private static String trim(String value) {
+        return value == null ? "" : value.trim();
+    }
+}
diff --git a/src/main/java/com/svnlog/web/service/RepositoryConfigService.java b/src/main/java/com/svnlog/web/service/RepositoryConfigService.java
index 625757c..d0056c6 100644
--- a/src/main/java/com/svnlog/web/service/RepositoryConfigService.java
+++ b/src/main/java/com/svnlog/web/service/RepositoryConfigService.java
@@ -126,6 +126,67 @@ public class RepositoryConfigService {
         LOGGER.info("更新仓库配置: id={} name={}", id, name);
     }
 
+    /** 更新仓库配置的 projectName（项目必填，不允许清空） */
+    public synchronized void updateProjectName(String id, String projectName) {
+        final RepositoryConfig existing = getById(id);
+        if (projectName == null || projectName.trim().isEmpty()) {
+            throw new IllegalArgumentException("项目不能为空");
+        }
+        final RepositoryConfig copy = gson.fromJson(gson.toJson(existing), RepositoryConfig.class);
+        copy.setProjectName(projectName.trim());
+        final List<RepositoryConfig> newList = replaceInList(configs, id, copy);
+        persistAndSwap(newList);
+        LOGGER.info("更新仓库项目: id={} projectName={}", id, projectName.trim());
+    }
+
+    /**
+     * 更新 Git 类型仓库配置的字段。token/私钥为空表示不覆盖。
+     */
+    public synchronized void updateGit(String id,
+                                       String name,
+                                       String url,
+                                       String gitBranch,
+                                       String gitAuthType,
+                                       String gitTokenEncrypted,
+                                       String gitSshKeyEncrypted,
+                                       boolean clearGitToken,
+                                       boolean clearGitSshKey,
+                                       Boolean enabled) {
+        final RepositoryConfig existing = getById(id);
+        final RepositoryConfig copy = gson.fromJson(gson.toJson(existing), RepositoryConfig.class);
+        if (name != null && !name.trim().isEmpty()) {
+            copy.setName(name.trim());
+        }
+        if (url != null && !url.trim().isEmpty()) {
+            copy.setSvnUrl(url.trim());
+        }
+        if (gitBranch != null) {
+            copy.setGitBranch(gitBranch.trim());
+        }
+        if (gitBranch != null) {
+            copy.setGitBranch(gitBranch.trim());
+        }
+        if (gitAuthType != null) {
+            copy.setGitAuthType(gitAuthType.trim());
+        }
+        if (clearGitToken) {
+            copy.setGitTokenEncrypted("");
+        } else if (gitTokenEncrypted != null && !gitTokenEncrypted.isEmpty()) {
+            copy.setGitTokenEncrypted(gitTokenEncrypted);
+        }
+        if (clearGitSshKey) {
+            copy.setGitSshKeyEncrypted("");
+        } else if (gitSshKeyEncrypted != null && !gitSshKeyEncrypted.isEmpty()) {
+            copy.setGitSshKeyEncrypted(gitSshKeyEncrypted);
+        }
+        if (enabled != null) {
+            copy.setEnabled(enabled.booleanValue());
+        }
+        final List<RepositoryConfig> newList = replaceInList(configs, id, copy);
+        persistAndSwap(newList);
+        LOGGER.info("更新 Git 仓库配置: id={} name={}", id, name);
+    }
+
     /**
      * 软删除：设置 enabled=false
      */
@@ -212,7 +273,13 @@ public class RepositoryConfigService {
             );
             configs.clear();
             if (loaded != null) {
-                configs.addAll(loaded);
+                for (RepositoryConfig config : loaded) {
+                    // 兼容迁移：projectName 为空时默认使用仓库名，保证旧预设行为不变
+                    if (isBlank(config.getProjectName())) {
+                        config.setProjectName(config.getName() == null ? "" : config.getName().trim());
+                    }
+                    configs.add(config);
+                }
             }
             LOGGER.info("加载仓库配置: {} 条", configs.size());
         } catch (Exception e) {
diff --git a/src/main/java/com/svnlog/web/service/SvnPresetService.java b/src/main/java/com/svnlog/web/service/SvnPresetService.java
index 6207dee..e6fb949 100644
--- a/src/main/java/com/svnlog/web/service/SvnPresetService.java
+++ b/src/main/java/com/svnlog/web/service/SvnPresetService.java
@@ -20,9 +20,12 @@ public class SvnPresetService {
     private static final Logger LOGGER = LoggerFactory.getLogger(SvnPresetService.class);
 
     private final RepositoryConfigService repositoryConfigService;
+    private final ProjectConfigService projectConfigService;
 
-    public SvnPresetService(RepositoryConfigService repositoryConfigService) {
+    public SvnPresetService(RepositoryConfigService repositoryConfigService,
+                            ProjectConfigService projectConfigService) {
         this.repositoryConfigService = repositoryConfigService;
+        this.projectConfigService = projectConfigService;
     }
 
     // ========== 只读接口（供现有抓取页/设置页使用，只允许 enabled 预设） ==========
@@ -68,6 +71,9 @@ public class SvnPresetService {
         if (!config.isEnabled()) {
             throw new IllegalArgumentException("仓库已停用: " + presetId);
         }
+        if (!config.isSvn()) {
+            throw new IllegalArgumentException("仓库类型不是 SVN: " + presetId);
+        }
         return toSvnPreset(config);
     }
 
@@ -108,11 +114,15 @@ public class SvnPresetService {
         final List<RepositoryConfig> configs = repositoryConfigService.listManage();
         final List<SvnPresetManageItem> items = new ArrayList<SvnPresetManageItem>();
         for (RepositoryConfig config : configs) {
+            if (!config.isSvn()) {
+                continue;
+            }
             final boolean credsConfigured = !isBlank(config.getSvnUsername())
                     && !isBlank(config.getSvnPasswordEncrypted());
             items.add(new SvnPresetManageItem(
                     config.getId(),
                     config.getName() == null ? "" : config.getName(),
+                    config.getProjectName() == null ? "" : config.getProjectName(),
                     config.getSvnUrl() == null ? "" : config.getSvnUrl(),
                     config.getSvnUsername() == null ? "" : config.getSvnUsername(),
                     credsConfigured,
@@ -129,6 +139,11 @@ public class SvnPresetService {
         final RepositoryConfig config = new RepositoryConfig();
         config.setType("SVN");
         config.setName(trim(request.getName()));
+        // 兼容旧调用：项目字段为空时回退为仓库名（控制器 @NotBlank 已强制必填）
+        final String projectName = isBlank(request.getProjectName())
+                ? config.getName() : trim(request.getProjectName());
+        projectConfigService.ensureProject(projectName);
+        config.setProjectName(projectName);
         config.setSvnUrl(trim(request.getUrl()));
         config.setEnabled(request.isEnabled());
         config.setSvnUsername(trim(request.getSvnUsername()));
@@ -149,6 +164,9 @@ public class SvnPresetService {
         if (request.getUrl() != null && isBlank(request.getUrl())) {
             throw new IllegalArgumentException("SVN URL 不能为空");
         }
+        if (request.getProjectName() != null && isBlank(request.getProjectName())) {
+            throw new IllegalArgumentException("项目不能为空");
+        }
         String encryptedPassword = null;
         if (!isBlank(request.getSvnPassword())) {
             encryptedPassword = CryptoUtils.encrypt(trim(request.getSvnPassword()));
@@ -166,6 +184,13 @@ public class SvnPresetService {
                 request.isClearSvnPassword(),
                 request.getEnabled()
         );
+        if (!isBlank(request.getProjectName())) {
+            final RepositoryConfig updated = repositoryConfigService.getById(id);
+            if (!trim(request.getProjectName()).equals(updated.getProjectName())) {
+                projectConfigService.ensureProject(request.getProjectName());
+                repositoryConfigService.updateProjectName(id, request.getProjectName());
+            }
+        }
         LOGGER.info("更新 SVN 预设: id={}", id);
         return toManageItem(repositoryConfigService.getById(id));
     }
@@ -191,6 +216,7 @@ public class SvnPresetService {
         return new SvnPreset(
                 config.getId(),
                 config.getName(),
+                config.getProjectName() == null ? "" : config.getProjectName(),
                 config.getSvnUrl() == null ? "" : config.getSvnUrl()
         );
     }
@@ -201,6 +227,7 @@ public class SvnPresetService {
         return new SvnPresetManageItem(
                 config.getId(),
                 config.getName() == null ? "" : config.getName(),
+                config.getProjectName() == null ? "" : config.getProjectName(),
                 config.getSvnUrl() == null ? "" : config.getSvnUrl(),
                 config.getSvnUsername() == null ? "" : config.getSvnUsername(),
                 credsConfigured,
diff --git a/src/main/java/com/svnlog/web/service/SvnWorkflowService.java b/src/main/java/com/svnlog/web/service/SvnWorkflowService.java
index 13576d0..24a8b3c 100644
--- a/src/main/java/com/svnlog/web/service/SvnWorkflowService.java
+++ b/src/main/java/com/svnlog/web/service/SvnWorkflowService.java
@@ -2,17 +2,13 @@ package com.svnlog.web.service;
 
 import java.nio.file.Path;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
-import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.springframework.stereotype.Service;
 import org.tmatesoft.svn.core.SVNException;
 
+import com.svnlog.core.range.DateRangeResolver;
 import com.svnlog.core.report.MarkdownReportWriter;
 import com.svnlog.core.svn.LogEntry;
 import com.svnlog.core.svn.SVNLogFetcher;
@@ -24,10 +20,6 @@ import com.svnlog.web.model.TaskResult;
 
 @Service
 public class SvnWorkflowService {
-    private static final TimeZone RANGE_TIME_ZONE = TimeZone.getTimeZone("Asia/Shanghai");
-    private static final Pattern DATE_PATTERN = Pattern.compile("^(\\d{4})-(\\d{2})-(\\d{2})$");
-    private static final Pattern WEEK_PATTERN = Pattern.compile("^(\\d{4})-W(\\d{2})$");
-
     private final OutputFileService outputFileService;
     private final SettingsService settingsService;
     private final SvnPresetService svnPresetService;
@@ -68,12 +60,12 @@ public class SvnWorkflowService {
                 credentials.getUsername(),
                 credentials.getPassword()
         );
-        final DateRange dateRange = resolveDateRange(request);
+        final DateRangeResolver.DateRange dateRange = resolveDateRange(request);
         final long[] result = fetcher.getVersionRangeByTimeRange(
-                dateRange.startInclusive,
-                dateRange.endExclusive,
+                dateRange.getStartInclusive(),
+                dateRange.getEndExclusive(),
                 request.getClientTraceId(),
-                dateRange.rangeType
+                dateRange.getRangeType()
         );
         if (result != null) {
             svnPresetService.touchLastUsedAt(request.getPresetId());
@@ -104,13 +96,13 @@ public class SvnWorkflowService {
 
         final List<LogEntry> logs = fetcher.fetchLogs(start, end, safe(request.getFilterUser()));
         if (logs.isEmpty()) {
-            throw new IllegalStateException("未查询到符合条件的日志");
+            context.setProgress(100, "该仓库在所选时间范围内无符合条件日志");
+            final TaskResult skipped = new TaskResult("未查询到符合条件的日志");
+            return skipped;
         }
 
         context.setProgress(70, "正在生成 Markdown 文件");
-        final String projectName = request.getProjectName() != null && !request.getProjectName().trim().isEmpty()
-                ? request.getProjectName().trim()
-                : preset.getName();
+        final String projectName = resolveReportProjectName(preset, request.getProjectName());
         final String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
         final String fileName = "md/svn_log_" + sanitize(projectName) + "_" + timestamp + ".md";
         final Path outputPath = outputFileService.resolveInOutput(fileName);
@@ -144,94 +136,24 @@ public class SvnWorkflowService {
         return value == null ? "" : value;
     }
 
-    private DateRange resolveDateRange(SvnVersionRangeRequest request) {
-        final String rangeType = safe(request.getRangeType()).trim();
-        if ("date".equals(rangeType)) {
-            return resolveDateRangeByDate(request.getDate());
-        }
-        if ("week".equals(rangeType)) {
-            return resolveDateRangeByWeek(request.getWeek());
-        }
-        return resolveDateRangeByMonth(request.getYear(), request.getMonth());
-    }
-
-    private DateRange resolveDateRangeByDate(String value) {
-        final Matcher matcher = DATE_PATTERN.matcher(safe(value).trim());
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("日期格式错误，应为 yyyy-MM-dd");
-        }
-        final Calendar start = newCalendar();
-        start.set(
-                parseNumber(matcher.group(1), "年份"),
-                parseNumber(matcher.group(2), "月份") - 1,
-                parseNumber(matcher.group(3), "日期"),
-                0,
-                0,
-                0
+    private DateRangeResolver.DateRange resolveDateRange(SvnVersionRangeRequest request) {
+        return DateRangeResolver.resolve(
+                request.getRangeType(),
+                request.getDate(),
+                request.getWeek(),
+                request.getYear(),
+                request.getMonth()
         );
-        start.set(Calendar.MILLISECOND, 0);
-        final Calendar end = (Calendar) start.clone();
-        end.add(Calendar.DATE, 1);
-        return new DateRange("date", start.getTime(), end.getTime());
     }
 
-    private DateRange resolveDateRangeByWeek(String value) {
-        final Matcher matcher = WEEK_PATTERN.matcher(safe(value).trim());
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("周格式错误，应为 yyyy-Www");
+    /** 报告归属项目：预设项目字段优先，其次请求参数，最后仓库名 */
+    private String resolveReportProjectName(SvnPreset preset, String requestProjectName) {
+        if (preset.getProjectName() != null && !preset.getProjectName().trim().isEmpty()) {
+            return preset.getProjectName().trim();
         }
-        final int year = parseNumber(matcher.group(1), "年份");
-        final int week = parseNumber(matcher.group(2), "周");
-        final GregorianCalendar start = new GregorianCalendar(RANGE_TIME_ZONE);
-        start.clear();
-        start.setFirstDayOfWeek(Calendar.MONDAY);
-        start.setMinimalDaysInFirstWeek(4);
-        start.setWeekDate(year, week, Calendar.MONDAY);
-        start.set(Calendar.HOUR_OF_DAY, 0);
-        start.set(Calendar.MINUTE, 0);
-        start.set(Calendar.SECOND, 0);
-        start.set(Calendar.MILLISECOND, 0);
-        final Calendar end = (Calendar) start.clone();
-        end.add(Calendar.DATE, 7);
-        return new DateRange("week", start.getTime(), end.getTime());
-    }
-
-    private DateRange resolveDateRangeByMonth(Integer yearValue, Integer monthValue) {
-        if (yearValue == null || monthValue == null) {
-            throw new IllegalArgumentException("月份范围缺少 year 或 month 参数");
-        }
-        final Calendar start = newCalendar();
-        start.set(yearValue.intValue(), monthValue.intValue() - 1, 1, 0, 0, 0);
-        start.set(Calendar.MILLISECOND, 0);
-        final Calendar end = (Calendar) start.clone();
-        end.add(Calendar.MONTH, 1);
-        return new DateRange("month", start.getTime(), end.getTime());
-    }
-
-    private Calendar newCalendar() {
-        final Calendar calendar = Calendar.getInstance(RANGE_TIME_ZONE);
-        calendar.setFirstDayOfWeek(Calendar.MONDAY);
-        calendar.setMinimalDaysInFirstWeek(4);
-        return calendar;
-    }
-
-    private int parseNumber(String value, String fieldName) {
-        try {
-            return Integer.parseInt(value);
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException(fieldName + "格式错误", e);
-        }
-    }
-
-    private static class DateRange {
-        private final String rangeType;
-        private final Date startInclusive;
-        private final Date endExclusive;
-
-        private DateRange(String rangeType, Date startInclusive, Date endExclusive) {
-            this.rangeType = rangeType;
-            this.startInclusive = startInclusive;
-            this.endExclusive = endExclusive;
+        if (requestProjectName != null && !requestProjectName.trim().isEmpty()) {
+            return requestProjectName.trim();
         }
+        return preset.getName();
     }
 }
diff --git a/src/test/java/com/svnlog/core/git/GitLogFetcherTest.java b/src/test/java/com/svnlog/core/git/GitLogFetcherTest.java
new file mode 100644
index 0000000..fe08fb7
--- /dev/null
+++ b/src/test/java/com/svnlog/core/git/GitLogFetcherTest.java
@@ -0,0 +1,233 @@
+package com.svnlog.core.git;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.CommitBuilder;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import com.svnlog.core.svn.LogEntry;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class GitLogFetcherTest {
+
+    private static final TimeZone TEST_TIME_ZONE = TimeZone.getTimeZone("Asia/Shanghai");
+
+    @TempDir
+    Path cacheRoot;
+
+    private Path sourceRepoDir;
+    private String presetId;
+
+    @BeforeEach
+    void setUp() throws Exception {
+        sourceRepoDir = Files.createTempDirectory("gitlog-fetcher-source-");
+        System.setProperty("java.io.tmpdir", cacheRoot.toString());
+        presetId = "preset-" + System.nanoTime();
+        buildSourceRepo();
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        deleteRecursively(sourceRepoDir);
+    }
+
+    private void buildSourceRepo() throws Exception {
+        final Git git = Git.init().setDirectory(sourceRepoDir.toFile()).call();
+        try {
+            commit(git, "feat: add a.txt", "alice", millis(2026, 1, 5), "a.txt", "alpha v1\n");
+            Files.write(sourceRepoDir.resolve("a.txt"), "alpha v1\nbeta v2\n".getBytes(StandardCharsets.UTF_8));
+            commit(git, "fix: update a.txt and add b.txt", "bob", millis(2026, 1, 10), "b.txt", "beta\n");
+            commit(git, "feat: add c.txt", "alice", millis(2026, 2, 15), "c.txt", "gamma\n");
+        } finally {
+            git.close();
+        }
+    }
+
+    private static long millis(int year, int month, int day) {
+        final Calendar calendar = Calendar.getInstance(TEST_TIME_ZONE);
+        calendar.clear();
+        calendar.set(year, month - 1, day, 12, 0, 0);
+        return calendar.getTimeInMillis();
+    }
+
+    /** 在指定时间提交文件，保证提交时间精确可控 */
+    private static void commit(Git git,
+                               String message,
+                               String author,
+                               long timestamp,
+                               String fileName,
+                               String content) throws Exception {
+        final Repository repository = git.getRepository();
+        final Path workTree = repository.getWorkTree().toPath();
+        final Path target = workTree.resolve(fileName);
+        final String existing = Files.exists(target)
+                ? new String(Files.readAllBytes(target), StandardCharsets.UTF_8) : "";
+        Files.write(target, (existing + content).getBytes(StandardCharsets.UTF_8));
+        git.add().addFilepattern(".").call();
+        final ObjectId treeId;
+        try (ObjectInserter inserter = repository.newObjectInserter()) {
+            treeId = repository.readDirCache().writeTree(inserter);
+        }
+
+        final PersonIdent ident = new PersonIdent(author, author + "@test.local",
+                new Date(timestamp), TEST_TIME_ZONE);
+        final CommitBuilder builder = new CommitBuilder();
+        builder.setTreeId(treeId);
+        builder.setMessage(message);
+        builder.setAuthor(ident);
+        builder.setCommitter(ident);
+        final ObjectId parentId = repository.resolve("HEAD^{commit}");
+        if (parentId != null) {
+            builder.setParentId(parentId);
+        }
+        try (ObjectInserter inserter = repository.newObjectInserter()) {
+            final ObjectId commitId = inserter.insert(builder);
+            inserter.flush();
+            final RefUpdate refUpdate = repository.updateRef("refs/heads/master");
+            refUpdate.setNewObjectId(commitId);
+            refUpdate.forceUpdate();
+        }
+    }
+
+    private GitLogFetcher newFetcher(String branch) {
+        return new GitLogFetcher(
+                sourceRepoDir.toUri().toString(),
+                presetId,
+                branch,
+                "PASSWORD",
+                "",
+                "",
+                ""
+        );
+    }
+
+    @Test
+    void shouldReturnCommitCountAndBoundaryHashesForTimeRange() throws Exception {
+        final GitLogFetcher fetcher = newFetcher("master");
+        final GitLogFetcher.GitVersionRange range = fetcher.getVersionRangeByTimeRange(
+                new Date(millis(2026, 1, 1)), new Date(millis(2026, 2, 1)));
+
+        assertNotNull(range);
+        assertEquals(2, range.getCommitCount());
+        assertEquals(findCommitHash(1), range.getStartCommit());
+        assertEquals(findCommitHash(2), range.getEndCommit());
+    }
+
+    @Test
+    void shouldReturnNullWhenNoCommitInRange() throws Exception {
+        final GitLogFetcher fetcher = newFetcher("master");
+        final GitLogFetcher.GitVersionRange range = fetcher.getVersionRangeByTimeRange(
+                new Date(millis(2026, 3, 1)), new Date(millis(2026, 4, 1)));
+        assertNull(range);
+    }
+
+    @Test
+    void shouldFetchLogsSortedByTimeDescWithChangedPaths() throws Exception {
+        final GitLogFetcher fetcher = newFetcher("master");
+        final List<LogEntry> logs = fetcher.fetchLogs(
+                new Date(millis(2026, 1, 1)), new Date(millis(2026, 2, 1)), null);
+
+        assertEquals(2, logs.size());
+        assertEquals("bob", logs.get(0).getAuthor());
+        assertNotNull(logs.get(0).getCommitHash());
+        assertTrue(logs.get(0).getChangedPaths().length >= 2);
+        assertEquals("alice", logs.get(1).getAuthor());
+    }
+
+    @Test
+    void shouldFilterByAuthorIgnoreCase() throws Exception {
+        final GitLogFetcher fetcher = newFetcher("master");
+        final List<LogEntry> logs = fetcher.fetchLogs(
+                new Date(millis(2026, 1, 1)), new Date(millis(2026, 2, 1)), "BOB");
+
+        assertEquals(1, logs.size());
+        assertEquals("bob", logs.get(0).getAuthor());
+    }
+
+    @Test
+    void shouldResolveDefaultBranchWhenEmpty() throws Exception {
+        final GitLogFetcher fetcher = newFetcher("");
+        final GitLogFetcher.GitVersionRange range = fetcher.getVersionRangeByTimeRange(
+                new Date(millis(2026, 1, 1)), new Date(millis(2026, 2, 1)));
+        assertNotNull(range);
+        assertEquals(2, range.getCommitCount());
+    }
+
+    @Test
+    void shouldReuseCacheOnSecondCall() throws Exception {
+        final GitLogFetcher fetcher = newFetcher("master");
+        fetcher.getVersionRangeByTimeRange(
+                new Date(millis(2026, 1, 1)), new Date(millis(2026, 2, 1)));
+        final GitLogFetcher.GitVersionRange second = fetcher.getVersionRangeByTimeRange(
+                new Date(millis(2026, 1, 1)), new Date(millis(2026, 2, 1)));
+        assertNotNull(second);
+        assertEquals(2, second.getCommitCount());
+    }
+
+    @Test
+    void shouldShortenHashToSevenChars() {
+        assertEquals("0123456", GitLogFetcher.shortHash("0123456789abcdef"));
+        assertEquals("abc", GitLogFetcher.shortHash("abc"));
+        assertEquals("", GitLogFetcher.shortHash(null));
+    }
+
+    private String findCommitHash(int index) throws Exception {
+        final Git git = Git.open(sourceRepoDir.toFile());
+        try {
+            final List<RevCommit> commits = new ArrayList<RevCommit>();
+            final RevWalk walk = new RevWalk(git.getRepository());
+            try {
+                walk.markStart(walk.parseCommit(git.getRepository().resolve("refs/heads/master")));
+                for (RevCommit commit : walk) {
+                    commits.add(commit);
+                }
+            } finally {
+                walk.close();
+            }
+            assertTrue(commits.size() >= 2);
+            return commits.get(commits.size() - index).getName();
+        } finally {
+            git.close();
+        }
+    }
+
+    private static void deleteRecursively(Path path) throws Exception {
+        if (path == null || !Files.exists(path)) {
+            return;
+        }
+        if (Files.isDirectory(path)) {
+            Files.walk(path)
+                    .sorted(java.util.Comparator.reverseOrder())
+                    .forEach(p -> {
+                        try {
+                            Files.deleteIfExists(p);
+                        } catch (Exception ignored) {
+                        }
+                    });
+        } else {
+            Files.deleteIfExists(path);
+        }
+    }
+}
diff --git a/src/test/java/com/svnlog/core/range/DateRangeResolverTest.java b/src/test/java/com/svnlog/core/range/DateRangeResolverTest.java
new file mode 100644
index 0000000..07fc0d6
--- /dev/null
+++ b/src/test/java/com/svnlog/core/range/DateRangeResolverTest.java
@@ -0,0 +1,76 @@
+package com.svnlog.core.range;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class DateRangeResolverTest {
+
+    private static final TimeZone TEST_TIME_ZONE = TimeZone.getTimeZone("Asia/Shanghai");
+
+    @Test
+    void shouldResolveMonthRangeInclusiveExclusive() {
+        final DateRangeResolver.DateRange range = DateRangeResolver.resolve("month", null, null, 2026, 3);
+        assertEquals("2026-03-01 00:00:00", format(range.getStartInclusive()));
+        assertEquals("2026-04-01 00:00:00", format(range.getEndExclusive()));
+        assertEquals("month", range.getRangeType());
+    }
+
+    @Test
+    void shouldResolveDateRangeForSingleDay() {
+        final DateRangeResolver.DateRange range = DateRangeResolver.resolve("date", "2026-03-15", null, null, null);
+        assertEquals("2026-03-15 00:00:00", format(range.getStartInclusive()));
+        assertEquals("2026-03-16 00:00:00", format(range.getEndExclusive()));
+        assertEquals("date", range.getRangeType());
+    }
+
+    @Test
+    void shouldResolveWeekRangeFromMonday() {
+        final DateRangeResolver.DateRange range = DateRangeResolver.resolve("week", null, "2026-W12", null, null);
+        final Calendar start = Calendar.getInstance(TEST_TIME_ZONE);
+        start.setTime(range.getStartInclusive());
+        assertEquals(Calendar.MONDAY, start.get(Calendar.DAY_OF_WEEK));
+        assertEquals(7 * 24 * 3600 * 1000L, range.getEndExclusive().getTime() - range.getStartInclusive().getTime());
+        assertEquals("week", range.getRangeType());
+    }
+
+    @Test
+    void shouldThrowOnInvalidDateFormat() {
+        final IllegalArgumentException error = assertThrows(IllegalArgumentException.class,
+                () -> DateRangeResolver.resolve("date", "2026/03/15", null, null, null));
+        assertEquals("日期格式错误，应为 yyyy-MM-dd", error.getMessage());
+    }
+
+    @Test
+    void shouldThrowOnInvalidWeekFormat() {
+        final IllegalArgumentException error = assertThrows(IllegalArgumentException.class,
+                () -> DateRangeResolver.resolve("week", null, "2026-13", null, null));
+        assertEquals("周格式错误，应为 yyyy-Www", error.getMessage());
+    }
+
+    @Test
+    void shouldThrowWhenMonthParamsMissing() {
+        final IllegalArgumentException error = assertThrows(IllegalArgumentException.class,
+                () -> DateRangeResolver.resolve("month", null, null, null, null));
+        assertEquals("月份范围缺少 year 或 month 参数", error.getMessage());
+    }
+
+    @Test
+    void shouldDefaultToMonthWhenRangeTypeEmpty() {
+        final DateRangeResolver.DateRange range = DateRangeResolver.resolve("", null, null, 2026, 5);
+        assertEquals("month", range.getRangeType());
+        assertEquals("2026-05-01 00:00:00", format(range.getStartInclusive()));
+    }
+
+    private String format(Date date) {
+        final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        formatter.setTimeZone(TEST_TIME_ZONE);
+        return formatter.format(date);
+    }
+}
diff --git a/src/test/java/com/svnlog/web/controller/AppControllerDownloadTest.java b/src/test/java/com/svnlog/web/controller/AppControllerDownloadTest.java
index 017d2f3..ddf2f57 100644
--- a/src/test/java/com/svnlog/web/controller/AppControllerDownloadTest.java
+++ b/src/test/java/com/svnlog/web/controller/AppControllerDownloadTest.java
@@ -13,8 +13,11 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import com.svnlog.web.service.AiWorkflowService;
+import com.svnlog.web.service.GitPresetService;
+import com.svnlog.web.service.GitWorkflowService;
 import com.svnlog.web.service.HealthService;
 import com.svnlog.web.service.OutputFileService;
+import com.svnlog.web.service.ProjectConfigService;
 import com.svnlog.web.service.SettingsService;
 import com.svnlog.web.service.SvnPresetService;
 import com.svnlog.web.service.SvnWorkflowService;
@@ -96,11 +99,14 @@ class AppControllerDownloadTest {
     private MockMvc buildMockMvc(OutputFileService outputFileService) {
         final AppController controller = new AppController(
                 Mockito.mock(SvnWorkflowService.class),
+                Mockito.mock(GitWorkflowService.class),
                 Mockito.mock(AiWorkflowService.class),
                 Mockito.mock(TaskService.class),
                 outputFileService,
                 Mockito.mock(SettingsService.class),
                 Mockito.mock(SvnPresetService.class),
+                Mockito.mock(GitPresetService.class),
+                Mockito.mock(ProjectConfigService.class),
                 Mockito.mock(HealthService.class)
         );
         return MockMvcBuilders.standaloneSetup(controller)
diff --git a/src/test/java/com/svnlog/web/controller/AppControllerPresetTest.java b/src/test/java/com/svnlog/web/controller/AppControllerPresetTest.java
index aa3d580..797d4b4 100644
--- a/src/test/java/com/svnlog/web/controller/AppControllerPresetTest.java
+++ b/src/test/java/com/svnlog/web/controller/AppControllerPresetTest.java
@@ -8,8 +8,11 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import com.svnlog.web.service.AiWorkflowService;
+import com.svnlog.web.service.GitPresetService;
+import com.svnlog.web.service.GitWorkflowService;
 import com.svnlog.web.service.HealthService;
 import com.svnlog.web.service.OutputFileService;
+import com.svnlog.web.service.ProjectConfigService;
 import com.svnlog.web.service.RepositoryConfigService;
 import com.svnlog.web.service.SettingsService;
 import com.svnlog.web.service.SvnPresetService;
@@ -51,14 +54,19 @@ class AppControllerPresetTest {
         final OutputFileService outputFileService = new OutputFileService();
         outputFileService.setOutputRoot(tempDir.resolve("outputs").toString());
         final RepositoryConfigService repoConfigService = new RepositoryConfigService(outputFileService);
-        final SvnPresetService svnPresetService = new SvnPresetService(repoConfigService);
+        final ProjectConfigService projectConfigService = new ProjectConfigService(outputFileService, repoConfigService);
+        projectConfigService.init();
+        final SvnPresetService svnPresetService = new SvnPresetService(repoConfigService, projectConfigService);
         final AppController controller = new AppController(
                 Mockito.mock(SvnWorkflowService.class),
+                Mockito.mock(GitWorkflowService.class),
                 Mockito.mock(AiWorkflowService.class),
                 Mockito.mock(TaskService.class),
                 outputFileService,
                 Mockito.mock(SettingsService.class),
                 svnPresetService,
+                Mockito.mock(GitPresetService.class),
+                projectConfigService,
                 Mockito.mock(HealthService.class)
         );
         return MockMvcBuilders.standaloneSetup(controller)
diff --git a/src/test/java/com/svnlog/web/service/AiWorkflowServiceTest.java b/src/test/java/com/svnlog/web/service/AiWorkflowServiceTest.java
index f7735a8..35885c9 100644
--- a/src/test/java/com/svnlog/web/service/AiWorkflowServiceTest.java
+++ b/src/test/java/com/svnlog/web/service/AiWorkflowServiceTest.java
@@ -1,12 +1,17 @@
 package com.svnlog.web.service;
 
+import java.lang.reflect.Method;
 import java.nio.file.Path;
 import java.time.Instant;
+import java.util.List;
+import java.util.Map;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import com.svnlog.web.dto.GitPresetCreateRequest;
+import com.svnlog.web.dto.SvnPresetCreateRequest;
 import com.svnlog.web.model.TaskInfo;
 import com.svnlog.web.model.TaskStatus;
 
@@ -34,7 +39,8 @@ class AiWorkflowServiceTest {
                 outputFileService,
                 new AiInputValidator(),
                 aiApiService,
-                buildExcelExportService()
+                buildExcelExportService(),
+                buildProjectConfigService(outputFileService, buildRepositoryConfigService(outputFileService))
         );
 
         // DeepSeek provider：通过请求临时传入 key 来解析 context（不依赖内置默认 key）
@@ -63,7 +69,8 @@ class AiWorkflowServiceTest {
         );
         final AiApiService aiApiService = buildAiApiService(settingsService);
         final AiWorkflowService service = new AiWorkflowService(
-                outputFileService, new AiInputValidator(), aiApiService, buildExcelExportService()
+                outputFileService, new AiInputValidator(), aiApiService, buildExcelExportService(),
+                buildProjectConfigService(outputFileService, buildRepositoryConfigService(outputFileService))
         );
 
         final AiApiService.AiProviderContext context = aiApiService.resolveProviderContext(null);
@@ -126,6 +133,229 @@ class AiWorkflowServiceTest {
         Assertions.assertEquals("stop", result.getFinishReason());
     }
 
+    @Test
+    @SuppressWarnings("unchecked")
+    void shouldMapGitCommitsIntoDynamicProjectByMeta() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repositoryConfigService = buildRepositoryConfigService(outputFileService);
+        final ProjectConfigService projectConfigService = buildProjectConfigService(outputFileService, repositoryConfigService);
+        final GitPresetService gitPresetService = new GitPresetService(repositoryConfigService, projectConfigService);
+        final GitPresetCreateRequest createRequest = new GitPresetCreateRequest();
+        createRequest.setName("新Git项目");
+        createRequest.setUrl("https://example.com/org/new-git-project.git");
+        createRequest.setAuthType("PASSWORD");
+        gitPresetService.create(createRequest);
+
+        final String mdContent = ""
+                + "=== 文件: git_log_新Git项目_20260731.md ===\n"
+                + "# Git 日志报告\n\n"
+                + "## 查询条件\n\n"
+                + "- **项目**: `新Git项目`\n"
+                + "- **Git地址**: `https://example.com/org/new-git-project.git`\n"
+                + "- **提交范围**: a1b2c3d - f9e8d7c（2 条提交）\n\n"
+                + "## 日志详情\n\n"
+                + "### a1b2c3d\n\n"
+                + "**作者**: `alice`  \n"
+                + "**时间**: 2026-07-20 15:30:00  \n"
+                + "**版本**: a1b2c3d\n\n"
+                + "**提交信息**:\n\n"
+                + "```\nfeat: git commit one\n```\n\n"
+                + "---\n\n"
+                + "### f9e8d7c\n\n"
+                + "**作者**: `bob`  \n"
+                + "**时间**: 2026-07-03 10:00:00  \n"
+                + "**版本**: f9e8d7c\n\n"
+                + "**提交信息**:\n\n"
+                + "```\nfix: git commit two\n```\n\n"
+                + "---\n";
+
+        final AiWorkflowService service = new AiWorkflowService(
+                outputFileService, new AiInputValidator(),
+                buildAiApiService(buildSettingsService(outputFileService)),
+                buildExcelExportService(), projectConfigService
+        );
+        final Method method = AiWorkflowService.class.getDeclaredMethod("buildProjectCommitMap", String.class);
+        method.setAccessible(true);
+        final Object result = method.invoke(service, mdContent);
+        final Map<String, List<Object>> commitMap = (Map<String, List<Object>>) result;
+
+        Assertions.assertTrue(commitMap.containsKey("新Git项目"), "动态项目应出现在提交分组中");
+        final List<Object> commits = commitMap.get("新Git项目");
+        Assertions.assertEquals(2, commits.size());
+    }
+
+    @Test
+    void shouldKeepFixedSvnProjectsFirstInProjectList() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repositoryConfigService = buildRepositoryConfigService(outputFileService);
+        final ProjectConfigService projectConfigService = buildProjectConfigService(outputFileService, repositoryConfigService);
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
+        for (String name : new String[]{"PRS-7050场站智慧管控", "PRS-7950在线巡视", "PRS-7950在线巡视电科院测试版"}) {
+            final SvnPresetCreateRequest svnRequest = new SvnPresetCreateRequest();
+            svnRequest.setName(name);
+            svnRequest.setUrl("https://svn.example.com/svn/" + name);
+            svnPresetService.create(svnRequest);
+        }
+        final GitPresetService gitPresetService = new GitPresetService(repositoryConfigService, projectConfigService);
+        final GitPresetCreateRequest createRequest = new GitPresetCreateRequest();
+        createRequest.setName("新Git项目");
+        createRequest.setUrl("https://example.com/org/new-git-project.git");
+        createRequest.setAuthType("PASSWORD");
+        gitPresetService.create(createRequest);
+
+        final AiWorkflowService service = new AiWorkflowService(
+                outputFileService, new AiInputValidator(),
+                buildAiApiService(buildSettingsService(outputFileService)),
+                buildExcelExportService(), projectConfigService
+        );
+        final Method method;
+        try {
+            method = AiWorkflowService.class.getDeclaredMethod("resolveProjectNames");
+            method.setAccessible(true);
+            final Object result = method.invoke(service);
+            final List<String> names = (List<String>) result;
+            Assertions.assertEquals("PRS-7050场站智慧管控", names.get(0));
+            Assertions.assertEquals("PRS-7950在线巡视", names.get(1));
+            Assertions.assertEquals("PRS-7950在线巡视电科院测试版", names.get(2));
+            Assertions.assertEquals("新Git项目", names.get(3));
+        } catch (NoSuchMethodException e) {
+            Assertions.fail("resolveProjectNames 方法不存在: " + e.getMessage());
+        }
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void shouldMergeSvnAndGitCommitsIntoSameProjectGroup() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repositoryConfigService = buildRepositoryConfigService(outputFileService);
+        final ProjectConfigService projectConfigService = buildProjectConfigService(outputFileService, repositoryConfigService);
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
+        final SvnPresetCreateRequest svnRequest = new SvnPresetCreateRequest();
+        svnRequest.setName("PRS-7050场站智慧管控");
+        svnRequest.setUrl("https://svn.example.com/svn/prs7050");
+        svnRequest.setProjectName("PRS-7050场站智慧管控");
+        svnPresetService.create(svnRequest);
+
+        final GitPresetService gitPresetService = new GitPresetService(repositoryConfigService, projectConfigService);
+        final GitPresetCreateRequest gitRequest = new GitPresetCreateRequest();
+        gitRequest.setName("PRS7050_v1.00");
+        gitRequest.setUrl("http://10.6.223.70/keyc/prs7050_v1.00.git");
+        gitRequest.setProjectName("PRS-7050场站智慧管控");
+        gitRequest.setAuthType("PASSWORD");
+        gitPresetService.create(gitRequest);
+
+        final String mdContent = ""
+                + "=== 文件: svn_log_PRS-7050场站智慧管控_20260731.md ===\n"
+                + "# SVN 日志报告\n\n"
+                + "## 查询条件\n\n"
+                + "- **项目**: `PRS-7050场站智慧管控`\n"
+                + "- **SVN地址**: `https://svn.example.com/svn/prs7050`\n"
+                + "- **版本范围**: r100 - r101\n\n"
+                + "## 日志详情\n\n"
+                + "### r100\n\n"
+                + "**作者**: `alice`  \n"
+                + "**提交信息**:\n\n"
+                + "```\nsvn commit one\n```\n\n"
+                + "---\n\n"
+                + "=== 文件: git_log_PRS7050_v1.00_20260731.md ===\n"
+                + "# Git 日志报告\n\n"
+                + "## 查询条件\n\n"
+                + "- **项目**: `PRS-7050场站智慧管控`\n"
+                + "- **Git地址**: `http://10.6.223.70/keyc/prs7050_v1.00.git`\n"
+                + "- **提交范围**: a1b2c3d - f9e8d7c（2 条提交）\n\n"
+                + "## 日志详情\n\n"
+                + "### a1b2c3d\n\n"
+                + "**作者**: `bob`  \n"
+                + "**提交信息**:\n\n"
+                + "```\ngit commit one\n```\n\n"
+                + "---\n\n"
+                + "### f9e8d7c\n\n"
+                + "**作者**: `carol`  \n"
+                + "**提交信息**:\n\n"
+                + "```\ngit commit two\n```\n\n"
+                + "---\n";
+
+        final AiWorkflowService service = new AiWorkflowService(
+                outputFileService, new AiInputValidator(),
+                buildAiApiService(buildSettingsService(outputFileService)),
+                buildExcelExportService(), projectConfigService
+        );
+        final Method method = AiWorkflowService.class.getDeclaredMethod("buildProjectCommitMap", String.class);
+        method.setAccessible(true);
+        final Object result = method.invoke(service, mdContent);
+        final Map<String, List<Object>> commitMap = (Map<String, List<Object>>) result;
+
+        Assertions.assertEquals(3, commitMap.size(), "项目分组应包含全部项目");
+        final List<Object> commits = commitMap.get("PRS-7050场站智慧管控");
+        Assertions.assertNotNull(commits, "合并后应归入 PRS-7050场站智慧管控");
+        Assertions.assertEquals(3, commits.size(), "SVN 1 条 + Git 2 条应合并为 3 条");
+        Assertions.assertTrue(commitMap.get("PRS-7950在线巡视").isEmpty(), "其他项目不应混入");
+        Assertions.assertTrue(commitMap.get("PRS-7950在线巡视电科院测试版").isEmpty(), "其他项目不应混入");
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void shouldExcludeProjectsWithoutDataFromActiveList() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repositoryConfigService = buildRepositoryConfigService(outputFileService);
+        final ProjectConfigService projectConfigService = buildProjectConfigService(outputFileService, repositoryConfigService);
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
+        for (String name : new String[]{"PRS-7050场站智慧管控", "PRS-7950在线巡视", "PRS-7950在线巡视电科院测试版"}) {
+            final SvnPresetCreateRequest svnRequest = new SvnPresetCreateRequest();
+            svnRequest.setName(name);
+            svnRequest.setUrl("https://svn.example.com/svn/" + name);
+            svnRequest.setProjectName(name);
+            svnPresetService.create(svnRequest);
+        }
+        final GitPresetService gitPresetService = new GitPresetService(repositoryConfigService, projectConfigService);
+        final GitPresetCreateRequest gitRequest = new GitPresetCreateRequest();
+        gitRequest.setName("PRS7012-AMP");
+        gitRequest.setUrl("https://example.com/org/prs7012-amp.git");
+        gitRequest.setProjectName("PRS7012-AMP");
+        gitPresetService.create(gitRequest);
+
+        // 只有 7050 与 电科院 两个项目有提交，7950 与 PRS7012-AMP 无数据
+        final String mdContent = ""
+                + "=== 文件: svn_log_PRS-7050场站智慧管控_20260731.md ===\n"
+                + "# SVN 日志报告\n\n"
+                + "## 查询条件\n\n"
+                + "- **项目**: `PRS-7050场站智慧管控`\n"
+                + "## 日志详情\n\n"
+                + "### r100\n\n"
+                + "**提交信息**:\n\n"
+                + "```\n7050 commit one\n```\n\n"
+                + "---\n\n"
+                + "=== 文件: svn_log_PRS-7950在线巡视电科院测试版_20260731.md ===\n"
+                + "# SVN 日志报告\n\n"
+                + "## 查询条件\n\n"
+                + "- **项目**: `PRS-7950在线巡视电科院测试版`\n"
+                + "## 日志详情\n\n"
+                + "### r200\n\n"
+                + "**提交信息**:\n\n"
+                + "```\nelectric commit one\n```\n\n"
+                + "---\n";
+
+        final AiWorkflowService service = new AiWorkflowService(
+                outputFileService, new AiInputValidator(),
+                buildAiApiService(buildSettingsService(outputFileService)),
+                buildExcelExportService(), projectConfigService
+        );
+        final Method commitMapMethod = AiWorkflowService.class.getDeclaredMethod("buildProjectCommitMap", String.class);
+        commitMapMethod.setAccessible(true);
+        final Object commitMapResult = commitMapMethod.invoke(service, mdContent);
+
+        final Method activeMethod = AiWorkflowService.class.getDeclaredMethod("resolveActiveProjects", Map.class);
+        activeMethod.setAccessible(true);
+        final Object activeResult = activeMethod.invoke(service, commitMapResult);
+        final List<String> active = (List<String>) activeResult;
+
+        Assertions.assertEquals(2, active.size(), "无数据项目不应出现在激活列表");
+        Assertions.assertEquals("PRS-7050场站智慧管控", active.get(0));
+        Assertions.assertEquals("PRS-7950在线巡视电科院测试版", active.get(1));
+        Assertions.assertFalse(active.contains("PRS-7950在线巡视"));
+        Assertions.assertFalse(active.contains("PRS7012-AMP"));
+    }
+
     private OutputFileService buildOutputFileService() {
         final OutputFileService outputFileService = new OutputFileService();
         outputFileService.setOutputRoot(tempDir.resolve("outputs").toString());
@@ -143,7 +373,8 @@ class AiWorkflowServiceTest {
 
     private SettingsService buildSettingsService(OutputFileService outputFileService) {
         final RepositoryConfigService repositoryConfigService = buildRepositoryConfigService(outputFileService);
-        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService);
+        final ProjectConfigService projectConfigService = buildProjectConfigService(outputFileService, repositoryConfigService);
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
         return new SettingsService(outputFileService, new SettingsPersistenceService(), svnPresetService, repositoryConfigService);
     }
 
@@ -153,6 +384,13 @@ class AiWorkflowServiceTest {
         return repositoryConfigService;
     }
 
+    private ProjectConfigService buildProjectConfigService(OutputFileService outputFileService,
+                                                           RepositoryConfigService repositoryConfigService) {
+        final ProjectConfigService projectConfigService = new ProjectConfigService(outputFileService, repositoryConfigService);
+        projectConfigService.init();
+        return projectConfigService;
+    }
+
     private static final class StubSettingsService extends SettingsService {
         private final String openaiBaseUrl;
         private final String openaiApiKey;
@@ -161,7 +399,8 @@ class AiWorkflowServiceTest {
             super(
                     outputFileService,
                     new SettingsPersistenceService(),
-                    new SvnPresetService(new RepositoryConfigService(outputFileService)),
+                    new SvnPresetService(new RepositoryConfigService(outputFileService),
+                            new ProjectConfigService(outputFileService, new RepositoryConfigService(outputFileService))),
                     new RepositoryConfigService(outputFileService)
             );
             this.openaiBaseUrl = openaiBaseUrl;
diff --git a/src/test/java/com/svnlog/web/service/HealthServiceTest.java b/src/test/java/com/svnlog/web/service/HealthServiceTest.java
index b79ab12..4693c66 100644
--- a/src/test/java/com/svnlog/web/service/HealthServiceTest.java
+++ b/src/test/java/com/svnlog/web/service/HealthServiceTest.java
@@ -28,7 +28,9 @@ class HealthServiceTest {
         outputFileService.setOutputRoot(tempDir.resolve("outputs").toString());
         final RepositoryConfigService repositoryConfigService = new RepositoryConfigService(outputFileService);
         repositoryConfigService.init();
-        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService);
+        final ProjectConfigService projectConfigService = new ProjectConfigService(outputFileService, repositoryConfigService);
+        projectConfigService.init();
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
         final SettingsService settingsService = new SettingsService(
                 outputFileService,
                 new SettingsPersistenceService(),
diff --git a/src/test/java/com/svnlog/web/service/ProjectConfigServiceTest.java b/src/test/java/com/svnlog/web/service/ProjectConfigServiceTest.java
new file mode 100644
index 0000000..a1f1320
--- /dev/null
+++ b/src/test/java/com/svnlog/web/service/ProjectConfigServiceTest.java
@@ -0,0 +1,201 @@
+package com.svnlog.web.service;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import com.svnlog.web.dto.GitPresetCreateRequest;
+import com.svnlog.web.model.ProjectConfig;
+
+class ProjectConfigServiceTest {
+
+    @TempDir
+    Path tempDir;
+
+    private OutputFileService buildOutputFileService() {
+        final OutputFileService outputFileService = new OutputFileService();
+        outputFileService.setOutputRoot(tempDir.resolve("outputs").toString());
+        return outputFileService;
+    }
+
+    private RepositoryConfigService buildRepoService(OutputFileService outputFileService) {
+        final RepositoryConfigService repositoryConfigService = new RepositoryConfigService(outputFileService);
+        repositoryConfigService.init();
+        return repositoryConfigService;
+    }
+
+    private ProjectConfigService buildProjectService(OutputFileService outputFileService,
+                                                     RepositoryConfigService repositoryConfigService) {
+        final ProjectConfigService projectConfigService = new ProjectConfigService(outputFileService, repositoryConfigService);
+        projectConfigService.init();
+        return projectConfigService;
+    }
+
+    @Test
+    void shouldMigrateProjectsFromRepositoriesOnFirstLoad() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final Path configFile = outputFileService.resolveInOutput("repository-configs.json");
+        Files.createDirectories(configFile.getParent());
+        Files.write(configFile, ("["
+                + "{\"id\":\"p1\",\"name\":\"PRS-7050场站智慧管控\",\"type\":\"SVN\",\"enabled\":true,"
+                + "\"projectName\":\"PRS-7050场站智慧管控\",\"createdAt\":1,\"lastUsedAt\":0},"
+                + "{\"id\":\"p2\",\"name\":\"PRS7012-AMP\",\"type\":\"GIT\",\"enabled\":true,"
+                + "\"projectName\":\"PRS7012-AMP\",\"createdAt\":2,\"lastUsedAt\":0}"
+                + "]").getBytes(StandardCharsets.UTF_8));
+        final RepositoryConfigService repoService = buildRepoService(outputFileService);
+
+        final ProjectConfigService projectService = buildProjectService(outputFileService, repoService);
+
+        final List<String> names = projectService.listProjectNames();
+        Assertions.assertEquals(4, names.size());
+        Assertions.assertEquals("PRS-7050场站智慧管控", names.get(0));
+        Assertions.assertEquals("PRS-7950在线巡视", names.get(1));
+        Assertions.assertEquals("PRS-7950在线巡视电科院测试版", names.get(2));
+        Assertions.assertEquals("PRS7012-AMP", names.get(3));
+    }
+
+    @Test
+    void shouldRejectDuplicateProjectName() {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final ProjectConfigService projectService = buildProjectService(
+                outputFileService, buildRepoService(outputFileService));
+        projectService.create("新项目A");
+
+        final IllegalArgumentException error = Assertions.assertThrows(
+                IllegalArgumentException.class, () -> projectService.create("新项目A"));
+        Assertions.assertEquals("项目已存在: 新项目A", error.getMessage());
+    }
+
+    @Test
+    void shouldRejectDeleteWhenProjectHasRepos() {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repoService = buildRepoService(outputFileService);
+        final ProjectConfigService projectService = buildProjectService(outputFileService, repoService);
+        final ProjectConfig project = projectService.create("测试项目");
+
+        final GitPresetService gitPresetService = new GitPresetService(repoService, projectService);
+        final GitPresetCreateRequest request = new GitPresetCreateRequest();
+        request.setName("测试仓库");
+        request.setUrl("https://example.com/test.git");
+        request.setProjectName("测试项目");
+        gitPresetService.create(request);
+
+        final IllegalArgumentException error = Assertions.assertThrows(
+                IllegalArgumentException.class, () -> projectService.delete(project.getId()));
+        Assertions.assertTrue(error.getMessage().contains("请先移出后再删除"));
+    }
+
+    @Test
+    void shouldDeleteEmptyProjectAndRenumberOrder() {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final ProjectConfigService projectService = buildProjectService(
+                outputFileService, buildRepoService(outputFileService));
+        final ProjectConfig a = projectService.create("项目A");
+        final ProjectConfig b = projectService.create("项目B");
+        final ProjectConfig c = projectService.create("项目C");
+
+        projectService.delete(b.getId());
+
+        final List<String> names = projectService.listProjectNames();
+        // 预置 3 个固定项目 + 3 个新建项目 - 删除 1 个 = 5
+        Assertions.assertEquals(5, names.size());
+        Assertions.assertTrue(names.contains("项目A"));
+        Assertions.assertFalse(names.contains("项目B"));
+        Assertions.assertTrue(names.contains("项目C"));
+        Assertions.assertTrue(projectService.getById(a.getId()).getSortOrder()
+                < projectService.getById(c.getId()).getSortOrder());
+    }
+
+    @Test
+    void shouldMoveProjectUpAndDown() {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final ProjectConfigService projectService = buildProjectService(
+                outputFileService, buildRepoService(outputFileService));
+        final ProjectConfig a = projectService.create("项目A");
+        final ProjectConfig b = projectService.create("项目B");
+        final ProjectConfig c = projectService.create("项目C");
+
+        projectService.move(b.getId(), "up");
+        List<String> names = projectService.listProjectNames();
+        Assertions.assertTrue(names.indexOf("项目B") < names.indexOf("项目A"), "B 应移动到 A 之前");
+
+        projectService.move(b.getId(), "down");
+        projectService.move(b.getId(), "down");
+        names = projectService.listProjectNames();
+        Assertions.assertTrue(names.indexOf("项目A") < names.indexOf("项目C"), "A 应在 C 之前");
+        Assertions.assertTrue(names.indexOf("项目C") < names.indexOf("项目B"), "B 应移动到末尾");
+        // 边界：已在末尾再下移不报错
+        projectService.move(b.getId(), "down");
+        Assertions.assertEquals(6, projectService.listProjectNames().size());
+    }
+
+    @Test
+    void shouldSyncReposWhenRenamingProject() {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repoService = buildRepoService(outputFileService);
+        final ProjectConfigService projectService = buildProjectService(outputFileService, repoService);
+        final ProjectConfig project = projectService.create("测试项目");
+
+        final GitPresetService gitPresetService = new GitPresetService(repoService, projectService);
+        final GitPresetCreateRequest request = new GitPresetCreateRequest();
+        request.setName("测试仓库");
+        request.setUrl("https://example.com/test.git");
+        request.setProjectName("测试项目");
+        gitPresetService.create(request);
+
+        projectService.rename(project.getId(), "测试项目新名");
+
+        Assertions.assertEquals("测试项目新名", repoService.getById(firstRepoId(repoService)).getProjectName());
+        Assertions.assertTrue(projectService.containsName("测试项目新名"));
+    }
+
+    @Test
+    void shouldAssignRepoToProject() {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repoService = buildRepoService(outputFileService);
+        final ProjectConfigService projectService = buildProjectService(outputFileService, repoService);
+        final ProjectConfig project = projectService.create("目标项目");
+
+        final GitPresetService gitPresetService = new GitPresetService(repoService, projectService);
+        final GitPresetCreateRequest request = new GitPresetCreateRequest();
+        request.setName("待分配仓库");
+        request.setUrl("https://example.com/assign.git");
+        request.setProjectName("临时项目");
+        gitPresetService.create(request);
+
+        final String repoId = firstRepoId(repoService);
+        projectService.assign(repoId, project.getId());
+
+        Assertions.assertEquals("目标项目", repoService.getById(repoId).getProjectName());
+        Assertions.assertEquals(1, projectService.listReposOfProject("目标项目").size());
+        Assertions.assertTrue(projectService.listUnassignedRepos().isEmpty());
+    }
+
+    @Test
+    void shouldRejectAssignWithEmptyProject() {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService repoService = buildRepoService(outputFileService);
+        final ProjectConfigService projectService = buildProjectService(outputFileService, repoService);
+        final GitPresetService gitPresetService = new GitPresetService(repoService, projectService);
+        final GitPresetCreateRequest request = new GitPresetCreateRequest();
+        request.setName("待分配仓库");
+        request.setUrl("https://example.com/assign.git");
+        request.setProjectName("临时项目");
+        gitPresetService.create(request);
+
+        final IllegalArgumentException error = Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> projectService.assign(firstRepoId(repoService), "  ")
+        );
+        Assertions.assertEquals("仓库必须分配到项目", error.getMessage());
+    }
+
+    private String firstRepoId(RepositoryConfigService repoService) {
+        return repoService.listAll().get(0).getId();
+    }
+}
diff --git a/src/test/java/com/svnlog/web/service/RepositoryConfigServiceTest.java b/src/test/java/com/svnlog/web/service/RepositoryConfigServiceTest.java
new file mode 100644
index 0000000..7599d4e
--- /dev/null
+++ b/src/test/java/com/svnlog/web/service/RepositoryConfigServiceTest.java
@@ -0,0 +1,83 @@
+package com.svnlog.web.service;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import com.svnlog.web.model.RepositoryConfig;
+
+class RepositoryConfigServiceTest {
+
+    @TempDir
+    Path tempDir;
+
+    private OutputFileService buildOutputFileService() {
+        final OutputFileService outputFileService = new OutputFileService();
+        outputFileService.setOutputRoot(tempDir.resolve("outputs").toString());
+        return outputFileService;
+    }
+
+    @Test
+    void shouldBackfillProjectNameWithRepositoryNameOnLoad() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final Path configFile = outputFileService.resolveInOutput("repository-configs.json");
+        Files.createDirectories(configFile.getParent());
+        // 模拟旧版配置：无 projectName 字段
+        Files.write(configFile, ("["
+                + "{\"id\":\"preset-1\",\"name\":\"PRS-7050场站智慧管控\",\"type\":\"SVN\",\"enabled\":true,"
+                + "\"svnUrl\":\"https://svn.example.com/svn/prs7050\",\"createdAt\":1,\"lastUsedAt\":0},"
+                + "{\"id\":\"preset-2\",\"name\":\"PRS7050_v1.00\",\"type\":\"GIT\",\"enabled\":true,"
+                + "\"svnUrl\":\"http://10.6.223.70/keyc/prs7050_v1.00.git\",\"createdAt\":2,\"lastUsedAt\":0}"
+                + "]").getBytes(StandardCharsets.UTF_8));
+
+        final RepositoryConfigService service = new RepositoryConfigService(outputFileService);
+        service.init();
+
+        final List<RepositoryConfig> configs = service.listAll();
+        Assertions.assertEquals(2, configs.size());
+        Assertions.assertEquals("PRS-7050场站智慧管控", configs.get(0).getProjectName());
+        Assertions.assertEquals("PRS7050_v1.00", configs.get(1).getProjectName());
+    }
+
+    @Test
+    void shouldKeepExistingProjectNameOnLoad() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final Path configFile = outputFileService.resolveInOutput("repository-configs.json");
+        Files.createDirectories(configFile.getParent());
+        Files.write(configFile, ("["
+                + "{\"id\":\"preset-1\",\"name\":\"PRS7050_v1.00\",\"type\":\"GIT\",\"enabled\":true,"
+                + "\"projectName\":\"PRS-7050场站智慧管控\","
+                + "\"svnUrl\":\"http://10.6.223.70/keyc/prs7050_v1.00.git\",\"createdAt\":1,\"lastUsedAt\":0}"
+                + "]").getBytes(StandardCharsets.UTF_8));
+
+        final RepositoryConfigService service = new RepositoryConfigService(outputFileService);
+        service.init();
+
+        final List<RepositoryConfig> configs = service.listAll();
+        Assertions.assertEquals(1, configs.size());
+        Assertions.assertEquals("PRS-7050场站智慧管控", configs.get(0).getProjectName());
+    }
+
+    @Test
+    void shouldRejectEmptyProjectNameOnUpdate() throws Exception {
+        final OutputFileService outputFileService = buildOutputFileService();
+        final RepositoryConfigService service = new RepositoryConfigService(outputFileService);
+        service.init();
+        final RepositoryConfig config = new RepositoryConfig();
+        config.setType("SVN");
+        config.setName("测试仓库");
+        config.setProjectName("测试项目");
+        service.create(config);
+
+        final IllegalArgumentException error = Assertions.assertThrows(
+                IllegalArgumentException.class,
+                () -> service.updateProjectName(config.getId(), "   ")
+        );
+        Assertions.assertEquals("项目不能为空", error.getMessage());
+    }
+}
diff --git a/src/test/java/com/svnlog/web/service/SettingsServiceTest.java b/src/test/java/com/svnlog/web/service/SettingsServiceTest.java
index fcdc063..914c4f4 100644
--- a/src/test/java/com/svnlog/web/service/SettingsServiceTest.java
+++ b/src/test/java/com/svnlog/web/service/SettingsServiceTest.java
@@ -213,7 +213,9 @@ class SettingsServiceTest {
 
         final RepositoryConfigService repositoryConfigService = new RepositoryConfigService(outputFileService);
         repositoryConfigService.init();
-        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService);
+        final ProjectConfigService projectConfigService = new ProjectConfigService(outputFileService, repositoryConfigService);
+        projectConfigService.init();
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
 
         final SettingsService settingsService = new SettingsService(
                 outputFileService,
@@ -252,7 +254,9 @@ class SettingsServiceTest {
 
         final RepositoryConfigService repositoryConfigService = new RepositoryConfigService(outputFileService);
         repositoryConfigService.init();
-        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService);
+        final ProjectConfigService projectConfigService = new ProjectConfigService(outputFileService, repositoryConfigService);
+        projectConfigService.init();
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
         final SettingsService settingsService = new SettingsService(
                 outputFileService,
                 new SettingsPersistenceService(),
@@ -275,7 +279,9 @@ class SettingsServiceTest {
         final SettingsPersistenceService settingsPersistenceService = new SettingsPersistenceService();
         final RepositoryConfigService repositoryConfigService = new RepositoryConfigService(outputFileService);
         repositoryConfigService.init();
-        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService);
+        final ProjectConfigService projectConfigService = new ProjectConfigService(outputFileService, repositoryConfigService);
+        projectConfigService.init();
+        final SvnPresetService svnPresetService = new SvnPresetService(repositoryConfigService, projectConfigService);
         return new SettingsService(outputFileService, settingsPersistenceService, svnPresetService, repositoryConfigService);
     }
 
diff --git a/src/test/java/com/svnlog/web/service/SvnPresetServiceTest.java b/src/test/java/com/svnlog/web/service/SvnPresetServiceTest.java
index f1cbd45..6e2905f 100644
--- a/src/test/java/com/svnlog/web/service/SvnPresetServiceTest.java
+++ b/src/test/java/com/svnlog/web/service/SvnPresetServiceTest.java
@@ -21,11 +21,20 @@ public class SvnPresetServiceTest {
         return new RepositoryConfigService(outputFileService);
     }
 
+    private ProjectConfigService createProjectService(RepositoryConfigService repoService, Path tempDir) {
+        final OutputFileService projectOutput = new OutputFileService();
+        projectOutput.setOutputRoot(tempDir.resolve("projects").toString());
+        final ProjectConfigService projectService = new ProjectConfigService(projectOutput, repoService);
+        projectService.init();
+        return projectService;
+    }
+
     @Test
     public void shouldCreatePresetAndPersistToJson() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         final SvnPresetCreateRequest request = new SvnPresetCreateRequest();
         request.setName("test-project");
@@ -57,7 +66,8 @@ public class SvnPresetServiceTest {
     public void shouldUpdatePresetWithoutOverwritingPasswordWhenEmpty() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-update-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         // Create preset with password
         final SvnPresetCreateRequest request = new SvnPresetCreateRequest();
@@ -92,7 +102,8 @@ public class SvnPresetServiceTest {
     public void shouldNotOverwriteUsernameWithEmptyString() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-username-empty-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         final SvnPresetCreateRequest request = new SvnPresetCreateRequest();
         request.setName("project");
@@ -114,7 +125,8 @@ public class SvnPresetServiceTest {
     public void shouldNotOverwriteUsernameWithWhitespace() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-username-whitespace-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         final SvnPresetCreateRequest request = new SvnPresetCreateRequest();
         request.setName("project");
@@ -136,7 +148,8 @@ public class SvnPresetServiceTest {
     public void shouldUpdateUsernameWhenValid() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-username-valid-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         final SvnPresetCreateRequest request = new SvnPresetCreateRequest();
         request.setName("project");
@@ -158,7 +171,8 @@ public class SvnPresetServiceTest {
     public void shouldClearPasswordWhenClearSvnPasswordIsTrue() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-clear-pwd-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         final SvnPresetCreateRequest request = new SvnPresetCreateRequest();
         request.setName("project");
@@ -181,7 +195,8 @@ public class SvnPresetServiceTest {
     public void shouldSoftDeletePreset() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-delete-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         final SvnPresetCreateRequest request = new SvnPresetCreateRequest();
         request.setName("to-delete");
@@ -205,7 +220,8 @@ public class SvnPresetServiceTest {
     public void shouldReturnEmptyWhenNoPresetsConfigured() throws Exception {
         final Path tempDir = Files.createTempDirectory("svn-preset-empty-test");
         final RepositoryConfigService repoService = createRepoService(tempDir);
-        final SvnPresetService service = new SvnPresetService(repoService);
+        final ProjectConfigService projectService = createProjectService(repoService, tempDir);
+        final SvnPresetService service = new SvnPresetService(repoService, projectService);
 
         Assertions.assertTrue(service.listPresetSummaries().isEmpty());
         Assertions.assertTrue(service.listManage().isEmpty());