feat(admin): Add user management and upgrade to module permission system
Features - User Management (Phase 4.1): - Database: Add user_modules table for fine-grained module permissions - Database: Add 4 user permissions (view/create/edit/delete) to role_permissions - Backend: UserService (780 lines) - CRUD with tenant isolation - Backend: UserController + UserRoutes (648 lines) - 13 API endpoints - Backend: Batch import users from Excel - Frontend: UserListPage (412 lines) - list/filter/search/pagination - Frontend: UserFormPage (341 lines) - create/edit with module config - Frontend: UserDetailPage (393 lines) - details/tenant/module management - Frontend: 3 modal components (592 lines) - import/assign/configure - API: GET/POST/PUT/DELETE /api/admin/users/* endpoints Architecture Upgrade - Module Permission System: - Backend: Add getUserModules() method in auth.service - Backend: Login API returns modules array in user object - Frontend: AuthContext adds hasModule() method - Frontend: Navigation filters modules based on user.modules - Frontend: RouteGuard checks requiredModule instead of requiredVersion - Frontend: Remove deprecated version-based permission system - UX: Only show accessible modules in navigation (clean UI) - UX: Smart redirect after login (avoid 403 for regular users) Fixes: - Fix UTF-8 encoding corruption in ~100 docs files - Fix pageSize type conversion in userService (String to Number) - Fix authUser undefined error in TopNavigation - Fix login redirect logic with role-based access check - Update Git commit guidelines v1.2 with UTF-8 safety rules Database Changes: - CREATE TABLE user_modules (user_id, tenant_id, module_code, is_enabled) - ADD UNIQUE CONSTRAINT (user_id, tenant_id, module_code) - INSERT 4 permissions + role assignments - UPDATE PUBLIC tenant with 8 module subscriptions Technical: - Backend: 5 new files (~2400 lines) - Frontend: 10 new files (~2500 lines) - Docs: 1 development record + 2 status updates + 1 guideline update - Total: ~4900 lines of code Status: User management 100% complete, module permission system operational
This commit is contained in:
@@ -2,31 +2,31 @@
|
||||
|
||||
**日期**: 2025-11-18
|
||||
**问题**: 前端模块加载失败
|
||||
**鐘舵€?*: 鉁?宸蹭慨澶?
|
||||
**状态**: ✅ 已修复
|
||||
|
||||
---
|
||||
|
||||
## 🐛 问题描述
|
||||
|
||||
### 閿欒<EFBFBD>1: React Query鏈<EFBFBD>厤缃?
|
||||
### 错误1: React Query未配置
|
||||
```
|
||||
Error: No QueryClient set, use QueryClientProvider to set one
|
||||
```
|
||||
|
||||
**鍘熷洜**: 涓诲簲鐢<EFBFBD>紙App.tsx锛夌己灏慲QueryClientProvider`閰嶇疆锛屽<E9949B>鑷碅SL妯″潡浣跨敤`useQuery` Hook鏃舵姤閿欍€?
|
||||
**原因**: 主应用(App.tsx)缺少`QueryClientProvider`配置,导致ASL模块使用`useQuery` Hook时报错。
|
||||
|
||||
### 错误2: Ant Design Spin警告
|
||||
```
|
||||
Warning: [antd: Spin] `tip` only work in nest or fullscreen pattern.
|
||||
```
|
||||
|
||||
**鍘熷洜**: Spin缁勪欢鐨刞tip`灞炴€у彧鍦ㄧ壒瀹氭ā寮忎笅鐢熸晥锛坄spinning={true}`鎴栧祵濂楁ā寮忥級銆?
|
||||
**原因**: Spin组件的`tip`属性只在特定模式下生效(`spinning={true}`或嵌套模式)。
|
||||
|
||||
---
|
||||
|
||||
## 鉁?淇<><E6B787>鏂规<E98F82>
|
||||
## ✅ 修复方案
|
||||
|
||||
### 1. 娣诲姞QueryClientProvider锛堜富搴旂敤锛?
|
||||
### 1. 添加QueryClientProvider(主应用)
|
||||
|
||||
**文件**: `frontend-v2/src/App.tsx`
|
||||
|
||||
@@ -41,7 +41,7 @@ const queryClient = new QueryClient({
|
||||
queries: {
|
||||
staleTime: 1000 * 60 * 5, // 5分钟
|
||||
gcTime: 1000 * 60 * 10, // 10分钟
|
||||
retry: 1, // 澶辫触閲嶈瘯1娆?
|
||||
retry: 1, // 失败重试1次
|
||||
refetchOnWindowFocus: false, // 窗口聚焦时不重新获取
|
||||
},
|
||||
},
|
||||
@@ -51,13 +51,13 @@ const queryClient = new QueryClient({
|
||||
function App() {
|
||||
return (
|
||||
<ConfigProvider locale={zhCN}>
|
||||
<QueryClientProvider client={queryClient}> {/* 猸?鏂板<E98F82> */}
|
||||
<QueryClientProvider client={queryClient}> {/* ⭐ 新增 */}
|
||||
<PermissionProvider>
|
||||
<BrowserRouter>
|
||||
{/* ... */}
|
||||
</BrowserRouter>
|
||||
</PermissionProvider>
|
||||
</QueryClientProvider> {/* 猸?鏂板<E98F82> */}
|
||||
</QueryClientProvider> {/* ⭐ 新增 */}
|
||||
</ConfigProvider>
|
||||
)
|
||||
}
|
||||
@@ -70,36 +70,36 @@ function App() {
|
||||
|
||||
---
|
||||
|
||||
### 2. 淇<EFBFBD><EFBFBD>Spin缁勪欢锛圓SL妯″潡锛?
|
||||
### 2. 修复Spin组件(ASL模块)
|
||||
|
||||
**文件**: `frontend-v2/src/modules/asl/index.tsx`
|
||||
|
||||
**修改内容**:
|
||||
```tsx
|
||||
// 淇<EFBFBD>敼鍓?
|
||||
<Spin size="large" tip="鍔犺浇涓?.." /> // 鉂?璀﹀憡
|
||||
// 修改前
|
||||
<Spin size="large" tip="加载中..." /> // ❌ 警告
|
||||
|
||||
// 淇<EFBFBD>敼鍚?
|
||||
<Spin size="large" /> // 鉁?姝g‘
|
||||
// 修改后
|
||||
<Spin size="large" /> // ✅ 正确
|
||||
```
|
||||
|
||||
**鍘熷洜**: Suspense鐨刦allback涓嶉渶瑕佹樉绀簍ip鏂囧瓧銆?
|
||||
**原因**: Suspense的fallback不需要显示tip文字。
|
||||
|
||||
---
|
||||
|
||||
## 🧪 验证结果
|
||||
|
||||
### 淇<EFBFBD><EFBFBD>鍚庢祴璇?
|
||||
1. 鉁?鍒锋柊娴忚<E5A8B4>鍣<EFBFBD>紝鏃犳姤閿?
|
||||
2. 鉁?鐐瑰嚮"AI鏅鸿兘鏂囩尞"锛屾<E9949B>甯歌繘鍏ラ」鐩<E3808D>垪琛ㄩ〉
|
||||
3. 鉁?鎺у埗鍙版棤璀﹀憡淇℃伅
|
||||
4. 鉁?React Query姝e父宸ヤ綔
|
||||
### 修复后测试
|
||||
1. ✅ 刷新浏览器,无报错
|
||||
2. ✅ 点击"AI智能文献",正常进入项目列表页
|
||||
3. ✅ 控制台无警告信息
|
||||
4. ✅ React Query正常工作
|
||||
|
||||
### 鎺у埗鍙拌緭鍑?
|
||||
### 控制台输出
|
||||
```
|
||||
鉁?No errors
|
||||
鉁?No warnings
|
||||
鉁?Application loaded successfully
|
||||
✅ No errors
|
||||
✅ No warnings
|
||||
✅ Application loaded successfully
|
||||
```
|
||||
|
||||
---
|
||||
@@ -107,17 +107,17 @@ function App() {
|
||||
## 📊 影响范围
|
||||
|
||||
### 受益模块
|
||||
鎵€鏈変娇鐢≧eact Query鐨勬ā鍧楅兘鍙<EFBFBD>互姝e父宸ヤ綔锛?
|
||||
- 鉁?**ASL妯″潡**锛圓I鏅鸿兘鏂囩尞锛? 涓昏<E6B693>鍙楃泭
|
||||
- 鉁?**AIA妯″潡**锛圓I闂<49>瓟锛? 鏈<>潵鍙<E6BDB5>娇鐢?
|
||||
- 鉁?**PKB妯″潡**锛堢煡璇嗗簱锛? 鏈<>潵鍙<E6BDB5>娇鐢?
|
||||
- 鉁?**鍏朵粬妯″潡** - 缁熶竴鐨勭姸鎬佺<EFBFBD>鐞嗘柟妗?
|
||||
所有使用React Query的模块都可以正常工作:
|
||||
- ✅ **ASL模块**(AI智能文献)- 主要受益
|
||||
- ✅ **AIA模块**(AI问答)- 未来可使用
|
||||
- ✅ **PKB模块**(知识库)- 未来可使用
|
||||
- ✅ **其他模块** - 统一的状态管理方案
|
||||
|
||||
### 鎶€鏈<EFBFBD>环鍊?
|
||||
### 技术价值
|
||||
1. **状态管理统一**: 所有模块使用React Query
|
||||
2. **鎬ц兘浼樺寲**: 鑷<EFBFBD>姩缂撳瓨銆佸幓閲嶈<EFBFBD>姹?
|
||||
3. **鐢ㄦ埛浣撻獙**: 鏇村ソ鐨凩oading鐘舵€佺<EFBFBD>鐞?
|
||||
4. **浠g爜璐ㄩ噺**: 鍑忓皯閲嶅<EFBFBD>鐨勭姸鎬佺<EFBFBD>鐞嗕唬鐮?
|
||||
2. **性能优化**: 自动缓存、去重请求
|
||||
3. **用户体验**: 更好的Loading状态管理
|
||||
4. **代码质量**: 减少重复的状态管理代码
|
||||
|
||||
---
|
||||
|
||||
@@ -134,11 +134,11 @@ const queryClient = new QueryClient({
|
||||
// 适合大多数场景,减少不必要的请求
|
||||
|
||||
gcTime: 1000 * 60 * 10,
|
||||
// 鍨冨溇鍥炴敹鏃堕棿锛?0鍒嗛挓鍚庢竻闄ょ紦瀛?
|
||||
// 淇濇寔鍚堢悊鐨勫唴瀛樹娇鐢?
|
||||
// 垃圾回收时间:10分钟后清除缓存
|
||||
// 保持合理的内存使用
|
||||
|
||||
retry: 1,
|
||||
// 澶辫触閲嶈瘯1娆?
|
||||
// 失败重试1次
|
||||
// 避免过多重试导致的性能问题
|
||||
|
||||
refetchOnWindowFocus: false,
|
||||
@@ -149,14 +149,14 @@ const queryClient = new QueryClient({
|
||||
})
|
||||
```
|
||||
|
||||
### 涓轰粈涔堥€夋嫨杩欎簺閰嶇疆锛?
|
||||
### 为什么选择这些配置?
|
||||
|
||||
| 閰嶇疆椤?| 鍊?| 鍘熷洜 |
|
||||
| 配置项 | 值 | 原因 |
|
||||
|-------|---|------|
|
||||
| `staleTime` | 5分钟 | 项目数据变化不频繁,减少重复请求 |
|
||||
| `gcTime` | 10鍒嗛挓 | 淇濇寔鍚堢悊缂撳瓨锛岄伩鍏嶅唴瀛樻硠婕?|
|
||||
| `retry` | 1娆?| 蹇<>€熷け璐ワ紝涓嶈繃搴﹂噸璇?|
|
||||
| `refetchOnWindowFocus` | false | 鐢ㄦ埛鍒囨崲绐楀彛鏃朵笉闇€瑕侀噸鏂板姞杞?|
|
||||
| `gcTime` | 10分钟 | 保持合理缓存,避免内存泄漏 |
|
||||
| `retry` | 1次 | 快速失败,不过度重试 |
|
||||
| `refetchOnWindowFocus` | false | 用户切换窗口时不需要重新加载 |
|
||||
|
||||
---
|
||||
|
||||
@@ -170,26 +170,26 @@ const queryClient = new QueryClient({
|
||||
**问题**: Spin组件的`tip`属性有使用限制
|
||||
**教训**: 查阅官方文档,理解组件API
|
||||
|
||||
### 3. 鍓嶇<EFBFBD>鏋舵瀯鍒嗗眰娓呮櫚寰堥噸瑕?
|
||||
### 3. 前端架构分层清晰很重要
|
||||
**收获**:
|
||||
- 主应用(App.tsx)负责全局配置
|
||||
- 业务模块(asl/)只关注业务逻辑
|
||||
- 娓呮櫚鐨勮亴璐e垝鍒嗛伩鍏嶉棶棰?
|
||||
- 清晰的职责划分避免问题
|
||||
|
||||
---
|
||||
|
||||
## 馃殌 涓嬩竴姝?
|
||||
## 🚀 下一步
|
||||
|
||||
淇<EFBFBD><EFBFBD>瀹屾垚鍚庯紝鍙<EFBFBD>互缁х画锛?
|
||||
1. 鉁?娴嬭瘯椤圭洰鍒涘缓鍔熻兘
|
||||
2. 鉁?娴嬭瘯鍚庣<E98D9A>API鑱旇皟
|
||||
3. 鉁?缁х画Week 2 Day 2寮€鍙?
|
||||
修复完成后,可以继续:
|
||||
1. ✅ 测试项目创建功能
|
||||
2. ✅ 测试后端API联调
|
||||
3. ✅ 继续Week 2 Day 2开发
|
||||
|
||||
---
|
||||
|
||||
**修复时间**: 10分钟
|
||||
**淇<EFBFBD><EFBFBD>闅惧害**: 猸?绠€鍗?
|
||||
**褰卞搷鑼冨洿**: 猸愨瓙猸?鍏ㄥ眬
|
||||
**修复难度**: ⭐ 简单
|
||||
**影响范围**: ⭐⭐⭐ 全局
|
||||
|
||||
**修复完成**: 2025-11-18 21:15
|
||||
|
||||
|
||||
Reference in New Issue
Block a user