From e1fd098a9727268d2abbd00432aeb75f3ea59d4f Mon Sep 17 00:00:00 2001
From: aiyimickey <39365912+aiyimickey@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:35:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20monitor=20permissions=20sync=20+=20univ?=
 =?UTF-8?q?ersal=20docker=20exec=20for=20role=20writes=20+=20build=20fresh?=
 =?UTF-8?q?ness=20check=20-=20role-manager.tsx:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E6=89=80=E6=9C=89=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=20+=20=E5=8D=95=E7=94=A8=E6=88=B7=E5=8D=95?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=90=8C=E6=AD=A5=20+=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85=20-=20ro?=
 =?UTF-8?q?les/route.ts:=20=E8=BF=94=E5=9B=9E=20display=5Fname=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8B=E6=8B=89=E6=A1=86=E6=98=BE=E7=A4=BA=20()=20-?=
 =?UTF-8?q?=20user-roles/route.ts:=20PUT=20=E7=BB=9F=E4=B8=80=E7=94=A8=20d?=
 =?UTF-8?q?ocker=20exec=20-i=20=E5=86=99=E6=89=80=E6=9C=89=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=EF=BC=88=E7=BB=95=E8=BF=87=20SQLite=20=E9=94=81?=
 =?UTF-8?q?=EF=BC=89=20-=20sync-users/route.ts:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=20API=EF=BC=8C=E7=BB=9F=E4=B8=80=20docker=20?=
 =?UTF-8?q?exec=20=E5=86=99=E6=89=80=E6=9C=89=E7=AB=99=E7=82=B9=20-=20depl?=
 =?UTF-8?q?oy-ai.sh:=20=E6=9E=84=E5=BB=BA=E6=96=B0=E9=B2=9C=E5=BA=A6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A3=80=E6=9F=A5=20-=20deploy-monitor.sh:?=
 =?UTF-8?q?=20=E5=90=8C=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/admin/create-user/role-manager.tsx | 49 +++++++++++++---
 src/app/api/admin/roles/route.ts           | 18 ++++--
 src/app/api/admin/sync-users/route.ts      | 67 ++++++++++++++++++++++
 src/app/api/admin/user-roles/route.ts      | 14 +++--
 4 files changed, 132 insertions(+), 16 deletions(-)
 create mode 100644 src/app/api/admin/sync-users/route.ts

