feat: 支持多项目打包

- config.json 改为按项目存储(projects.<id>),上传配置全局共用;旧单项目配置自动迁移为 readoor
- 新增项目管理(管理员):Git 仓库/凭据、源码目录、Xcode 工程、拷贝条目、配置替换方式、自定义字段、替换规则
- 通用配置替换:pbxproj 版本号与签名,patch_rules 支持 define / replace_line 及 ${app.X}、${server.X} 模板
- 请求通过 X-Project 头选择项目;打包任务记录 project_id,历史按项目过滤
- 前端顶部切换项目,App/服务器环境表单按项目显示字段

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
shenlei
2026-10-22 14:59:30 +09:00
co-authored by Claude Opus 5.5
parent 2bd5c7057f
commit 8f2f23682f
19 changed files with 1535 additions and 137 deletions
+9 -2
View File
@@ -51,7 +51,7 @@
</optgroup>
</select>
</div>
<div class="form-group">
<div v-if="supportsObfuscation" class="form-group">
<label>代码混淆</label>
<div class="checkbox-group">
<input type="checkbox" id="obfuscation" v-model="form.obfuscation">
@@ -161,11 +161,15 @@ import { useRoute } from 'vue-router'
const getToken = inject('getToken')
const currentProject = inject('currentProject', ref(''))
const authFetch = (url, options = {}) => {
const token = getToken()
if (token) {
options.headers = { ...options.headers, 'Authorization': `Bearer ${token}` }
}
if (currentProject.value) {
options.headers = { ...options.headers, 'X-Project': currentProject.value }
}
return fetch(url, options)
}
@@ -182,6 +186,9 @@ const filteredApps = computed(() => {
return Object.entries(apps.value).filter(([, app]) => app.server === selectedServer.value)
})
const selectedApp = computed(() => apps.value[form.value.app_id] || null)
const currentProjectInfo = inject('currentProjectInfo', ref(null))
// 未加载到项目信息时(旧版服务)保持原有行为
const supportsObfuscation = computed(() => currentProjectInfo.value?.obfuscation ?? true)
const availableBuildTypes = computed(() => {
const certificates = selectedApp.value?.certificates || {}
return ['Ad_Hoc', 'App_Store'].filter(buildType => Boolean(certificates[buildType]))
@@ -373,7 +380,7 @@ const submitTask = async () => {
const res = await authFetch('/api/tasks', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(form.value),
body: JSON.stringify({ ...form.value, obfuscation: supportsObfuscation.value && form.value.obfuscation }),
})
if (res.ok) {
const task = await res.json()
+308 -26
View File
@@ -8,7 +8,9 @@
<div v-else class="admin-page">
<div class="sidebar">
<h3>配置管理</h3>
<div v-if="currentProjectInfo" class="sidebar-project">当前项目:{{ currentProjectInfo.name }}</div>
<ul class="sidebar-menu">
<li v-if="isAdmin" :class="{ active: tab === 'projects' }" @click="tab = 'projects'">项目管理</li>
<li v-if="isAdmin" :class="{ active: tab === 'users' }" @click="tab = 'users'">用户管理</li>
<li v-if="isAdmin" :class="{ active: tab === 'servers' }" @click="tab = 'servers'">服务器环境</li>
<li :class="{ active: tab === 'apps' }" @click="tab = 'apps'">Apps 配置</li>
@@ -20,6 +22,38 @@
</ul>
</div>
<div class="main-content">
<!-- 项目管理 -->
<div v-if="tab === 'projects'">
<h2>项目管理</h2>
<p style="color: #666; margin-bottom: 16px; font-size: 14px;">每个项目有独立的源码仓库、Apps、Schemes、服务器环境、分支和版本号;上传配置所有项目共用。页面顶部切换当前项目。</p>
<button class="btn btn-primary" style="width: auto; margin-bottom: 16px;" @click="openProjectModal()">+ 新增项目</button>
<table class="config-table">
<thead>
<tr>
<th>ID</th>
<th>名称</th>
<th>Git 仓库</th>
<th>Xcode</th>
<th>配置替换</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr v-for="p in projectDefinitions" :key="p.id">
<td>{{ p.id }}</td>
<td><strong>{{ p.name }}</strong></td>
<td>{{ p.git.remote_url || (p.git.use_env ? '.env 中的 GIT_REMOTE_URL' : '-') }}</td>
<td>{{ p.xcode.workspace || p.xcode.project }}</td>
<td>{{ p.patcher === 'readoor' ? 'Readoor 专用' : `通用(${p.patch_rules.length} 条规则)` }}</td>
<td class="action-btns">
<button class="action-btn" @click="openProjectModal(p)">编辑</button>
<button class="action-btn delete" @click="deleteProject(p)">删除</button>
</td>
</tr>
</tbody>
</table>
</div>
<!-- 用户管理 -->
<div v-if="tab === 'users'">
<h2>用户管理</h2>
@@ -65,20 +99,22 @@
<thead>
<tr>
<th>环境名称</th>
<th>API 地址</th>
<th v-if="isReadoorProject">API 地址</th>
<th>App ID 前缀</th>
<th>Associated Domains</th>
<th>Universal Link</th>
<th v-if="isReadoorProject">Associated Domains</th>
<th v-if="isReadoorProject">Universal Link</th>
<th v-for="field in serverFields" :key="field.key">{{ field.label }}</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(server, name) in servers" :key="name">
<td><strong>{{ name }}</strong></td>
<td>{{ server.api }}</td>
<td v-if="isReadoorProject">{{ server.api }}</td>
<td>{{ server.app_id_prefix }}</td>
<td>{{ server.assDom }}</td>
<td>{{ server.universalLink }}</td>
<td v-if="isReadoorProject">{{ server.assDom }}</td>
<td v-if="isReadoorProject">{{ server.universalLink }}</td>
<td v-for="field in serverFields" :key="field.key">{{ server[field.key] }}</td>
<td class="action-btns">
<button class="action-btn" @click="openServerModal(name, server)">编辑</button>
<button class="action-btn delete" @click="deleteServer(name)">删除</button>
@@ -98,7 +134,8 @@
<th>ID</th>
<th>名称</th>
<th>环境</th>
<th>AppGuid</th>
<th v-if="isReadoorProject">AppGuid</th>
<th v-for="field in appFields" :key="field.key">{{ field.label }}</th>
<th>证书</th>
<th>操作</th>
</tr>
@@ -108,7 +145,8 @@
<td>{{ id }}</td>
<td>{{ app.name }}</td>
<td>{{ app.server }}</td>
<td>{{ app.AppGuid || app.AppId }}</td>
<td v-if="isReadoorProject">{{ app.AppGuid || app.AppId }}</td>
<td v-for="field in appFields" :key="field.key">{{ app[field.key] }}</td>
<td>{{ Object.keys(app.certificates || {}).join(', ') || '-' }}</td>
<td class="action-btns">
<button class="action-btn" @click="openAppModal(id, app)">编辑</button>
@@ -413,17 +451,23 @@
<label>环境名称 *</label>
<input v-model="serverForm.name" type="text" placeholder="例如:测试环境" :disabled="!!editingServerName">
</div>
<div class="form-group">
<label>API 地址 *</label>
<input v-model="serverForm.api" type="text" placeholder="https://api3-dev.readoor.cn">
</div>
<div class="form-group">
<label>Associated Domains</label>
<input v-model="serverForm.assDom" type="text" placeholder="applinks:dev-data1.readoor.cn">
</div>
<div class="form-group">
<label>Universal Link</label>
<input v-model="serverForm.universalLink" type="text" placeholder="https://dev-data1.readoor.cn">
<template v-if="isReadoorProject">
<div class="form-group">
<label>API 地址 *</label>
<input v-model="serverForm.api" type="text" placeholder="https://api3-dev.readoor.cn">
</div>
<div class="form-group">
<label>Associated Domains</label>
<input v-model="serverForm.assDom" type="text" placeholder="applinks:dev-data1.readoor.cn">
</div>
<div class="form-group">
<label>Universal Link</label>
<input v-model="serverForm.universalLink" type="text" placeholder="https://dev-data1.readoor.cn">
</div>
</template>
<div v-for="field in serverFields" :key="field.key" class="form-group">
<label>{{ field.label }}{{ field.required ? ' *' : '' }}</label>
<input v-model="serverForm[field.key]" type="text">
</div>
<div class="form-group">
<label>App ID 前缀</label>
@@ -467,7 +511,7 @@
<input v-model.number="appForm.app_id_prefix_override" type="number" min="1" placeholder="仅特殊 App 使用">
</div>
</div>
<div class="form-row">
<div v-if="isReadoorProject" class="form-row">
<div class="form-group">
<label>AppGuid *</label>
<input v-model="appForm.AppGuid" type="text" placeholder="应用唯一标识">
@@ -478,7 +522,15 @@
</div>
</div>
<div v-if="appFields.length" class="form-row">
<div v-for="field in appFields" :key="field.key" class="form-group">
<label>{{ field.label }}{{ field.required ? ' *' : '' }}</label>
<input v-model="appForm[field.key]" type="text">
</div>
</div>
<!-- 关联配置 -->
<template v-if="isReadoorProject">
<h4 class="section-title">关联配置</h4>
<div class="form-row">
<div class="form-group">
@@ -516,6 +568,7 @@
<input v-model="appForm.AlivcLicenseKey" type="text">
</div>
</div>
</template>
<!-- 证书配置 -->
<h4 class="section-title">证书配置</h4>
@@ -542,7 +595,7 @@
<label>Provisioning Profile 名称</label>
<input v-model="appForm.certificates[certType].pro" type="text" placeholder="/Users/.../xxx.mobileprovision">
</div>
<div class="form-group">
<div v-if="isReadoorProject" class="form-group">
<label>主题目录</label>
<select v-if="appSkins.length"
:value="appSkins.some(s => s.name.replace('.zip', '') === appForm.certificates[certType].theme) ? appForm.certificates[certType].theme : ''"
@@ -562,6 +615,7 @@
</div>
<!-- 皮肤包管理 -->
<template v-if="isReadoorProject">
<h4 class="section-title" style="margin-top: 20px;">皮肤包管理</h4>
<div class="skins-section">
<div v-if="!appForm.upload_key" class="skins-hint">请先保存 APP 后再上传皮肤包</div>
@@ -589,6 +643,7 @@
</label>
</div>
</div>
</template>
<div style="margin-top: 20px; display: flex; gap: 12px; justify-content: flex-end;">
<button class="action-btn" style="padding: 8px 16px;" @click="showAppModal = false">取消</button>
@@ -597,6 +652,106 @@
</div>
</div>
<!-- 项目编辑弹窗 -->
<div v-if="showProjectModal" class="modal-overlay" @click.self="showProjectModal = false">
<div class="modal-content modal-large">
<div class="modal-header">
<h3>{{ editingProjectId ? '编辑' : '新增' }}项目</h3>
<button class="modal-close" @click="showProjectModal = false">&times;</button>
</div>
<div class="form-row">
<div class="form-group">
<label>项目 ID *</label>
<input v-model="projectForm.id" type="text" placeholder="例如:dyauction(小写字母开头)" :disabled="!!editingProjectId">
</div>
<div class="form-group">
<label>项目名称 *</label>
<input v-model="projectForm.name" type="text" placeholder="例如:多云选">
</div>
</div>
<h4 class="section-title">源码仓库</h4>
<div class="form-group">
<label>Git 仓库地址</label>
<input v-model="projectForm.git.remote_url" type="text" placeholder="https://git.example.com/group/repo.git">
</div>
<div class="form-row">
<div class="form-group">
<label>Git 用户名</label>
<input v-model="projectForm.git.username" type="text" autocomplete="off">
</div>
<div class="form-group">
<label>Git 密码 / Token</label>
<input v-model="projectForm.git.password" type="password" autocomplete="new-password"
:placeholder="projectForm.git.password_set ? '已设置,留空保持不变' : ''">
</div>
</div>
<label class="checkbox-label" style="margin-bottom: 12px;">
<input type="checkbox" v-model="projectForm.git.use_env">
未填写的 Git 配置使用 .env 中的 GIT_REMOTE_URL / GIT_USERNAME / GIT_PASSWORD
</label>
<div class="form-group">
<label>共享源码目录</label>
<input v-model="projectForm.source_dir" type="text" :placeholder="`留空为 <服务目录>/sources/${projectForm.id || '<项目 ID>'}`">
<div class="field-hint">打包时会对该目录执行 git reset --hard 和 git clean,不要指向本地开发用的工作副本。</div>
</div>
<h4 class="section-title">Xcode 工程</h4>
<div class="form-row">
<div class="form-group">
<label>Workspace</label>
<input v-model="projectForm.xcode.workspace" type="text" placeholder="X.xcworkspace(使用 CocoaPods 时填写)">
</div>
<div class="form-group">
<label>Project</label>
<input v-model="projectForm.xcode.project" type="text" placeholder="X.xcodeproj">
</div>
</div>
<div class="form-row">
<div class="form-group">
<label>配置替换方式</label>
<select v-model="projectForm.patcher">
<option value="generic">通用(版本号、签名 + 替换规则)</option>
<option value="readoor">Readoor 专用</option>
</select>
</div>
<div class="form-group">
<label>代码混淆</label>
<label class="checkbox-label"><input type="checkbox" v-model="projectForm.obfuscation"> 支持代码混淆</label>
</div>
</div>
<div class="form-group">
<label>拷贝条目(每行一个,留空拷贝整个仓库)</label>
<textarea v-model="projectForm.copy_items_text" rows="3" class="code-textarea"></textarea>
</div>
<h4 class="section-title">自定义字段与替换规则(JSON)</h4>
<div class="form-group">
<label>App 字段</label>
<textarea v-model="projectForm.app_fields_text" rows="3" class="code-textarea"
placeholder='[{"key": "APPID", "label": "APPID", "required": true}]'></textarea>
</div>
<div class="form-group">
<label>服务器环境字段</label>
<textarea v-model="projectForm.server_fields_text" rows="3" class="code-textarea"
placeholder='[{"key": "ISDEV", "label": "ISDEV(1=开发,0=正式)", "required": true}]'></textarea>
</div>
<div class="form-group">
<label>替换规则</label>
<textarea v-model="projectForm.patch_rules_text" rows="6" class="code-textarea"
placeholder='[{"type": "define", "file": "App/Macro.h", "name": "ISDEV", "value": "${server.ISDEV}"}]'></textarea>
<div class="field-hint">
define:替换文件中所有未注释的 <code>#define 名称</code> 行;replace_line:整行替换包含 keyword 的行(字段为 line)。
值中可用 <code>${app.字段}</code>、<code>${server.字段}</code>、<code>${VERSION}</code> 等。
</div>
</div>
<div style="margin-top: 20px; display: flex; gap: 12px; justify-content: flex-end;">
<button class="action-btn" style="padding: 8px 16px;" @click="showProjectModal = false">取消</button>
<button class="btn btn-primary" style="width: auto; padding: 8px 24px;" @click="saveProject">保存</button>
</div>
</div>
</div>
<!-- Scheme 编辑弹窗 -->
<div v-if="showSchemeModal" class="modal-overlay" @click.self="showSchemeModal = false">
<div class="modal-content">
@@ -634,6 +789,16 @@ const isLoggedIn = inject('isLoggedIn')
const isAdmin = inject('isAdmin')
const tab = ref('apps')
// 当前项目决定 App / 服务器环境表单显示哪些字段
const currentProjectInfo = inject('currentProjectInfo', ref(null))
const reloadProjects = inject('reloadProjects', async () => {})
const isReadoorProject = computed(() => (currentProjectInfo.value?.patcher ?? 'readoor') === 'readoor')
const appFields = computed(() => currentProjectInfo.value?.app_fields || [])
const serverFields = computed(() => currentProjectInfo.value?.server_fields || [])
const missingRequiredFields = (fields, data) => fields
.filter(field => field.required && !String(data[field.key] ?? '').trim())
.map(field => field.label || field.key)
// 用户管理
const users = ref([])
const showUserModal = ref(false)
@@ -643,11 +808,15 @@ const passwordTarget = ref(null)
const newPassword = ref('')
// 带认证的 fetch 封装
const currentProject = inject('currentProject', ref(''))
const authFetch = (url, options = {}) => {
const token = getToken()
if (token) {
options.headers = { ...options.headers, 'Authorization': `Bearer ${token}` }
}
if (currentProject.value) {
options.headers = { ...options.headers, 'X-Project': currentProject.value }
}
return fetch(url, options)
}
const apps = ref({})
@@ -762,7 +931,7 @@ const loadData = async () => {
return
}
const [appsRes, schemesRes, serversRes, branchesRes, tagsRes, buildRes, uploadRes, configRes, versionsRes, usersRes] = await Promise.all([
const [appsRes, schemesRes, serversRes, branchesRes, tagsRes, buildRes, uploadRes, configRes, versionsRes, usersRes, projectsRes] = await Promise.all([
authFetch('/api/config/apps'),
authFetch('/api/config/schemes'),
authFetch('/api/config/servers'),
@@ -773,6 +942,7 @@ const loadData = async () => {
authFetch('/api/config'),
authFetch('/api/config/versions'),
authFetch('/api/users'),
authFetch('/api/config/projects'),
])
apps.value = await appsRes.json()
schemes.value = await schemesRes.json()
@@ -785,6 +955,105 @@ const loadData = async () => {
jsonContent.value = JSON.stringify(await configRes.json(), null, 2)
applyVersions(await versionsRes.json())
if (usersRes.ok) users.value = await usersRes.json()
if (projectsRes?.ok) projectDefinitions.value = await projectsRes.json()
}
// 项目管理
const projectDefinitions = ref([])
const showProjectModal = ref(false)
const editingProjectId = ref(null)
const projectForm = ref({})
const toJsonText = value => (value && value.length ? JSON.stringify(value, null, 2) : '')
const openProjectModal = (project = null) => {
editingProjectId.value = project?.id || null
const p = project || {
id: '', name: '', source_dir: '', patcher: 'generic', obfuscation: false, copy_items: [],
git: { remote_url: '', username: '', use_env: false, password_set: false },
xcode: { workspace: '', project: '' }, app_fields: [], server_fields: [], patch_rules: [],
}
projectForm.value = {
id: p.id,
name: p.name,
source_dir: p.source_dir || '',
patcher: p.patcher,
obfuscation: !!p.obfuscation,
git: { ...p.git, password: '' },
xcode: { ...p.xcode },
copy_items_text: (p.copy_items || []).join('\n'),
app_fields_text: toJsonText(p.app_fields),
server_fields_text: toJsonText(p.server_fields),
patch_rules_text: toJsonText(p.patch_rules),
}
showProjectModal.value = true
}
const saveProject = async () => {
const form = projectForm.value
if (!form.id || !form.name) {
alert('请填写必填字段:项目 ID、项目名称')
return
}
const parsed = {}
for (const [key, label] of [['app_fields', 'App 字段'], ['server_fields', '服务器环境字段'], ['patch_rules', '替换规则']]) {
const text = (form[`${key}_text`] || '').trim()
try {
parsed[key] = text ? JSON.parse(text) : []
} catch {
alert(`${label} 不是有效的 JSON`)
return
}
if (!Array.isArray(parsed[key])) {
alert(`${label} 必须是 JSON 数组`)
return
}
}
const { password_set: _passwordSet, ...git } = form.git
const body = {
id: form.id,
name: form.name,
git,
source_dir: form.source_dir,
xcode: form.xcode,
patcher: form.patcher,
obfuscation: form.obfuscation,
copy_items: form.copy_items_text.split('\n').map(item => item.trim()).filter(Boolean),
...parsed,
}
const editing = editingProjectId.value
try {
const res = await authFetch(editing ? `/api/config/projects/${encodeURIComponent(editing)}` : '/api/config/projects', {
method: editing ? 'PUT' : 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(body),
})
if (!res.ok) {
const err = await res.json().catch(() => ({}))
throw new Error(err.detail || '保存失败')
}
showProjectModal.value = false
await loadData()
await reloadProjects()
alert('保存成功')
} catch (e) {
alert('保存失败: ' + e.message)
}
}
const deleteProject = async (project) => {
if (!confirm(`确定删除项目「${project.name}」?该项目的 Apps、Schemes、服务器环境、分支和版本配置都会删除(打包记录保留)。`)) return
try {
const res = await authFetch(`/api/config/projects/${encodeURIComponent(project.id)}`, { method: 'DELETE' })
if (!res.ok) {
const err = await res.json().catch(() => ({}))
throw new Error(err.detail || '删除失败')
}
await loadData()
await reloadProjects()
alert('删除成功')
} catch (e) {
alert('删除失败: ' + e.message)
}
}
// 用户管理
@@ -882,8 +1151,13 @@ const openServerModal = (name = null, server = null) => {
}
const saveServer = async () => {
if (!serverForm.value.name || !serverForm.value.api) {
alert('请填写必填字段:环境名称、API 地址')
const missing = [
...(!serverForm.value.name ? ['环境名称'] : []),
...(isReadoorProject.value && !serverForm.value.api ? ['API 地址'] : []),
...missingRequiredFields(serverFields.value, serverForm.value),
]
if (missing.length) {
alert(`请填写必填字段:${missing.join('、')}`)
return
}
@@ -1087,8 +1361,13 @@ const normalizeTencentAppId = () => {
}
const saveApp = async () => {
if (!appForm.value.name || !appForm.value.AppGuid) {
alert('请填写必填字段:App 名称、AppGuid')
const missing = [
...(!appForm.value.name ? ['App 名称'] : []),
...(isReadoorProject.value && !appForm.value.AppGuid ? ['AppGuid'] : []),
...missingRequiredFields(appFields.value, appForm.value),
]
if (missing.length) {
alert(`请填写必填字段:${missing.join('、')}`)
return
}
@@ -1362,6 +1641,9 @@ const formatJson = () => {
.modal-overlay { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0,0,0,0.5); display: flex; align-items: center; justify-content: center; z-index: 1000; }
.modal-content { background: white; border-radius: 12px; padding: 24px; width: 500px; max-height: 80vh; overflow-y: auto; }
.modal-large { width: 700px; }
.sidebar-project { font-size: 12px; color: #888; margin: -8px 0 12px; }
.code-textarea { width: 100%; font-family: Menlo, Monaco, monospace; font-size: 12px; padding: 8px; border: 1px solid #d9d9d9; border-radius: 4px; resize: vertical; box-sizing: border-box; }
.field-hint { font-size: 12px; color: #999; margin-top: 4px; line-height: 1.6; }
.modal-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; }
.modal-header h3 { font-size: 16px; margin: 0; }
.modal-close { background: none; border: none; font-size: 24px; cursor: pointer; color: #999; }
+4
View File
@@ -165,11 +165,15 @@ const getToken = inject('getToken', () => '')
const isAdmin = inject('isAdmin', ref(false))
const tasks = ref([])
const currentProject = inject('currentProject', ref(''))
const authFetch = (url, options = {}) => {
const token = getToken()
if (token) {
options.headers = { ...options.headers, 'Authorization': `Bearer ${token}` }
}
if (currentProject.value) {
options.headers = { ...options.headers, 'X-Project': currentProject.value }
}
return fetch(url, options)
}
const filterStatus = ref('')