From d1f2dbffa43efe94d2a77b92f9319ea99d979992 Mon Sep 17 00:00:00 2001 From: CI Test Date: Sun, 28 Jun 2026 10:25:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix(P1-1):=20auth.py=20forgot=5Fpassword=20?= =?UTF-8?q?=E7=A1=AC=E7=BC=96=E7=A0=81=20localhost=20=E6=94=B9=E4=B8=BA=20?= =?UTF-8?q?settings.APP=5FBASE=5FURL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/app/api/routes/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/app/api/routes/auth.py b/apps/api/app/api/routes/auth.py index eacf9dc94..1ded9dd1a 100755 --- a/apps/api/app/api/routes/auth.py +++ b/apps/api/app/api/routes/auth.py @@ -206,7 +206,7 @@ async def forgot_password( ): success, error = RequestPasswordResetUseCase( user_repository=user_repository, - base_url="http://localhost:3000", + base_url=settings.APP_BASE_URL, email_service=email_service, ).execute(PasswordResetUseCaseRequest(email=request.email)) if not success: -- 2.54.0 From ecfa0d33e4ea5f666b0df85e1ff458193e318ba9 Mon Sep 17 00:00:00 2001 From: CI Test Date: Sun, 28 Jun 2026 10:25:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix(P1-2):=20generation.py=20=5Fdownload=5F?= =?UTF-8?q?library=5Fassets=20=E6=94=B9=E7=94=A8=20Worker=20SessionLocal?= =?UTF-8?q?=20=E6=9B=BF=E4=BB=A3=E7=9B=B4=E6=8E=A5=20create=5Fengine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/pages/admin/Analytics.tsx | 245 ------------- apps/web/src/pages/admin/Dashboard.tsx | 86 ----- apps/web/src/pages/admin/LogViewer.tsx | 344 ------------------ apps/web/src/pages/admin/SystemMonitor.tsx | 224 ------------ apps/web/src/pages/admin/UserManagement.tsx | 117 ------ .../web/src/pages/profile/AccountSecurity.tsx | 111 ------ .../pages/profile/NotificationSettings.tsx | 96 ----- .../src/pages/profile/SessionManagement.tsx | 21 -- .../src/pages/workspace/WorkspaceDetail.tsx | 196 ---------- apps/web/tsconfig.json | 4 +- apps/worker/worker_app/tasks/generation.py | 12 +- 11 files changed, 4 insertions(+), 1452 deletions(-) delete mode 100644 apps/web/src/pages/admin/Analytics.tsx delete mode 100644 apps/web/src/pages/admin/Dashboard.tsx delete mode 100644 apps/web/src/pages/admin/LogViewer.tsx delete mode 100644 apps/web/src/pages/admin/SystemMonitor.tsx delete mode 100644 apps/web/src/pages/admin/UserManagement.tsx delete mode 100644 apps/web/src/pages/profile/AccountSecurity.tsx delete mode 100644 apps/web/src/pages/profile/NotificationSettings.tsx delete mode 100644 apps/web/src/pages/profile/SessionManagement.tsx delete mode 100644 apps/web/src/pages/workspace/WorkspaceDetail.tsx diff --git a/apps/web/src/pages/admin/Analytics.tsx b/apps/web/src/pages/admin/Analytics.tsx deleted file mode 100644 index 186e6e67a..000000000 --- a/apps/web/src/pages/admin/Analytics.tsx +++ /dev/null @@ -1,245 +0,0 @@ -/** - * Admin Analytics 数据分析页面 - */ -import React from 'react'; -import { Card, Row, Col, Statistic, Table, DatePicker, Space } from 'antd'; -import { - LineChart, - Line, - BarChart, - Bar, - PieChart, - Pie, - Cell, - XAxis, - YAxis, - CartesianGrid, - Tooltip, - Legend, - ResponsiveContainer, -} from 'recharts'; -import { - ArrowUpOutlined, - UserAddOutlined, - DollarOutlined, - ProjectOutlined, -} from '@ant-design/icons'; -import './Admin.css'; - -const { RangePicker } = DatePicker; - -// V21 配色 -const V21_COLORS = { - primary: '#4f46e5', - primaryLight: '#6366f1', - success: '#10b981', - successLight: '#34d399', - warning: '#f59e0b', - warningLight: '#fbbf24', - purple: '#8b5cf6', - purpleLight: '#a78bfa', -}; - -const Analytics: React.FC = () => { - // 模拟用户增长数据 - const userGrowthData = [ - { month: '1月', users: 120, paid: 15 }, - { month: '2月', users: 180, paid: 28 }, - { month: '3月', users: 240, paid: 42 }, - { month: '4月', users: 320, paid: 58 }, - { month: '5月', users: 450, paid: 89 }, - { month: '6月', users: 620, paid: 135 }, - ]; - - // 模拟营收数据 - const revenueData = [ - { month: '1月', revenue: 1480 }, - { month: '2月', revenue: 2770 }, - { month: '3月', revenue: 4160 }, - { month: '4月', revenue: 5740 }, - { month: '5月', revenue: 8810 }, - { month: '6月', revenue: 13365 }, - ]; - - // 订阅计划分布 - const planDistribution = [ - { name: 'Free', value: 485, color: '#a78bfa' }, - { name: 'Pro', value: 120, color: '#34d399' }, - { name: 'Enterprise', value: 15, color: '#fbbf24' }, - ]; - - // 活跃度统计 - const activityStats = [ - { metric: '日活跃用户 (DAU)', value: 892, growth: '+12.5%', icon: , colorClass: 'primary' }, - { metric: '月活跃用户 (MAU)', value: 3456, growth: '+8.3%', icon: , colorClass: 'success' }, - { metric: '本月收入', value: 13365, prefix: '¥', growth: '+51.6%', icon: , colorClass: 'warning' }, - { metric: '活跃项目数', value: 2341, growth: '+18.2%', icon: , colorClass: 'purple' }, - ]; - - // 用户留存表格 - const retentionData = [ - { cohort: '2024-01', day1: '100%', day7: '68%', day30: '45%', day90: '28%' }, - { cohort: '2024-02', day1: '100%', day7: '72%', day30: '48%', day90: '31%' }, - { cohort: '2024-03', day1: '100%', day7: '75%', day30: '52%', day90: '-' }, - { cohort: '2024-04', day1: '100%', day7: '78%', day30: '55%', day90: '-' }, - { cohort: '2024-05', day1: '100%', day7: '80%', day30: '-', day90: '-' }, - ]; - - const retentionColumns = [ - { title: 'Cohort', dataIndex: 'cohort', key: 'cohort' }, - { title: 'Day 1', dataIndex: 'day1', key: 'day1' }, - { title: 'Day 7', dataIndex: 'day7', key: 'day7' }, - { title: 'Day 30', dataIndex: 'day30', key: 'day30' }, - { title: 'Day 90', dataIndex: 'day90', key: 'day90' }, - ]; - - const colorMap: Record = { - primary: '#4f46e5', - success: '#10b981', - warning: '#f59e0b', - purple: '#8b5cf6', - }; - - return ( -
-
-
-