diff --git a/src/app/admin/create-user/role-manager.tsx b/src/app/admin/create-user/role-manager.tsx
index 6fe5301..a5c2c12 100644
--- a/src/app/admin/create-user/role-manager.tsx
+++ b/src/app/admin/create-user/role-manager.tsx
@@ -33,6 +33,7 @@ export default function RoleManager({ setResult, onUserUpdated }: Props) {
   const [editingDisplayName, setEditingDisplayName] = useState<string | null>(null)
   const [editDisplayNameValue, setEditDisplayNameValue] = useState('')
   const [savingDisplayName, setSavingDisplayName] = useState(false)
+  const [syncing, setSyncing] = useState<string | null>(null) // username being synced, or 'all'
 
   const fetchRoleData = useCallback(async () => {
     try {
@@ -99,6 +100,23 @@ export default function RoleManager({ setResult, onUserUpdated }: Props) {
     setPending({}); if (fail === 0) fetchRoleData(); setSaving(false)
   }
 
+  async function syncUsers(usernames: string[], targetSite?: string) {
+    setSyncing(usernames.length === 1 ? usernames[0] : 'all')
+    try {
+      const res = await fetch('/api/admin/sync-users', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ usernames, targetSite }) })
+      const d = await res.json()
+      if (res.ok) {
+        fetchRoleData()
+        const failed = Object.entries(d.results || {}).flatMap(([site, users]: [string, any]) =>
+          Object.entries(users).filter(([, ok]) => !ok).map(([u]) => `${u}→${site}`)
+        )
+        setResult(failed.length === 0, failed.length > 0 ? `${failed.join(', ')} 同步失败` : '同步完成')
+      }
+      else setResult(false, d.error || '同步失败')
+    } catch { setResult(false, '网络错误') }
+    finally { setSyncing(null) }
+  }
+
   if (!roleData) return <p style={{ fontSize: 13, color: 'var(--text-muted)', textAlign: 'center', padding: 40 }}>加载中...</p>
 
   const userMap = new Map<string, { displayName: string; email: string; assetsRole: string; issueRole: string; monitorRole: string }>()
@@ -112,9 +130,14 @@ export default function RoleManager({ setResult, onUserUpdated }: Props) {
     <div>
       <div style={ss.bar}>
         <p style={ss.hint}>修改角色后点击「保存修改」统一提交{changed > 0 && <span style={{ color: '#d97706', fontWeight: 700, marginLeft: 10 }}>（{changed} 项待保存）</span>}</p>
-        <button onClick={handleSave} disabled={changed === 0 || saving} style={ss.saveBtn(changed > 0)}>
-          {saving ? '保存中...' : `保存修改${changed > 0 ? ` (${changed})` : ''}`}
-        </button>
+        <div style={{ display: 'flex', gap: 8 }}>
+          <button onClick={() => syncUsers(users.map(([u]) => u))} disabled={syncing !== null} style={ss.saveBtn(false)}>
+            {syncing === 'all' ? '同步中...' : '同步到所有站点'}
+          </button>
+          <button onClick={handleSave} disabled={changed === 0 || saving} style={ss.saveBtn(changed > 0)}>
+            {saving ? '保存中...' : `保存修改${changed > 0 ? ` (${changed})` : ''}`}
+          </button>
+        </div>
       </div>
 
       <div style={{ overflowX: 'auto' }}><table style={ss.table}>
@@ -161,9 +184,9 @@ export default function RoleManager({ setResult, onUserUpdated }: Props) {
                   </span>
                 )}
               </td>
-              <td style={ss.td}><RoleCell site="assets" username={uname} originalRole={info.assetsRole} roles={roleData.assetsRoles} pending={pending} onSelect={handleSelect} getCurrentRole={getCurrentRole} /></td>
-              <td style={ss.td}><RoleCell site="issue" username={uname} originalRole={info.issueRole} roles={roleData.issueRoles} pending={pending} onSelect={handleSelect} getCurrentRole={getCurrentRole} /></td>
-              <td style={ss.td}><RoleCell site="monitor" username={uname} originalRole={info.monitorRole} roles={roleData.monitorRoles} pending={pending} onSelect={handleSelect} getCurrentRole={getCurrentRole} /></td>
+              <td style={ss.td}><RoleCell site="assets" username={uname} originalRole={info.assetsRole} roles={roleData.assetsRoles} pending={pending} onSelect={handleSelect} getCurrentRole={getCurrentRole} syncing={syncing} onSync={syncUsers} /></td>
+              <td style={ss.td}><RoleCell site="issue" username={uname} originalRole={info.issueRole} roles={roleData.issueRoles} pending={pending} onSelect={handleSelect} getCurrentRole={getCurrentRole} syncing={syncing} onSync={syncUsers} /></td>
+              <td style={ss.td}><RoleCell site="monitor" username={uname} originalRole={info.monitorRole} roles={roleData.monitorRoles} pending={pending} onSelect={handleSelect} getCurrentRole={getCurrentRole} syncing={syncing} onSync={syncUsers} /></td>
             </tr>
           ))}
         </tbody>
@@ -172,17 +195,27 @@ export default function RoleManager({ setResult, onUserUpdated }: Props) {
   )
 }
 
