feat(frontend): reorder navigation tabs for improved UX

- Move "Websites" tab to first position in scan history and target layouts - Reposition "IP Addresses" tab before "Ports" for better logical flow - Maintain consistent tab ordering across both scan history and target pages - Improve navigation hierarchy by placing primary discovery results first
perf(asset): add GIN indexes for tech array fields and improve query parser
2026-02-01 04:03:23 +08:00 · 2026-01-01 09:47:30 +08:00 · 2026-01-01 08:58:03 +08:00 · 2025-12-31 16:01:48 +00:00 · 2025-12-31 23:27:02 +08:00
6 changed files with 71 additions and 50 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-v1.2.9-dev
+v1.2.12-dev
--- a/backend/apps/asset/models/asset_models.py
+++ b/backend/apps/asset/models/asset_models.py
@@ -1,6 +1,7 @@

 from django.db import models
 from django.contrib.postgres.fields import ArrayField
+from django.contrib.postgres.indexes import GinIndex
 from django.core.validators import MinValueValidator, MaxValueValidator


@@ -131,11 +132,12 @@ class Endpoint(models.Model):
        ordering = ['-created_at']
        indexes = [
            models.Index(fields=['-created_at']),
-            models.Index(fields=['target']),       # 优化从target_id快速查找下面的端点（主关联字段）
+            models.Index(fields=['target']),       # 优化从 target_id快速查找下面的端点（主关联字段）
            models.Index(fields=['url']),          # URL索引，优化查询性能
            models.Index(fields=['host']),         # host索引，优化根据主机名查询
            models.Index(fields=['status_code']),  # 状态码索引，优化筛选
            models.Index(fields=['title']),        # title索引，优化智能过滤搜索
+            GinIndex(fields=['tech']),             # GIN索引，优化 tech 数组字段的 __contains 查询
        ]
        constraints = [
            # 普通唯一约束：url + target 组合唯一
@@ -229,9 +231,10 @@ class WebSite(models.Model):
            models.Index(fields=['-created_at']),
            models.Index(fields=['url']),  # URL索引，优化查询性能
            models.Index(fields=['host']),  # host索引，优化根据主机名查询
-            models.Index(fields=['target']),     # 优化从target_id快速查找下面的站点
+            models.Index(fields=['target']),     # 优化从 target_id快速查找下面的站点
            models.Index(fields=['title']),      # title索引，优化智能过滤搜索
            models.Index(fields=['status_code']),  # 状态码索引，优化智能过滤搜索
+            GinIndex(fields=['tech']),  # GIN索引，优化 tech 数组字段的 __contains 查询
        ]
        constraints = [
            # 普通唯一约束：url + target 组合唯一
--- a/backend/apps/common/utils/filter_utils.py
+++ b/backend/apps/common/utils/filter_utils.py
@@ -86,9 +86,21 @@ class QueryParser:
        if not query_string or not query_string.strip():
            return []
        
+        # 第一步：提取所有过滤条件并用占位符替换，保护引号内的空格
+        filters_found = []
+        placeholder_pattern = '__FILTER_{}__'
+        
+        def replace_filter(match):
+            idx = len(filters_found)
+            filters_found.append(match.group(0))
+            return placeholder_pattern.format(idx)
+        
+        # 先用正则提取所有 field="value" 形式的条件
+        protected = cls.FILTER_PATTERN.sub(replace_filter, query_string)
+        
        # 标准化逻辑运算符
        # 先处理 || 和 or -> __OR__
-        normalized = cls.OR_PATTERN.sub(' __OR__ ', query_string)
+        normalized = cls.OR_PATTERN.sub(' __OR__ ', protected)
        # 再处理 && 和 and -> __AND__
        normalized = cls.AND_PATTERN.sub(' __AND__ ', normalized)
        
@@ -103,20 +115,26 @@ class QueryParser:
                pending_op = LogicalOp.OR
            elif token == '__AND__':
                pending_op = LogicalOp.AND
-            else:
-                # 尝试解析为过滤条件
-                match = cls.FILTER_PATTERN.match(token)
-                if match:
-                    field, operator, value = match.groups()
-                    groups.append(FilterGroup(
-                        filter=ParsedFilter(
-                            field=field.lower(),
-                            operator=operator,
-                            value=value
-                        ),
-                        logical_op=pending_op if groups else LogicalOp.AND  # 第一个条件默认 AND
-                    ))
-                    pending_op = LogicalOp.AND  # 重置为默认 AND
+            elif token.startswith('__FILTER_') and token.endswith('__'):
+                # 还原占位符为原始过滤条件
+                try:
+                    idx = int(token[9:-2])  # 提取索引
+                    original_filter = filters_found[idx]
+                    match = cls.FILTER_PATTERN.match(original_filter)
+                    if match:
+                        field, operator, value = match.groups()
+                        groups.append(FilterGroup(
+                            filter=ParsedFilter(
+                                field=field.lower(),
+                                operator=operator,
+                                value=value
+                            ),
+                            logical_op=pending_op if groups else LogicalOp.AND
+                        ))
+                        pending_op = LogicalOp.AND  # 重置为默认 AND
+                except (ValueError, IndexError):
+                    pass
+            # 其他 token 忽略（无效输入）
        
        return groups

--- a/backend/apps/scan/flows/fingerprint_detect_flow.py
+++ b/backend/apps/scan/flows/fingerprint_detect_flow.py
@@ -37,7 +37,7 @@ logger = logging.getLogger(__name__)

 def calculate_fingerprint_detect_timeout(
    url_count: int,
-    base_per_url: float = 5.0,
+    base_per_url: float = 10.0,
    min_timeout: int = 300
 ) -> int:
    """
@@ -49,7 +49,7 @@ def calculate_fingerprint_detect_timeout(
    
    Args:
        url_count: URL 数量
-        base_per_url: 每 URL 基础时间（秒），默认 5秒
+        base_per_url: 每 URL 基础时间（秒），默认 10秒
        min_timeout: 最小超时时间（秒），默认 300秒
        
    Returns:
--- a/frontend/app/[locale]/scan/history/[id]/layout.tsx
+++ b/frontend/app/[locale]/scan/history/[id]/layout.tsx
@@ -64,6 +64,16 @@ export default function ScanHistoryLayout({
      <div className="flex items-center justify-between px-4 lg:px-6">
        <Tabs value={getActiveTab()} className="w-full">
          <TabsList>
+            <TabsTrigger value="websites" asChild>
+              <Link href={tabPaths.websites} className="flex items-center gap-0.5">
+                Websites
+                {counts.websites > 0 && (
+                  <Badge variant="secondary" className="ml-1.5 h-5 min-w-5 rounded-full px-1.5 text-xs">
+                    {counts.websites}
+                  </Badge>
+                )}
+              </Link>
+            </TabsTrigger>
            <TabsTrigger value="subdomain" asChild>
              <Link href={tabPaths.subdomain} className="flex items-center gap-0.5">
                Subdomains
@@ -74,12 +84,12 @@ export default function ScanHistoryLayout({
                )}
              </Link>
            </TabsTrigger>
-            <TabsTrigger value="websites" asChild>
-              <Link href={tabPaths.websites} className="flex items-center gap-0.5">
-                Websites
-                {counts.websites > 0 && (
+            <TabsTrigger value="ip-addresses" asChild>
+              <Link href={tabPaths["ip-addresses"]} className="flex items-center gap-0.5">
+                IP Addresses
+                {counts["ip-addresses"] > 0 && (
                  <Badge variant="secondary" className="ml-1.5 h-5 min-w-5 rounded-full px-1.5 text-xs">
-                    {counts.websites}
+                    {counts["ip-addresses"]}
                  </Badge>
                )}
              </Link>
@@ -104,16 +114,6 @@ export default function ScanHistoryLayout({
                )}
              </Link>
            </TabsTrigger>
-            <TabsTrigger value="ip-addresses" asChild>
-              <Link href={tabPaths["ip-addresses"]} className="flex items-center gap-0.5">
-                IP Addresses
-                {counts["ip-addresses"] > 0 && (
-                  <Badge variant="secondary" className="ml-1.5 h-5 min-w-5 rounded-full px-1.5 text-xs">
-                    {counts["ip-addresses"]}
-                  </Badge>
-                )}
-              </Link>
-            </TabsTrigger>
            <TabsTrigger value="vulnerabilities" asChild>
              <Link href={tabPaths.vulnerabilities} className="flex items-center gap-0.5">
                Vulnerabilities
--- a/frontend/app/[locale]/target/[id]/layout.tsx
+++ b/frontend/app/[locale]/target/[id]/layout.tsx
@@ -138,6 +138,16 @@ export default function TargetLayout({
      <div className="flex items-center justify-between px-4 lg:px-6">
        <Tabs value={getActiveTab()} className="w-full">
          <TabsList>
+            <TabsTrigger value="websites" asChild>
+              <Link href={tabPaths.websites} className="flex items-center gap-0.5">
+                Websites
+                {counts.websites > 0 && (
+                  <Badge variant="secondary" className="ml-1.5 h-5 min-w-5 rounded-full px-1.5 text-xs">
+                    {counts.websites}
+                  </Badge>
+                )}
+              </Link>
+            </TabsTrigger>
            <TabsTrigger value="subdomain" asChild>
              <Link href={tabPaths.subdomain} className="flex items-center gap-0.5">
                Subdomains
@@ -148,12 +158,12 @@ export default function TargetLayout({
                )}
              </Link>
            </TabsTrigger>
-            <TabsTrigger value="websites" asChild>
-              <Link href={tabPaths.websites} className="flex items-center gap-0.5">
-                Websites
-                {counts.websites > 0 && (
+            <TabsTrigger value="ip-addresses" asChild>
+              <Link href={tabPaths["ip-addresses"]} className="flex items-center gap-0.5">
+                IP Addresses
+                {counts["ip-addresses"] > 0 && (
                  <Badge variant="secondary" className="ml-1.5 h-5 min-w-5 rounded-full px-1.5 text-xs">
-                    {counts.websites}
+                    {counts["ip-addresses"]}
                  </Badge>
                )}
              </Link>
@@ -178,16 +188,6 @@ export default function TargetLayout({
                )}
              </Link>
            </TabsTrigger>
-            <TabsTrigger value="ip-addresses" asChild>
-              <Link href={tabPaths["ip-addresses"]} className="flex items-center gap-0.5">
-                IP Addresses
-                {counts["ip-addresses"] > 0 && (
-                  <Badge variant="secondary" className="ml-1.5 h-5 min-w-5 rounded-full px-1.5 text-xs">
-                    {counts["ip-addresses"]}
-                  </Badge>
-                )}
-              </Link>
-            </TabsTrigger>
            <TabsTrigger value="vulnerabilities" asChild>
              <Link href={tabPaths.vulnerabilities} className="flex items-center gap-0.5">
                Vulnerabilities
Author	SHA1	Message	Date
yyhuni	ab800eca06	feat(frontend): reorder navigation tabs for improved UX - Move "Websites" tab to first position in scan history and target layouts - Reposition "IP Addresses" tab before "Ports" for better logical flow - Maintain consistent tab ordering across both scan history and target pages - Improve navigation hierarchy by placing primary discovery results first	2026-01-01 09:47:30 +08:00
yyhuni	e8e5572339	perf(asset): add GIN indexes for tech array fields and improve query parser - Add GinIndex for tech array field in Endpoint model to optimize __contains queries - Add GinIndex for tech array field in WebSite model to optimize __contains queries - Import GinIndex from django.contrib.postgres.indexes - Refactor QueryParser to protect quoted filter values during tokenization - Implement placeholder-based filter extraction to preserve spaces within quoted values - Replace filter tokens with placeholders before logical operator normalization - Restore original filter conditions from placeholders during parsing - Fix spacing in comments for consistency (add space after "从") - Improves query performance for technology stack filtering on large datasets	2026-01-01 08:58:03 +08:00
github-actions[bot]	d48d4bbcad	chore: bump version to v1.2.12-dev	2025-12-31 16:01:48 +00:00
yyhuni	d1cca4c083	base timeout set 10s	2025-12-31 23:27:02 +08:00