数据分析

-

用户增长、营收趋势与留存分析

-
-
- - - -
-
- - {/* 关键指标 */} - - {activityStats.map((stat, index) => ( - -
-
-
- {stat.icon} -
-
-
{stat.metric}
-
- {stat.prefix}{stat.value.toLocaleString()} -
-
- {stat.growth} vs 上月 -
-
- - ))} - - - {/* 图表区域 */} - - {/* 用户增长趋势 */} - -
- - - - - - - - - - - - - -
- - - {/* 订阅计划分布 */} - -
- - - - `${entry.name}: ${entry.value}`} - outerRadius={80} - fill="#8884d8" - dataKey="value" - > - {planDistribution.map((entry, index) => ( - - ))} - - - - - -
- - - - {/* 营收趋势 */} - - -
- - - - - - - - - - - - -
- - - - {/* 用户留存表 */} -
- - - - - - ); -}; - -export default Analytics; - -export const Component = Analytics; diff --git a/apps/web/src/pages/admin/Dashboard.tsx b/apps/web/src/pages/admin/Dashboard.tsx deleted file mode 100644 index 469b6c2d7..000000000 --- a/apps/web/src/pages/admin/Dashboard.tsx +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Admin Dashboard 仪表盘 - */ -import React from 'react'; -import { Card, Row, Col, Statistic, Table } from 'antd'; -import { - UserOutlined, - CrownOutlined, - DollarOutlined, - RiseOutlined, -} from '@ant-design/icons'; -import './Admin.css'; - -const Dashboard: React.FC = () => { - // 模拟数据 - const stats = [ - { title: '总用户数', value: 1234, icon: , colorClass: 'primary' }, - { title: '付费用户', value: 156, icon: , colorClass: 'success' }, - { title: '月收入', value: 15444, prefix: '¥', icon: , colorClass: 'warning' }, - { title: '活跃用户', value: 892, icon: , colorClass: 'purple' }, - ]; - - const recentUsers = [ - { id: '1', username: 'user1', email: 'user1@example.com', created_at: '2024-06-17' }, - { id: '2', username: 'user2', email: 'user2@example.com', created_at: '2024-06-16' }, - { id: '3', username: 'user3', email: 'user3@example.com', created_at: '2024-06-15' }, - ]; - - const columns = [ - { title: '用户名', dataIndex: 'username', key: 'username' }, - { title: '邮箱', dataIndex: 'email', key: 'email' }, - { title: '注册时间', dataIndex: 'created_at', key: 'created_at' }, - ]; - - const colorMap: Record = { - primary: '#4f46e5', - success: '#10b981', - warning: '#f59e0b', - purple: '#8b5cf6', - }; - - return ( -
-
-

Dashboard

-

系统数据总览与关键指标

-
- - - {stats.map((stat, index) => ( -
-
-
-
- {stat.icon} -
-
-
{stat.title}
-
- {stat.prefix}{stat.value.toLocaleString()} -
-
- - ))} - - -
- -
- - - - ); -}; - -export default Dashboard; - -export const Component = Dashboard; diff --git a/apps/web/src/pages/admin/LogViewer.tsx b/apps/web/src/pages/admin/LogViewer.tsx deleted file mode 100644 index 4744a0957..000000000 --- a/apps/web/src/pages/admin/LogViewer.tsx +++ /dev/null @@ -1,344 +0,0 @@ -/** - * 日志查看器 - */ -import React, { useState } from 'react'; -import { Card, Table, Tag, Input, Select, DatePicker, Space, Button, Drawer } from 'antd'; -import { - SearchOutlined, - FilterOutlined, - DownloadOutlined, - EyeOutlined, -} from '@ant-design/icons'; -import type { ColumnsType } from 'antd/es/table'; -import './Admin.css'; - -const { Search } = Input; -const { RangePicker } = DatePicker; -const { Option } = Select; - -interface LogEntry { - id: string; - timestamp: string; - level: 'INFO' | 'WARN' | 'ERROR' | 'DEBUG'; - service: string; - user?: string; - action: string; - details: string; - ip?: string; - request_id?: string; -} - -const LogViewer: React.FC = () => { - const [selectedLog, setSelectedLog] = useState(null); - const [drawerVisible, setDrawerVisible] = useState(false); - const [filterLevel, setFilterLevel] = useState('all'); - const [filterService, setFilterService] = useState('all'); - - // 模拟日志数据 - const logs: LogEntry[] = [ - { - id: '1', - timestamp: '2024-06-17 17:15:32', - level: 'INFO', - service: 'API', - user: 'user@example.com', - action: 'User Login', - details: 'User successfully logged in', - ip: '192.168.1.100', - request_id: 'req_abc123', - }, - { - id: '2', - timestamp: '2024-06-17 17:14:28', - level: 'WARN', - service: 'API', - user: 'admin@example.com', - action: 'Failed Login Attempt', - details: 'Invalid password provided (attempt 2/5)', - ip: '192.168.1.101', - request_id: 'req_def456', - }, - { - id: '3', - timestamp: '2024-06-17 17:12:45', - level: 'ERROR', - service: 'Database', - action: 'Connection Timeout', - details: 'PostgreSQL connection pool exhausted, timeout after 5s', - request_id: 'req_ghi789', - }, - { - id: '4', - timestamp: '2024-06-17 17:10:15', - level: 'INFO', - service: 'Celery', - action: 'Task Completed', - details: 'Video processing task completed successfully', - request_id: 'task_jkl012', - }, - { - id: '5', - timestamp: '2024-06-17 17:08:52', - level: 'WARN', - service: 'ObjectStorage', - action: 'Slow Upload', - details: 'File upload took 3.2s (>1s threshold)', - ip: '192.168.1.102', - request_id: 'req_mno345', - }, - { - id: '6', - timestamp: '2024-06-17 17:05:33', - level: 'ERROR', - service: 'API', - user: 'user2@example.com', - action: 'Permission Denied', - details: 'User attempted to access admin endpoint without permission', - ip: '192.168.1.103', - request_id: 'req_pqr678', - }, - { - id: '7', - timestamp: '2024-06-17 17:03:21', - level: 'INFO', - service: 'API', - user: 'user3@example.com', - action: 'Project Created', details: 'New project "My Project" created', - ip: '192.168.1.104', - request_id: 'req_stu901', - }, - { - id: '8', - timestamp: '2024-06-17 17:01:08', - level: 'DEBUG', - service: 'Redis', - action: 'Cache Miss', - details: 'Cache key "project:123" not found, fetching from DB', - request_id: 'req_vwx234', - }, - ]; - - const getLevelTagClass = (level: string) => { - const classes: Record = { - INFO: 'xx-tag info', - WARN: 'xx-tag warning', - ERROR: 'xx-tag error', - DEBUG: 'xx-tag debug', - }; - return classes[level] || 'xx-tag debug'; - }; - - const handleViewDetails = (log: LogEntry) => { - setSelectedLog(log); - setDrawerVisible(true); - }; - - const columns: ColumnsType = [ - { - title: '时间', - dataIndex: 'timestamp', - key: 'timestamp', - width: 180, - sorter: (a, b) => a.timestamp.localeCompare(b.timestamp), - }, - { - title: '级别', - dataIndex: 'level', - key: 'level', - width: 100, - render: (level: string) => {level}, - filters: [ - { text: 'INFO', value: 'INFO' }, - { text: 'WARN', value: 'WARN' }, - { text: 'ERROR', value: 'ERROR' }, - { text: 'DEBUG', value: 'DEBUG' }, - ], - onFilter: (value, record) => record.level === value, - }, - { - title: '服务', - dataIndex: 'service', - key: 'service', - width: 120, - filters: [ - { text: 'API', value: 'API' }, - { text: 'Database', value: 'Database' }, - { text: 'Celery', value: 'Celery' }, - { text: 'ObjectStorage', value: 'ObjectStorage' }, - { text: 'Redis', value: 'Redis' }, - ], - onFilter: (value, record) => record.service === value, - }, - { - title: '用户', - dataIndex: 'user', - key: 'user', - width: 180, - render: (user?: string) => user || '-', - }, - { - title: '操作', - dataIndex: 'action', - key: 'action', - width: 200, - }, - { - title: '详情', - dataIndex: 'details', - key: 'details', - ellipsis: true, - }, - { - title: '操作', - key: 'actions', - width: 100, - render: (_, record) => ( - - ), - }, - ]; - - return ( -
-
-

日志查看器

-

系统日志查询与监控

-
- -
- } - className="xx-search-input" - style={{ width: 280 }} - /> - - - - - - - - - -
- -
-
`共 ${total} 条日志`, - }} - scroll={{ x: 1200 }} - /> - - - {/* 日志详情抽屉 */} - setDrawerVisible(false)} - className="xx-drawer" - > - {selectedLog && ( -
-
-
时间
-
{selectedLog.timestamp}
-
- -
-
级别
-
- {selectedLog.level} -
-
- -
-
服务
-
{selectedLog.service}
-
- - {selectedLog.user && ( -
-
用户
-
{selectedLog.user}
-
- )} - -
-
操作
-
{selectedLog.action}
-
- -
-
详细信息
-
{selectedLog.details}
-
- - {selectedLog.ip && ( -
-
IP 地址
-
{selectedLog.ip}
-
- )} - - {selectedLog.request_id && ( -
-
Request ID
-
{selectedLog.request_id}
-
- )} -
- )} - - - ); -}; - -export default LogViewer; - -export const Component = LogViewer; diff --git a/apps/web/src/pages/admin/SystemMonitor.tsx b/apps/web/src/pages/admin/SystemMonitor.tsx deleted file mode 100644 index bc20279f7..000000000 --- a/apps/web/src/pages/admin/SystemMonitor.tsx +++ /dev/null @@ -1,224 +0,0 @@ -/** - * 系统监控页面 - */ -import React, { useState, useEffect } from 'react'; -import { Card, Row, Col, Progress, Badge, Table, Tag, Button, Space } from 'antd'; -import { - CheckCircleOutlined, - CloseCircleOutlined, - SyncOutlined, - ReloadOutlined, - DatabaseOutlined, - ApiOutlined, - CloudServerOutlined, - ThunderboltOutlined, -} from '@ant-design/icons'; -import './Admin.css'; - -const SystemMonitor: React.FC = () => { - const [refreshTime, setRefreshTime] = useState(new Date()); - - // 模拟实时数据 - const [systemMetrics, setSystemMetrics] = useState({ - cpu: 35, - memory: 62, - disk: 48, - network: 28, - }); - - // 服务健康状态 - const services = [ - { name: 'API 服务', status: 'healthy', uptime: '99.98%', responseTime: '45ms' }, - { name: 'PostgreSQL', status: 'healthy', uptime: '99.99%', responseTime: '8ms' }, - { name: 'Redis', status: 'healthy', uptime: '99.97%', responseTime: '2ms' }, - { name: 'Celery Worker', status: 'healthy', uptime: '99.95%', responseTime: '-' }, - { name: 'Object Storage', status: 'warning', uptime: '99.85%', responseTime: '120ms' }, - ]; - - // API 请求统计 - const apiStats = [ - { endpoint: 'POST /api/v1/auth/login', requests: 15420, avgTime: '48ms', errors: 12 }, - { endpoint: 'GET /api/v1/projects', requests: 89340, avgTime: '32ms', errors: 5 }, - { endpoint: 'POST /api/v1/projects', requests: 6780, avgTime: '156ms', errors: 8 }, - { endpoint: 'GET /api/v1/assets', requests: 124560, avgTime: '68ms', errors: 23 }, - { endpoint: 'POST /api/v1/subscriptions/subscribe', requests: 234, avgTime: '890ms', errors: 2 }, - ]; - - // 错误日志 - const recentErrors = [ - { time: '2024-06-17 16:45:32', level: 'ERROR', service: 'API', message: 'Database connection timeout' }, - { time: '2024-06-17 16:42:15', level: 'WARN', service: 'Object Storage', message: 'Slow response detected (>1s)' }, - { time: '2024-06-17 16:38:41', level: 'ERROR', service: 'Celery', message: 'Task retry limit exceeded' }, - ]; - - const serviceColumns = [ - { - title: '服务名称', - dataIndex: 'name', - key: 'name', - render: (text: string) => <> {text}, - }, - { - title: '状态', - dataIndex: 'status', - key: 'status', - render: (status: string) => { - const config: Record = { - healthy: { color: 'success', icon: , text: '正常' }, - warning: { color: 'warning', icon: , text: '警告' }, - error: { color: 'error', icon: , text: '故障' }, - }; - const { color, text } = config[status] || config.healthy; - return ; - }, - }, - { title: '可用性', dataIndex: 'uptime', key: 'uptime' }, - { title: '响应时间', dataIndex: 'responseTime', key: 'responseTime' }, - ]; - - const apiColumns = [ - { title: 'API 端点', dataIndex: 'endpoint', key: 'endpoint' }, - { title: '请求数', dataIndex: 'requests', key: 'requests', sorter: (a: any, b: any) => a.requests - b.requests }, - { title: '平均响应时间', dataIndex: 'avgTime', key: 'avgTime' }, - { - title: '错误数', - dataIndex: 'errors', - key: 'errors', - render: (errors: number) => ( - 10 ? 'xx-tag error' : errors > 5 ? 'xx-tag warning' : 'xx-tag success'}>{errors} - ), - }, - ]; - - const errorColumns = [ - { title: '时间', dataIndex: 'time', key: 'time', width: 180 }, - { - title: '级别', - dataIndex: 'level', - key: 'level', - width: 100, - render: (level: string) => ( - {level} - ), - }, - { title: '服务', dataIndex: 'service', key: 'service', width: 120 }, - { title: '错误信息', dataIndex: 'message', key: 'message' }, - ]; - - const refreshMetrics = () => { - setSystemMetrics({ - cpu: Math.floor(Math.random() * 30) + 30, - memory: Math.floor(Math.random() * 20) + 55, - disk: Math.floor(Math.random() * 10) + 45, - network: Math.floor(Math.random() * 40) + 20, - }); - setRefreshTime(new Date()); - }; - - // 模拟实时更新 - useEffect(() => { - const interval = setInterval(refreshMetrics, 5000); - return () => clearInterval(interval); - }, []); - - const getProgressColor = (value: number) => { - if (value > 80) return '#ef4444'; - if (value > 60) return '#f59e0b'; - return '#10b981'; - }; - - const getProgressClass = (value: number) => { - if (value > 80) return 'xx-progress-warning'; - if (value > 60) return 'xx-progress-warning'; - return 'xx-progress-success'; - }; - - const resourceMetrics = [ - { key: 'cpu', label: 'CPU 使用率', value: systemMetrics.cpu, icon: , bg: 'linear-gradient(135deg, #6366f1, #4f46e5)' }, - { key: 'memory', label: '内存使用率', value: systemMetrics.memory, icon: , bg: 'linear-gradient(135deg, #34d399, #10b981)' }, - { key: 'disk', label: '磁盘使用率', value: systemMetrics.disk, icon: , bg: 'linear-gradient(135deg, #fbbf24, #f59e0b)' }, - { key: 'network', label: '网络使用率', value: systemMetrics.network, icon: , bg: 'linear-gradient(135deg, #a78bfa, #8b5cf6)' }, - ]; - - return ( -
-
-
-

系统监控

-

服务器资源、服务健康与 API 统计

-
-
- - 上次更新: {refreshTime.toLocaleTimeString()} - - -
-
- - {/* 系统资源监控 */} - - {resourceMetrics.map((metric) => ( -
-
-
- {metric.icon} -
-
{metric.label}
- -
- - ))} - - - {/* 服务健康状态 */} -
- -
- - - - {/* API 请求统计 */} -
- -
- - - - {/* 最近错误 */} -
- -
- - - - ); -}; - -export default SystemMonitor; - -export const Component = SystemMonitor; diff --git a/apps/web/src/pages/admin/UserManagement.tsx b/apps/web/src/pages/admin/UserManagement.tsx deleted file mode 100644 index 18d3ac53b..000000000 --- a/apps/web/src/pages/admin/UserManagement.tsx +++ /dev/null @@ -1,117 +0,0 @@ -/** - * Admin 用户管理页面 - */ -import React from 'react'; -import { Table, Button, Space, Tag, Input, Card } from 'antd'; -import { SearchOutlined, LockOutlined, UnlockOutlined } from '@ant-design/icons'; -import './Admin.css'; - -const { Search } = Input; - -const UserManagement: React.FC = () => { - // 模拟数据 - const users = [ - { - id: '1', - username: 'user1', - email: 'user1@example.com', - is_email_verified: true, - status: 'active', - created_at: '2024-01-15', - }, - { - id: '2', - username: 'user2', - email: 'user2@example.com', - is_email_verified: false, - status: 'active', - created_at: '2024-02-20', - }, - ]; - - const columns = [ - { - title: '用户名', - dataIndex: 'username', - key: 'username', - }, - { - title: '邮箱', - dataIndex: 'email', - key: 'email', - }, - { - title: '邮箱验证', - dataIndex: 'is_email_verified', - key: 'is_email_verified', - render: (verified: boolean) => ( - - {verified ? '已验证' : '未验证'} - - ), - }, - { - title: '状态', - dataIndex: 'status', - key: 'status', - render: (status: string) => ( - - {status === 'active' ? '正常' : '已封禁'} - - ), - }, - { - title: '注册时间', - dataIndex: 'created_at', - key: 'created_at', - }, - { - title: '操作', - key: 'action', - render: (_: any, record: any) => ( - - - - - ), - }, - ]; - - return ( -
-
-

用户管理

-

管理系统用户与账户状态

-
- -
- -
- } - className="xx-search-input" - style={{ width: 320 }} - /> -
-
- - - - ); -}; - -export default UserManagement; - -export const Component = UserManagement; diff --git a/apps/web/src/pages/profile/AccountSecurity.tsx b/apps/web/src/pages/profile/AccountSecurity.tsx deleted file mode 100644 index 416f975e2..000000000 --- a/apps/web/src/pages/profile/AccountSecurity.tsx +++ /dev/null @@ -1,111 +0,0 @@ -/** - * 账号安全设置页面 - */ -import React from 'react'; -import { Form, Input, Button, Alert } from 'antd'; -import { LockOutlined, MailOutlined } from '@ant-design/icons'; -import './ProfileSettings.css'; - -const AccountSecurity: React.FC = () => { - const [passwordForm] = Form.useForm(); - const [emailForm] = Form.useForm(); - - const onPasswordSubmit = () => undefined; - - const onEmailSubmit = () => undefined; - - - return ( -
-
-

修改密码

- -
- - } /> - - - - } /> - - - ({ - validator(_, value) { - if (!value || getFieldValue('newPassword') === value) { - return Promise.resolve(); - } - return Promise.reject(new Error('两次输入的密码不一致')); - }, - }), - ]} - > - } /> - - - - - - -
- -
-