-function RoleCell({ site, username, originalRole, roles, pending, onSelect, getCurrentRole }: {
+function RoleCell({ site, username, originalRole, roles, pending, onSelect, getCurrentRole, syncing, onSync }: {
   site: string; username: string; originalRole: string; roles: string[]
   pending: Record<string, { site: string; newRole: string }>
   onSelect: (site: string, username: string, newRole: string, originalRole: string) => void
   getCurrentRole: (site: string, username: string, originalRole: string) => string
+  syncing: string | null; onSync: (usernames: string[], site?: string) => void
 }) {
   const isReserved = username === 'admin' || username === 'localadmin'
   const changed = !!pending[`${site}:${username}`]
   const currentRole = getCurrentRole(site, username, originalRole)
   if (isReserved) return <span style={{ fontSize: 12, color: 'var(--text-muted)' }}>{currentRole}</span>
-  if (originalRole === '—' && !changed) return <span style={{ fontSize: 11, color: 'var(--text-muted)' }}>未同步</span>
+  if (originalRole === '—' && !changed) return (
+    <span style={{ fontSize: 11 }}>
+      <span style={{ color: 'var(--text-muted)' }}>未同步</span>
+      {' '}
+      <button onClick={() => onSync([username], site)} disabled={syncing === username}
+        style={{ background: 'none', border: 'none', color: '#2563eb', fontSize: 11, cursor: syncing === username ? 'not-allowed' : 'pointer', padding: 0, textDecoration: 'underline', opacity: syncing === username ? 0.5 : 1 }}>
+        {syncing === username ? '同步中...' : '同步'}
+      </button>
+    </span>
+  )
   return (
     <select value={currentRole} onChange={e => onSelect(site, username, e.target.value, originalRole)} style={ss.roleSelect(changed)}>
       {roles.map(r => <option key={r} value={r}>{r}</option>)}
diff --git a/src/app/api/admin/roles/route.ts b/src/app/api/admin/roles/route.ts
index 418926d..a14b566 100644
--- a/src/app/api/admin/roles/route.ts
+++ b/src/app/api/admin/roles/route.ts
@@ -5,14 +5,24 @@ import { isLldapAdmin } from '@/lib/ldap'
 
 const INTERNAL_KEY = 'oa-internal-key-tlyq-2026'
 
-async function fetchRoles(siteUrl: string): Promise<string[]> {
+// 角色中文显示名映射
+const ROLE_LABELS: Record<string, string> = {
+  admin: '管理员', editor: '编辑者', viewer: '观察者',
+}
+
+interface RoleInfo { name: string; display_name: string }
+
+async function fetchRoles(siteUrl: string): Promise<RoleInfo[]> {
   try {
     const res = await fetch(`${siteUrl}/api/internal/roles`, {
       headers: { 'x-internal-key': INTERNAL_KEY },
       signal: AbortSignal.timeout(5000),
     })
     const data = await res.json()
-    return (data.roles || []).map((r: { name: string }) => r.name)
+    return (data.roles || []).map((r: { name: string }) => ({
+      name: r.name,
+      display_name: ROLE_LABELS[r.name] || r.name,
+    }))
   } catch { return [] }
 }
 
@@ -27,9 +37,9 @@ export async function GET() {
   const I_URL = process.env.ISSUE_INTERNAL_URL || 'http://localhost:6176'
   const M_URL = process.env.MONITOR_INTERNAL_URL || 'http://localhost:6181'
 
-  const [assetsRoles, issueRoles, monitorRoles] = await Promise.all([
+  const [assets, issue, monitor] = await Promise.all([
     fetchRoles(A_URL), fetchRoles(I_URL), fetchRoles(M_URL),
   ])
 
-  return NextResponse.json({ assets: assetsRoles, issue: issueRoles, monitor: monitorRoles })
+  return NextResponse.json({ assets, issue, monitor })
 }
diff --git a/src/app/api/admin/sync-users/route.ts b/src/app/api/admin/sync-users/route.ts
new file mode 100644
index 0000000..568c8ac
--- /dev/null
+++ b/src/app/api/admin/sync-users/route.ts
@@ -0,0 +1,67 @@
+// POST /api/admin/sync-users — 将用户同步到指定站点（docker exec 写 DB）
+import { NextResponse } from 'next/server'
+import { cookies } from 'next/headers'
+import { execFileSync } from 'child_process'
+import { verifySharedJwt } from '@/lib/jwt'
+import { isLldapAdmin } from '@/lib/ldap'
+import { queryLldap, esc } from '@/lib/lldap-db'
+
+const SITES: Record<string, [string, string]> = {
+  assets: ['assets-ai', '/app/data/assets.db'],
+  issue: ['issue-ai', '/app/data/issue.db'],
+  monitor: ['monitor-ai', '/app/data/monitor.db'],
+}
+
+function syncToSite(container: string, dbPath: string, username: string, displayName: string, email: string): boolean {
+  try {
+    const su = esc(username); const sd = esc(displayName); const se = esc(email)
+    const d = new Date()
+    const now = `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} ${String(d.getHours()).padStart(2,'0')}:${String(d.getMinutes()).padStart(2,'0')}:${String(d.getSeconds()).padStart(2,'0')}`
+    execFileSync('docker', ['exec', '-i', container, 'sqlite3', dbPath], {
+      input: `INSERT OR IGNORE INTO users (username, display_name, email, role, is_active, created_at, updated_at) VALUES ('${su}', '${sd}', '${se}', 'viewer', 1, '${now}', '${now}');`,
+      timeout: 5000,
+    })
+    return true
+  } catch { return false }
+}
+
+export async function POST(request: Request) {
+  const cookieStore = await cookies()
+  const token = cookieStore.get('tlyq_session')?.value
+  if (!token) return NextResponse.json({ error: '未登录' }, { status: 401 })
+  const session = verifySharedJwt(token)
+  if (!session || !(await isLldapAdmin(session.username))) {
+    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+  }
+
+  const { usernames, targetSite } = await request.json()
+  if (!usernames || !Array.isArray(usernames) || usernames.length === 0) {
+    return NextResponse.json({ error: '请指定要同步的用户' }, { status: 400 })
+  }
+
+  // 从 LLDAP 获取用户信息
+  const userInfo: Record<string, { displayName: string; email: string }> = {}
+  try {
+    const safeNames = usernames.map(u => `'${esc(u)}'`).join(',')
+    const out = queryLldap(`SELECT user_id, display_name, email FROM users WHERE user_id IN (${safeNames})`)
+    out.split('\n').filter(Boolean).forEach(line => {
+      const [uid, dn, em] = line.split('|')
+      userInfo[uid] = { displayName: dn || uid, email: em || '' }
+    })
+  } catch {}
+
+  const sites = targetSite && SITES[targetSite] ? { [targetSite]: SITES[targetSite] }
+    : targetSite ? null : SITES
+  if (!sites) return NextResponse.json({ error: '无效的站点' }, { status: 400 })
+
+  const results: Record<string, Record<string, boolean>> = {}
+  for (const [site, [cName, cPath]] of Object.entries(sites)) {
+    results[site] = {}
+    for (const username of usernames) {
+      const info = userInfo[username] || { displayName: username, email: '' }
+      results[site][username] = syncToSite(cName, cPath, username, info.displayName, info.email)
+    }
+  }
+
+  return NextResponse.json({ success: true, results })
+}
diff --git a/src/app/api/admin/user-roles/route.ts b/src/app/api/admin/user-roles/route.ts
index 4ff2610..14129e7 100644
--- a/src/app/api/admin/user-roles/route.ts
+++ b/src/app/api/admin/user-roles/route.ts
@@ -108,10 +108,16 @@ export async function PUT(request: Request) {
     const roles = await fetchRoles(siteUrl(site))
     if (!roles.includes(role)) return NextResponse.json({ error: '无效的角色' }, { status: 400 })
 
-    execFileSync('sqlite3', [siteDb(site)], {
-      input: `UPDATE users SET role='${role}', updated_at=datetime('now', '+8 hours') WHERE username='${username}';`,
-      timeout: 3000,
-    })
+    // 统一通过 docker exec -i 写各站点 DB（直连 SQLite 在不同容器间始终 readonly）
+    const containers: Record<string, [string, string]> = {
+      assets: ['assets-ai', '/app/data/assets.db'],
+      issue: ['issue-ai', '/app/data/issue.db'],
+      monitor: ['monitor-ai', '/app/data/monitor.db'],
+    }
+    const [cName, cPath] = containers[site] || [null, null]
+    if (!cName) return NextResponse.json({ error: '未知站点' }, { status: 400 })
+    const sql = `UPDATE users SET role='${role}', updated_at=datetime('now', '+8 hours') WHERE username='${username}';`
+    execFileSync('docker', ['exec', '-i', cName, 'sqlite3', cPath], { input: sql, timeout: 5000 })
 
     return NextResponse.json({ success: true })
   } catch {