From 8e2aff27ac08e86255b4ee35b61c801a6c89a74b Mon Sep 17 00:00:00 2001 From: yumoqing Date: Fri, 24 Jul 2026 14:34:37 +0800 Subject: [PATCH] fix: single wwwroot/rag symlink, /rag/ prefix in all refs --- .gitignore | 5 +---- build.sh | 9 ++------- scripts/init_rbac.py | 14 +++----------- wwwroot/menu.ui | 4 ++-- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index d66bd39..afd9c06 100644 --- a/.gitignore +++ b/.gitignore @@ -10,10 +10,7 @@ __pycache__/ # Build artifacts wwwroot/bricks/ wwwroot/rbac/ -wwwroot/knowledge_bases_list/ -wwwroot/engine_configs_list/ -wwwroot/subscriptions_list/ -wwwroot/documents_list/ +wwwroot/rag/ mysql.ddl.sql models/mysql.ddl.sql diff --git a/build.sh b/build.sh index 1d765d4..152294b 100755 --- a/build.sh +++ b/build.sh @@ -42,15 +42,10 @@ cd pkgs/bricks bash build.sh cd $cdir -# Symlink bricks + module wwwroots +# Symlink bricks + module wwwroots (one link per module) ln -sf ../pkgs/bricks/dist wwwroot/bricks 2>/dev/null || true ln -sf ../pkgs/rbac/wwwroot wwwroot/rbac 2>/dev/null || true -# Symlink rag module pages into wwwroot (git ignores these) -for d in pkgs/rag/wwwroot/*/; do - name=$(basename "$d") - rm -rf wwwroot/$name 2>/dev/null - ln -sf ../pkgs/rag/wwwroot/$name wwwroot/$name -done +ln -sf ../pkgs/rag/wwwroot wwwroot/rag 2>/dev/null || true # Generate DDL from rag module models if ls pkgs/rag/models/*.json >/dev/null 2>&1; then diff --git a/scripts/init_rbac.py b/scripts/init_rbac.py index 13cc7b3..ada42c9 100644 --- a/scripts/init_rbac.py +++ b/scripts/init_rbac.py @@ -12,22 +12,14 @@ DBPools(config.databases) PUBLIC = ['/api/status', '/api/engines', '/api/kb/list', '/', '/index.ui', '/top.ui', '/user_menu.ui', '/bricks/**', '/i18n/**', - '/knowledge_bases_list/', '/documents_list/', - '/engine_configs_list/', '/subscriptions_list/', + '/rag/knowledge_bases_list/', '/rag/knowledge_bases_list/upload.dspy', + '/rag/engine_configs_list/', '/rag/subscriptions_list/', '/rbac/user/login.ui', '/rbac/user/register.ui', '/rbac/user/login.dspy', '/rbac/user/register.dspy', '/rbac/user/logout.dspy', '/rbac/**'] LOGINED = ['/api/search', '/api/doc/upload', '/api/doc/delete', '/api/dir/create', '/api/dir/delete', '/api/dir/list', - '/api/tag/create', '/api/tag/list', '/api/tag/delete', - '/api/tag/assign', '/api/tag/unassign', '/api/tag/media_tags', - '/api/tag/search', - '/knowledge_bases_list/', '/knowledge_bases_list/upload.dspy', - '/documents_list/', - '/tags_list/index.ui','/tag_assign/index.dspy', - '/tag_search/index.dspy', '/knowledge_bases_list/upload.dspy', - '/engine_configs_list/', '/subscriptions_list/', - '/tags_list/', '/tag_assign/', '/tag_search/'] + '/rag/documents_list/'] async def main(): diff --git a/wwwroot/menu.ui b/wwwroot/menu.ui index a2eefb4..e96e4e0 100644 --- a/wwwroot/menu.ui +++ b/wwwroot/menu.ui @@ -11,7 +11,7 @@ "name": "knowledge_bases", "label": "知识库", "icon": "{{entire_url('/bricks/imgs/app.svg')}}", - "url": "{{entire_url('/knowledge_bases_list/index.ui')}}", + "url": "{{entire_url('/rag/knowledge_bases_list/index.ui')}}", "target": "app.rag_main_content" }, { @@ -39,7 +39,7 @@ "name": "engines", "label": "引擎配置", "icon": "{{entire_url('/bricks/imgs/rocket.svg')}}", - "url": "{{entire_url('/engine_configs_list/index.ui')}}", + "url": "{{entire_url('/rag/engine_configs_list/index.ui')}}", "target": "app.rag_main_content" }, {