修改邮箱

-
- - } /> - - - - } /> - - - - - - -
-
- ); -}; - -export default AccountSecurity; - -export const Component = AccountSecurity; diff --git a/apps/web/src/pages/profile/NotificationSettings.tsx b/apps/web/src/pages/profile/NotificationSettings.tsx deleted file mode 100644 index ddf52ccec..000000000 --- a/apps/web/src/pages/profile/NotificationSettings.tsx +++ /dev/null @@ -1,96 +0,0 @@ -/** - * 通知设置页面 - */ -import React from 'react'; -import { Form, Switch, Button, Divider, Alert } from 'antd'; -import './ProfileSettings.css'; - - -const NotificationSettings: React.FC = () => { - const [form] = Form.useForm(); - - const onFinish = () => undefined; - - - return ( -
-
- -
-

邮件通知

- - - - - - -

通知类型

- - - - - - - - - - - - - - -

营销

- - - - - - - - -
-
- ); -}; - -export default NotificationSettings; - -export const Component = NotificationSettings; diff --git a/apps/web/src/pages/profile/SessionManagement.tsx b/apps/web/src/pages/profile/SessionManagement.tsx deleted file mode 100644 index 03b39126a..000000000 --- a/apps/web/src/pages/profile/SessionManagement.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; -import { Result } from 'antd'; -import './ProfileSettings.css'; - -const SessionManagement: React.FC = () => { - return ( -
-
- -
-
- ); -}; - -export default SessionManagement; - -export const Component = SessionManagement; diff --git a/apps/web/src/pages/workspace/WorkspaceDetail.tsx b/apps/web/src/pages/workspace/WorkspaceDetail.tsx deleted file mode 100644 index c69efc974..000000000 --- a/apps/web/src/pages/workspace/WorkspaceDetail.tsx +++ /dev/null @@ -1,196 +0,0 @@ -/** - * 工作空间详情页面 - */ -import React, { useState } from 'react'; -import { useParams, useNavigate } from 'react-router-dom'; -import { Tabs, Button, Descriptions, Card, List, Modal, Form, Input, message, Alert } from 'antd'; -import { PlusOutlined, TeamOutlined } from '@ant-design/icons'; -import { useWorkspace } from '@/hooks/useWorkspace'; -import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; -import { createProject, getProjects } from '@/api/projects'; -import MemberList from '@/components/business/MemberList'; -import InviteMemberModal from '@/components/business/InviteMemberModal'; -import PermissionMatrix from '@/components/business/PermissionMatrix'; - -const WorkspaceDetail: React.FC = () => { - const { id } = useParams<{ id: string }>(); - const navigate = useNavigate(); - const { data: workspace, isLoading } = useWorkspace(id!); - const queryClient = useQueryClient(); - const [inviteModalOpen, setInviteModalOpen] = useState(false); - const [createProjectOpen, setCreateProjectOpen] = useState(false); - const [projectForm] = Form.useForm<{ name: string; description?: string }>(); - - const projectsQuery = useQuery({ - queryKey: ['projects', id], - queryFn: () => getProjects(), - enabled: !!id, - }); - - const createProjectMutation = useMutation({ - mutationFn: createProject, - onSuccess: (project) => { - message.success('项目创建成功'); - setCreateProjectOpen(false); - projectForm.resetFields(); - queryClient.invalidateQueries({ queryKey: ['projects', id] }); - navigate(`/projects/${project.id}/assets`, { state: { workspaceId: id } }); - }, - onError: (error: any) => { - message.error(error.response?.data?.detail || '项目创建失败，请稍后重试'); - }, - }); - - const handleCreateProject = async () => { - const values = await projectForm.validateFields(); - createProjectMutation.mutate({ - name: values.name, - description: values.description || '', - }); - }; - - if (isLoading) return
加载中...
; - if (!workspace) return
工作空间不存在
; - - const items = [ - { - key: 'overview', - label: '概览', - children: ( -
- setCreateProjectOpen(true)}> - 创建项目 - - } - > - - {workspace.name} - {workspace.subscription_plan} - {workspace.subscription_status} - - {workspace.created_at - ? new Date(workspace.created_at).toLocaleDateString() - : '暂未返回'} - - - - - - {projectsQuery.isError && ( - - )} - ( - navigate(`/projects/${project.id}/assets`, { state: { workspaceId: id } })}> - 素材管理 - , - , - , - , - , - ]} - > - - - )} - /> - - - -
- ), - }, - { - key: 'members', - label: ( - <> - 成员管理 - - ), - children: ( -
-
- -
- -
- -
-
- ), - }, - { - key: 'settings', - label: '设置', - children:
工作空间设置（待开发）
, - }, - ]; - - return ( -
-

{workspace.name}

- - setCreateProjectOpen(false)} - > -
- - - - - - - - - setInviteModalOpen(false)} - /> -
- ); -}; - -export default WorkspaceDetail; -export const Component = WorkspaceDetail; diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 00cd71085..0bd7d8a4a 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -17,8 +17,8 @@ /* Linting */ "strict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, + "noUnusedLocals": true, + "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, /* Path alias */ diff --git a/apps/worker/worker_app/tasks/generation.py b/apps/worker/worker_app/tasks/generation.py index 7dd822a2a..5bf7e4fb0 100755 --- a/apps/worker/worker_app/tasks/generation.py +++ b/apps/worker/worker_app/tasks/generation.py @@ -138,17 +138,9 @@ def _download_library_assets( # 导入模型和会话 try: from packages.adapters.sqlalchemy_impl.models import AssetModel - from sqlalchemy import create_engine - from sqlalchemy.orm import sessionmaker + from worker_app.db import SessionLocal - db_url = os.getenv("DATABASE_URL") - if not db_url: - logger.warning("DATABASE_URL not set, cannot fetch assets") - return [] - - engine = create_engine(db_url) - Session = sessionmaker(bind=engine) - session = Session() + session = SessionLocal() try: # 查询素材库中的视频素材 -- 2.54.0 From 95fbf520495b91f92ecf76108f32ee4814fe4808 Mon Sep 17 00:00:00 2001 From: CI Test Date: Sun, 28 Jun 2026 10:26:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix(P2-1):=20EditingMode=20=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E6=94=B9=E4=B8=BA=E4=BB=8E=20packages.domain=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=B6=88=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/worker/video_processing/editing_modes.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/worker/video_processing/editing_modes.py b/apps/worker/video_processing/editing_modes.py index 3232d0aa0..8d1b03033 100644 --- a/apps/worker/video_processing/editing_modes.py +++ b/apps/worker/video_processing/editing_modes.py @@ -15,13 +15,8 @@ from typing import Optional logger = logging.getLogger(__name__) -class EditingMode(StrEnum): - """剪辑模式枚举""" - - ONE_TAKE = "one_take" # 一镜到底：顺序拼接+转场 - PIP = "pip" # 画中画：主视频+叠加 - VOICE_OVER = "voice_over" # 口播：背景画面+配音 - VOICE_PIP = "voice_pip" # 口播+画中画 +# 从 domain 层导入 EditingMode，避免重复定义 +from packages.domain.edit_plan import EditingMode class PIPPosition(StrEnum): -- 2.54.0 From 095e3b5d0031e3e7a97d5a2fa1ea4e82a6ebd475 Mon Sep 17 00:00:00 2001 From: CI Test Date: Sun, 28 Jun 2026 10:26:28 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix(P2-2):=20SMTP=5FFRON=5FNAME=20=E6=8B=BC?= =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3=E4=B8=BA=20SMTP?= =?UTF-8?q?=5FFROM=5FNAME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/app/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/app/config.py b/apps/api/app/config.py index b587cf4cc..811decbcc 100755 --- a/apps/api/app/config.py +++ b/apps/api/app/config.py @@ -72,7 +72,7 @@ class Settings(BaseSettings): SMTP_USER: str = "" SMTP_PASSWORD: str = "" SMTP_FROM_EMAIL: str = "" - SMTP_FRON_NAME: str = "小虾 SaaS" + SMTP_FROM_NAME: str = "小虾 SaaS" SMTP_USE_TLS: bool = True CELERY_BROKER_URL: str = "redis://localhost:6379/0" -- 2.54.0 From 9c287145a12f42e63038ea04d7489ade51a2f4a3 Mon Sep 17 00:00:00 2001 From: CI Test Date: Sun, 28 Jun 2026 10:26:52 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix(P2-3):=20UserModel=20=E9=85=8D=E9=A2=9D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20max=5Fprojects/max=5Fstorage=5Fgb/used=5Fs?= =?UTF-8?q?torage=5Fgb=20=E4=BB=8E=20Float=20=E6=94=B9=E4=B8=BA=20Integer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/adapters/sqlalchemy_impl/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/adapters/sqlalchemy_impl/models.py b/packages/adapters/sqlalchemy_impl/models.py index c317558db..728fef3e8 100755 --- a/packages/adapters/sqlalchemy_impl/models.py +++ b/packages/adapters/sqlalchemy_impl/models.py @@ -25,9 +25,9 @@ class UserModel(Base): subscription_status = Column(String(20), nullable=False, default="active") subscription_expires_at = Column(DateTime, nullable=True) # 配额限制 (移到 User 级别) - max_projects = Column(Float, nullable=False, default=3) - max_storage_gb = Column(Float, nullable=False, default=10) - used_storage_gb = Column(Float, nullable=False, default=0.0) + max_projects = Column(Integer, nullable=False, default=3) + max_storage_gb = Column(Integer, nullable=False, default=10) + used_storage_gb = Column(Integer, nullable=False, default=0) created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc)) -- 2.54.0 From ec96feee22b149176a33824b77f94f4bddc24177 Mon Sep 17 00:00:00 2001 From: CI Test Date: Sun, 28 Jun 2026 10:30:09 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix(deploy):=20Worker=20=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E5=86=85=E5=AD=98=E9=99=90=E5=88=B6=E4=BB=8E=204G=20=E9=99=8D?= =?UTF-8?q?=E8=87=B3=202G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Worker 实际内存使用仅 ~156MiB，4G 限制远超需求 - 业务服务器总内存仅 1.7Gi，过高限制影响其他容器 - 2G 限制已足够应对视频处理峰值需求 --- infra/docker/compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/docker/compose.yml b/infra/docker/compose.yml index cb09d1140..d90fbbcd8 100644 --- a/infra/docker/compose.yml +++ b/infra/docker/compose.yml @@ -116,7 +116,7 @@ services: resources: limits: cpus: '2.0' - memory: 4G + memory: 2G reservations: cpus: '0.5' memory: 1G -- 2.54.0 From 5c46fe648d03c8ca99397d55e540e253c8c43897 Mon Sep 17 00:00:00 2001 From: CI Test Date: Sun, 28 Jun 2026 10:34:00 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix(frontend):=20=E6=B7=B1=E5=BA=A6?= =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5=20-=20=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=AD=BB=E4=BB=A3=E7=A0=81=E5=92=8C=E4=BF=AE=E5=A4=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除未使用的API模块: projects.ts, generation.ts, subscription.ts, projectTitles.ts - 删除未使用的业务组件: InviteMemberModal.tsx, MemberList.tsx, PermissionMatrix.tsx - 删除未引用的布局组件: Sidebar.tsx - 删除未引用的状态管理: uiStore.ts - 修复 business.css 中残留的git合并冲突标记 - 移除 business.css 中重复的注释行 所有删除的文件均经过引用检查,确认无任何页面/组件/hook引用 --- apps/web/src/api/generation.ts | 77 ----------- apps/web/src/api/projectTitles.ts | 28 ---- apps/web/src/api/projects.ts | 27 ---- apps/web/src/api/subscription.ts | 64 --------- .../components/business/InviteMemberModal.tsx | 80 ----------- .../src/components/business/MemberList.tsx | 129 ------------------ .../components/business/PermissionMatrix.tsx | 100 -------------- apps/web/src/components/business/business.css | 10 -- apps/web/src/components/layout/Sidebar.tsx | 107 --------------- apps/web/src/store/uiStore.ts | 32 ----- 10 files changed, 654 deletions(-) delete mode 100644 apps/web/src/api/generation.ts delete mode 100644 apps/web/src/api/projectTitles.ts delete mode 100644 apps/web/src/api/projects.ts delete mode 100644 apps/web/src/api/subscription.ts delete mode 100644 apps/web/src/components/business/InviteMemberModal.tsx delete mode 100644 apps/web/src/components/business/MemberList.tsx delete mode 100644 apps/web/src/components/business/PermissionMatrix.tsx delete mode 100644 apps/web/src/components/layout/Sidebar.tsx delete mode 100644 apps/web/src/store/uiStore.ts diff --git a/apps/web/src/api/generation.ts b/apps/web/src/api/generation.ts deleted file mode 100644 index 536166dda..000000000 --- a/apps/web/src/api/generation.ts +++ /dev/null @@ -1,77 +0,0 @@ -/** - * 视频生成 API - */ -import apiClient from "./client"; -import type { EditingMode } from "./editPlans"; - -export interface GenerationTaskItem { - id: string; - project_id: string; - asset_library_id: string; - strategy_id?: string | null; - voice_library_id?: string | null; - edit_plan_id?: string | null; - editing_mode?: EditingMode; - status: "pending" | "running" | "completed" | "failed" | "cancelled"; - progress: number; - result_count: number; - error_message?: string | null; - created_at?: string; - updated_at?: string; -} - -export interface GeneratedVideoItem { - id: string; - project_id: string; - generation_task_id: string; - name: string; - file_url: string; - file_size: number; - duration: number; - thumbnail_url?: string | null; - width: number; - height: number; - fps: number; - status?: string; - review_status?: "pending_review" | "approved" | "rejected"; - generation_params?: Record; - editing_mode?: EditingMode; -} - -export const createGenerationTask = async (data: { - project_id: string; - asset_library_id: string; - strategy_id?: string; - voice_library_id?: string; - edit_plan_id?: string; - editing_mode?: EditingMode; - created_by_user_id?: string; -}): Promise => { - const response = await apiClient.post("/generation/tasks", data); - return response.data; -}; - -export const getGenerationTask = async (taskId: string): Promise => { - const response = await apiClient.get(`/generation/tasks/${taskId}`); - return response.data; -}; - -export const getGenerationResults = async (taskId: string): Promise => { - const response = await apiClient.get(`/generation/tasks/${taskId}/results`); - return response.data.items; -}; - -export const getGeneratedVideos = async (projectId: string): Promise => { - const response = await apiClient.get("/generated-videos", { params: { project_id: projectId } }); - return response.data.items; -}; - -export const updateGeneratedVideoReviewStatus = async (videoId: string, reviewStatus: "pending_review" | "approved" | "rejected"): Promise => { - const response = await apiClient.patch(`/generated-videos/${videoId}/review`, { review_status: reviewStatus }); - return response.data; -}; - -export const getGeneratedVideoDownloadUrl = async (videoId: string): Promise => { - const response = await apiClient.get(`/generated-videos/${videoId}/download-url`); - return response.data.download_url; -}; diff --git a/apps/web/src/api/projectTitles.ts b/apps/web/src/api/projectTitles.ts deleted file mode 100644 index 753605a63..000000000 --- a/apps/web/src/api/projectTitles.ts +++ /dev/null @@ -1,28 +0,0 @@ -import apiClient from './client'; - -export interface ProjectTitleItem { - id: string; - project_id: string; - text: string; - category: 'default' | 'marketing' | 'tutorial' | 'story' | 'promo'; - favorite: boolean; - usage_count: number; - is_active: boolean; - created_at: string; - updated_at: string; -} - -export const getProjectTitles = async (projectId: string, activeOnly = false): Promise => { - const response = await apiClient.get(`/projects/${projectId}/titles`, { params: { active_only: activeOnly } }); - return response.data.items; -}; - -export const createProjectTitle = async (projectId: string, data: { text: string; category?: ProjectTitleItem['category']; favorite?: boolean }): Promise => { - const response = await apiClient.post(`/projects/${projectId}/titles`, data); - return response.data; -}; - -export const updateProjectTitle = async (titleId: string, data: { text?: string; category?: ProjectTitleItem['category']; favorite?: boolean; is_active?: boolean }): Promise => { - const response = await apiClient.patch(`/project-titles/${titleId}`, data); - return response.data; -}; diff --git a/apps/web/src/api/projects.ts b/apps/web/src/api/projects.ts deleted file mode 100644 index ea1195de2..000000000 --- a/apps/web/src/api/projects.ts +++ /dev/null @@ -1,27 +0,0 @@ -import apiClient from './client'; - -export interface ProjectItem { - id: string; - name: string; - description: string; -} - -export interface CreateProjectRequest { - name: string; - description?: string; -} - -export const getProject = async (projectId: string): Promise => { - const response = await apiClient.get(`/projects/${projectId}`); - return response.data; -}; - -export const getProjects = async (): Promise => { - const response = await apiClient.get('/projects'); - return response.data.items; -}; - -export const createProject = async (data: CreateProjectRequest): Promise => { - const response = await apiClient.post('/projects', data); - return response.data; -}; diff --git a/apps/web/src/api/subscription.ts b/apps/web/src/api/subscription.ts deleted file mode 100644 index 8bab2c8ca..000000000 --- a/apps/web/src/api/subscription.ts +++ /dev/null @@ -1,64 +0,0 @@ -/** - * 订阅相关 API - */ -import apiClient from './client'; - -// 类型定义 -export interface SubscriptionPlan { - name: 'free' | 'pro' | 'enterprise'; - display_name: string; - price: number; - currency: string; - max_projects: number; - max_storage_gb: number; - features: string[]; -} - -export interface QuotaStatus { - projects: { - used: number; - limit: number; - status: 'normal' | 'warning' | 'critical' | 'exceeded'; - }; - storage: { - used_gb: number; - limit_gb: number; - status: 'normal' | 'warning' | 'critical' | 'exceeded'; - }; -} - -// 获取所有订阅计划 -export const getPlans = async (): Promise => { - const response = await apiClient.get('/subscriptions/plans'); - return response.data; -}; - -// 获取当前订阅 -export const getCurrentSubscription = async ( - ): Promise => { - const response = await apiClient.get('/subscription'); - return response.data; -}; - -// 升级订阅 -export const upgradeSubscription = async ( - plan: 'pro' | 'enterprise' -): Promise<{ message: string }> => { - const response = await apiClient.post('/subscription/upgrade', { - plan, - }); - return response.data; -}; - -// 取消订阅 -export const cancelSubscription = async ( - ): Promise<{ message: string }> => { - const response = await apiClient.post('/subscription/cancel'); - return response.data; -}; - -// 获取配额状态 -export const getQuotaStatus = async (): Promise => { - const response = await apiClient.get('/quota'); - return response.data; -}; diff --git a/apps/web/src/components/business/InviteMemberModal.tsx b/apps/web/src/components/business/InviteMemberModal.tsx deleted file mode 100644 index 0b8d98a47..000000000 --- a/apps/web/src/components/business/InviteMemberModal.tsx +++ /dev/null @@ -1,80 +0,0 @@ -/** - * 邀请成员弹窗 - */ -import React from 'react'; -import { Modal, Form, Input, Select, message } from 'antd'; -import { useInviteMember } from '@/hooks/useWorkspace'; - -interface InviteMemberModalProps { - workspaceId: string; - open: boolean; - onClose: () => void; -} - -const InviteMemberModal: React.FC = ({ - workspaceId, - open, - onClose, -}) => { - const [form] = Form.useForm(); - const inviteMutation = useInviteMember(workspaceId); - - const handleOk = async () => { - try { - const values = await form.validateFields(); - await inviteMutation.mutateAsync(values); - message.success('邀请已发送！'); - form.resetFields(); - onClose(); - } catch (error) { - // 验证失败或请求失败 - } - }; - - const handleCancel = () => { - form.resetFields(); - onClose(); - }; - - return ( - -
- - - - - - - updateRoleMutation.mutate({ memberId: record.id, role: newRole }) - } - options={[ - { value: 'admin', label: '管理员' }, - { value: 'member', label: '成员' }, - { value: 'viewer', label: '访客' }, - ]} - /> - ); - }, - }, - { - title: '加入时间', - dataIndex: 'joined_at', - key: 'joined_at', - render: (date: string) => new Date(date).toLocaleDateString(), - }, - { - title: '操作', - key: 'action', - render: (_: any, record: any) => { - if (record.role === 'owner') { - return -; - } - return ( - - removeMutation.mutate(record.id)} - okText="确定" - cancelText="取消" - > - - - - ); - }, - }, - ]; - - return ( -
- ); -}; - -export default MemberList; diff --git a/apps/web/src/components/business/PermissionMatrix.tsx b/apps/web/src/components/business/PermissionMatrix.tsx deleted file mode 100644 index 97cad565f..000000000 --- a/apps/web/src/components/business/PermissionMatrix.tsx +++ /dev/null @@ -1,100 +0,0 @@ -/** - * 权限矩阵展示组件 - V21 UI - */ -import React from 'react'; -import { Card, Table } from 'antd'; -import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; -import './business.css'; - -const PermissionMatrix: React.FC = () => { - const permissions = [ - { action: '查看工作空间', owner: true, admin: true, member: true, viewer: true }, - { action: '创建项目', owner: true, admin: true, member: true, viewer: false }, - { action: '编辑项目', owner: true, admin: true, member: true, viewer: false }, - { action: '删除项目', owner: true, admin: true, member: false, viewer: false }, - { action: '邀请成员', owner: true, admin: true, member: false, viewer: false }, - { action: '移除成员', owner: true, admin: true, member: false, viewer: false }, - { action: '修改成员角色', owner: true, admin: true, member: false, viewer: false }, - { action: '升级订阅', owner: true, admin: false, member: false, viewer: false }, - { action: '删除工作空间', owner: true, admin: false, member: false, viewer: false }, - ]; - - const columns = [ - { - title: '操作', - dataIndex: 'action', - key: 'action', - fixed: 'left' as const, - width: 160, - render: (text: string) => {text}, - }, - { - title: '拥有者', - dataIndex: 'owner', - key: 'owner', - align: 'center' as const, - width: 100, - render: (value: boolean) => - value ? ( - - ) : ( - - ), - }, - { - title: '管理员', - dataIndex: 'admin', - key: 'admin', - align: 'center' as const, - width: 100, - render: (value: boolean) => - value ? ( - - ) : ( - - ), - }, - { - title: '成员', - dataIndex: 'member', - key: 'member', - align: 'center' as const, - width: 100, - render: (value: boolean) => - value ? ( - - ) : ( - - ), - }, - { - title: '访客', - dataIndex: 'viewer', - key: 'viewer', - align: 'center' as const, - width: 100, - render: (value: boolean) => - value ? ( - - ) : ( - - ), - }, - ]; - - return ( - -
-
- - - ); -}; - -export default PermissionMatrix; diff --git a/apps/web/src/components/business/business.css b/apps/web/src/components/business/business.css index f29d55f8d..fff1897e2 100644 --- a/apps/web/src/components/business/business.css +++ b/apps/web/src/components/business/business.css @@ -89,7 +89,6 @@ overflow: hidden; } -<<<<<<< HEAD /* 表格包装器 */ .xx-table-wrapper { border-radius: 16px; @@ -223,7 +222,6 @@ box-shadow: 0 8px 24px rgba(79,70,229,0.1); } -<<<<<<< HEAD /* ==================== 进度条 ==================== */ .xx-progress { margin-top: 12px; @@ -231,7 +229,6 @@ /* ==================== Ant Design 覆盖样式 ==================== */ /* Table overrides */ -/* ==================== Ant Design 覆盖样式 ==================== */ .ant-table-wrapper .ant-table-thead > tr > th { background: #f8fafc !important; font-weight: 700 !important; @@ -249,7 +246,6 @@ background: #fafbfc !important; } -<<<<<<< HEAD /* Card overrides */ .ant-card { border-radius: 22px !important; @@ -272,7 +268,6 @@ padding: 20px 24px !important; } -<<<<<<< HEAD /* Modal overrides */ .ant-modal-content { border-radius: 22px !important; @@ -298,7 +293,6 @@ padding: 16px 24px !important; } -<<<<<<< HEAD /* Button overrides */ .ant-btn-primary { background: linear-gradient(135deg, #6366f1, #4f46e5) !important; @@ -316,7 +310,6 @@ transform: translateY(-1px); } -<<<<<<< HEAD /* Tag overrides */ .ant-tag { border-radius: 10px !important; @@ -324,7 +317,6 @@ font-weight: 500 !important; } -<<<<<<< HEAD /* Select overrides */ .ant-select-selector { border-radius: 14px !important; @@ -340,7 +332,6 @@ box-shadow: 0 0 0 3px rgba(79,70,229,0.1) !important; } -<<<<<<< HEAD /* Input overrides */ .ant-input { border-radius: 14px !important; @@ -357,7 +348,6 @@ box-shadow: 0 0 0 3px rgba(79,70,229,0.1) !important; } -<<<<<<< HEAD /* Progress overrides */ .ant-progress-inner { background: #f1f5f9 !important; diff --git a/apps/web/src/components/layout/Sidebar.tsx b/apps/web/src/components/layout/Sidebar.tsx deleted file mode 100644 index 88fd13ca8..000000000 --- a/apps/web/src/components/layout/Sidebar.tsx +++ /dev/null @@ -1,107 +0,0 @@ -/** - * 侧边栏导航 - */ -import React from 'react'; -import { Layout, Menu } from 'antd'; -import { - HomeOutlined, - AppstoreOutlined, - TeamOutlined, - CrownOutlined, - UserOutlined, - DashboardOutlined, -} from '@ant-design/icons'; -import { useNavigate, useLocation } from 'react-router-dom'; -import type { MenuProps } from 'antd'; - -const { Sider } = Layout; - -interface SidebarProps { - collapsed: boolean; -} - -const Sidebar: React.FC = ({ collapsed }) => { - const navigate = useNavigate(); - const location = useLocation(); - - const menuItems: MenuProps['items'] = [ - { - key: '/', - icon: , - label: '首页', - onClick: () => navigate('/'), - }, - { - key: '/projects', - icon: , - label: '项目', - disabled: true, - }, - { - key: '/members', - icon: , - label: '成员管理', - disabled: true, - }, - { - key: '/subscription', - icon: , - label: '订阅管理', - onClick: () => navigate('/subscription'), - }, - { - key: '/admin', - icon: , - label: 'Admin（暂未开放）', - disabled: true, - }, - { - key: '/profile', - icon: , - label: '个人中心', - onClick: () => navigate('/profile'), - }, - ]; - - // 根据当前路径选中菜单项 - const selectedKey = '/' + location.pathname.split('/')[1]; - - return ( - -
- {collapsed ? '🦐' : '小虾 SaaS'} -
- - - ); -}; - -export default Sidebar; diff --git a/apps/web/src/store/uiStore.ts b/apps/web/src/store/uiStore.ts deleted file mode 100644 index b02933d13..000000000 --- a/apps/web/src/store/uiStore.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * UI 状态管理 - * 管理全局 UI 状态（侧边栏、加载状态等） - */ -import { create } from 'zustand'; - -interface UIState { - sidebarCollapsed: boolean; - loading: boolean; - - // Actions - toggleSidebar: () => void; - setSidebarCollapsed: (collapsed: boolean) => void; - setLoading: (loading: boolean) => void; -} - -export const useUIStore = create((set) => ({ - sidebarCollapsed: false, - loading: false, - - toggleSidebar: () => { - set((state) => ({ sidebarCollapsed: !state.sidebarCollapsed })); - }, - - setSidebarCollapsed: (collapsed) => { - set({ sidebarCollapsed: collapsed }); - }, - - setLoading: (loading) => { - set({ loading }); - }, -})); -- 2.54.0