From f496e4f04233eb26a959cdf86f25f9ce1cb8243a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E8=A3=95=E4=B8=B9?= <yyd0322@qq.com>
Date: Thu, 18 Sep 2025 21:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=8F=90=E4=BA=A4=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=AC=AC=E4=B8=80=E5=91=A8=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA=E4=B8=8E=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog/forms.py                       |   2 +-
 blog/search_indexes.py              |   2 +-
 blog/views.py                       |  78 +++++++--
 comments/models.py                  |   1 +
 djangoblog/__init__.py              |   2 +
 djangoblog/elasticsearch_backend.py | 183 ----------------------
 djangoblog/settings.py              |  33 ++--
 djangoblog/urls.py                  |  12 +-
 djangoblog/whoosh_cn_backend.py     |  31 ++--
 haystack/__init__.py                |   1 +
 requirements.txt                    | Bin 2554 -> 2410 bytes
 servermanager/api/blogapi.py        |  36 +++--
 templates/search/search.html        | 235 ++++++++++++++++++++++++----
 templates/share_layout/nav.html     | 116 +++++++++++++-
 14 files changed, 436 insertions(+), 296 deletions(-)
 delete mode 100644 djangoblog/elasticsearch_backend.py
 create mode 100644 haystack/__init__.py

diff --git a/blog/forms.py b/blog/forms.py
index 715be76..891c56c 100644
--- a/blog/forms.py
+++ b/blog/forms.py
@@ -1,7 +1,7 @@
 import logging
 
 from django import forms
-from haystack.forms import SearchForm
+
 
 logger = logging.getLogger(__name__)
 
diff --git a/blog/search_indexes.py b/blog/search_indexes.py
index 7f1dfac..6be3e74 100644
--- a/blog/search_indexes.py
+++ b/blog/search_indexes.py
@@ -1,4 +1,4 @@
-from haystack import indexes
+
 
 from blog.models import Article
 
diff --git a/blog/views.py b/blog/views.py
index d5dc7ec..77c2c09 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -13,7 +13,8 @@ from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.detail import DetailView
 from django.views.generic.list import ListView
-from haystack.views import SearchView
+from django.db.models import Q
+
 
 from blog.models import Article, Category, LinkShowType, Links, Tag
 from comments.forms import CommentForm
@@ -283,21 +284,66 @@ class LinkListView(ListView):
         return Links.objects.filter(is_enable=True)
 
 
-class EsSearchView(SearchView):
-    def get_context(self):
-        paginator, page = self.build_page()
-        context = {
-            "query": self.query,
-            "form": self.form,
-            "page": page,
-            "paginator": paginator,
-            "suggestion": None,
-        }
-        if hasattr(self.results, "query") and self.results.query.backend.include_spelling:
-            context["suggestion"] = self.results.query.get_spelling_suggestion()
-        context.update(self.extra_context())
-
-        return context
+#class EsSearchView(SearchView):
+#    def get_context(self):
+#        paginator, page = self.build_page()
+#        context = {
+#            "query": self.query,
+#            "form": self.form,
+#            "page": page,
+#            "paginator": paginator,
+#            "suggestion": None,
+#        }
+#        if hasattr(self.results, "query") and self.results.query.backend.include_spelling:
+#            context["suggestion"] = self.results.query.get_spelling_suggestion()
+#        context.update(self.extra_context())
+#
+#        return context
+# 移除原来的 EsSearchView 类，替换为原生搜索视图
+def search_view(request):
+    """
+    Django原生搜索视图
+    替换原来的haystack搜索功能
+    """
+    query = request.GET.get('q', '').strip()
+    results = Article.objects.none()
+    results_count = 0
+    
+    if query:
+        # 多字段搜索：标题、内容、摘要
+        search_conditions = Q(
+            Q(title__icontains=query) | 
+            Q(content__icontains=query) |
+            Q(summary__icontains=query)
+        )
+        results = Article.objects.filter(
+            search_conditions, 
+            status='p',  # 只搜索已发布的文章
+            type='a'     # 只搜索文章类型
+        ).distinct().order_by('-created_time')
+        
+        results_count = results.count()
+    
+    # 分页设置
+    paginator = Paginator(results, settings.PAGINATE_BY)
+    page_number = request.GET.get('page')
+    
+    try:
+        page_obj = paginator.page(page_number)
+    except PageNotAnInteger:
+        page_obj = paginator.page(1)
+    except EmptyPage:
+        page_obj = paginator.page(paginator.num_pages)
+    
+    context = {
+        'results': page_obj,
+        'query': query,
+        'results_count': results_count,
+        'page_obj': page_obj,
+        'page_type': '搜索结果',
+    }
+    
+    return render(request, 'search/search.html', context)
 
 
 @csrf_exempt
diff --git a/comments/models.py b/comments/models.py
index 7c3bbc8..91d79ef 100644
--- a/comments/models.py
+++ b/comments/models.py
@@ -2,6 +2,7 @@ from django.conf import settings
 from django.db import models
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
+from django.utils import timezone
 
 from blog.models import Article
 
diff --git a/djangoblog/__init__.py b/djangoblog/__init__.py
index 1e205f4..2a075c2 100644
--- a/djangoblog/__init__.py
+++ b/djangoblog/__init__.py
@@ -1 +1,3 @@
 default_app_config = 'djangoblog.apps.DjangoblogAppConfig'
+import pymysql
+pymysql.install_as_MySQLdb()
\ No newline at end of file
diff --git a/djangoblog/elasticsearch_backend.py b/djangoblog/elasticsearch_backend.py
deleted file mode 100644
index 4afe498..0000000
--- a/djangoblog/elasticsearch_backend.py
+++ /dev/null
@@ -1,183 +0,0 @@
-from django.utils.encoding import force_str
-from elasticsearch_dsl import Q
-from haystack.backends import BaseEngine, BaseSearchBackend, BaseSearchQuery, log_query
-from haystack.forms import ModelSearchForm
-from haystack.models import SearchResult
-from haystack.utils import log as logging
-
-from blog.documents import ArticleDocument, ArticleDocumentManager
-from blog.models import Article
-
-logger = logging.getLogger(__name__)
-
-
-class ElasticSearchBackend(BaseSearchBackend):
-    def __init__(self, connection_alias, **connection_options):
-        super(
-            ElasticSearchBackend,
-            self).__init__(
-            connection_alias,
-            **connection_options)
-        self.manager = ArticleDocumentManager()
-        self.include_spelling = True
-
-    def _get_models(self, iterable):
-        models = iterable if iterable and iterable[0] else Article.objects.all()
-        docs = self.manager.convert_to_doc(models)
-        return docs
-
-    def _create(self, models):
-        self.manager.create_index()
-        docs = self._get_models(models)
-        self.manager.rebuild(docs)
-
-    def _delete(self, models):
-        for m in models:
-            m.delete()
-        return True
-
-    def _rebuild(self, models):
-        models = models if models else Article.objects.all()
-        docs = self.manager.convert_to_doc(models)
-        self.manager.update_docs(docs)
-
-    def update(self, index, iterable, commit=True):
-
-        models = self._get_models(iterable)
-        self.manager.update_docs(models)
-
-    def remove(self, obj_or_string):
-        models = self._get_models([obj_or_string])
-        self._delete(models)
-
-    def clear(self, models=None, commit=True):
-        self.remove(None)
-
-    @staticmethod
-    def get_suggestion(query: str) -> str:
-        """获取推荐词, 如果没有找到添加原搜索词"""
-
-        search = ArticleDocument.search() \
-            .query("match", body=query) \
-            .suggest('suggest_search', query, term={'field': 'body'}) \
-            .execute()
-
-        keywords = []
-        for suggest in search.suggest.suggest_search:
-            if suggest["options"]:
-                keywords.append(suggest["options"][0]["text"])
-            else:
-                keywords.append(suggest["text"])
-
-        return ' '.join(keywords)
-
-    @log_query
-    def search(self, query_string, **kwargs):
-        logger.info('search query_string:' + query_string)
-
-        start_offset = kwargs.get('start_offset')
-        end_offset = kwargs.get('end_offset')
-
-        # 推荐词搜索
-        if getattr(self, "is_suggest", None):
-            suggestion = self.get_suggestion(query_string)
-        else:
-            suggestion = query_string
-
-        q = Q('bool',
-              should=[Q('match', body=suggestion), Q('match', title=suggestion)],
-              minimum_should_match="70%")
-
-        search = ArticleDocument.search() \
-                     .query('bool', filter=[q]) \
-                     .filter('term', status='p') \
-                     .filter('term', type='a') \
-                     .source(False)[start_offset: end_offset]
-
-        results = search.execute()
-        hits = results['hits'].total
-        raw_results = []
-        for raw_result in results['hits']['hits']:
-            app_label = 'blog'
-            model_name = 'Article'
-            additional_fields = {}
-
-            result_class = SearchResult
-
-            result = result_class(
-                app_label,
-                model_name,
-                raw_result['_id'],
-                raw_result['_score'],
-                **additional_fields)
-            raw_results.append(result)
-        facets = {}
-        spelling_suggestion = None if query_string == suggestion else suggestion
-
-        return {
-            'results': raw_results,
-            'hits': hits,
-            'facets': facets,
-            'spelling_suggestion': spelling_suggestion,
-        }
-
-
-class ElasticSearchQuery(BaseSearchQuery):
-    def _convert_datetime(self, date):
-        if hasattr(date, 'hour'):
-            return force_str(date.strftime('%Y%m%d%H%M%S'))
-        else:
-            return force_str(date.strftime('%Y%m%d000000'))
-
-    def clean(self, query_fragment):
-        """
-        Provides a mechanism for sanitizing user input before presenting the
-        value to the backend.
-
-        Whoosh 1.X differs here in that you can no longer use a backslash
-        to escape reserved characters. Instead, the whole word should be
-        quoted.
-        """
-        words = query_fragment.split()
-        cleaned_words = []
-
-        for word in words:
-            if word in self.backend.RESERVED_WORDS:
-                word = word.replace(word, word.lower())
-
-            for char in self.backend.RESERVED_CHARACTERS:
-                if char in word:
-                    word = "'%s'" % word
-                    break
-
-            cleaned_words.append(word)
-
-        return ' '.join(cleaned_words)
-
-    def build_query_fragment(self, field, filter_type, value):
-        return value.query_string
-
-    def get_count(self):
-        results = self.get_results()
-        return len(results) if results else 0
-
-    def get_spelling_suggestion(self, preferred_query=None):
-        return self._spelling_suggestion
-
-    def build_params(self, spelling_query=None):
-        kwargs = super(ElasticSearchQuery, self).build_params(spelling_query=spelling_query)
-        return kwargs
-
-
-class ElasticSearchModelSearchForm(ModelSearchForm):
-
-    def search(self):
-        # 是否建议搜索
-        self.searchqueryset.query.backend.is_suggest = self.data.get("is_suggest") != "no"
-        sqs = super().search()
-        return sqs
-
-
-class ElasticSearchEngine(BaseEngine):
-    backend = ElasticSearchBackend
-    query = ElasticSearchQuery
diff --git a/djangoblog/settings.py b/djangoblog/settings.py
index d076bb6..901a914 100644
--- a/djangoblog/settings.py
+++ b/djangoblog/settings.py
@@ -53,7 +53,7 @@ INSTALLED_APPS = [
     'django.contrib.sites',
     'django.contrib.sitemaps',
     'mdeditor',
-    'haystack',
+    
     'blog',
     'accounts',
     'comments',
@@ -109,14 +109,14 @@ WSGI_APPLICATION = 'djangoblog.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': os.environ.get('DJANGO_MYSQL_DATABASE') or 'djangoblog',
-        'USER': os.environ.get('DJANGO_MYSQL_USER') or 'root',
-        'PASSWORD': os.environ.get('DJANGO_MYSQL_PASSWORD') or 'root',
-        'HOST': os.environ.get('DJANGO_MYSQL_HOST') or '127.0.0.1',
-        'PORT': int(
-            os.environ.get('DJANGO_MYSQL_PORT') or 3306),
-        'OPTIONS': {
-            'charset': 'utf8mb4'},
+        'NAME': 'djangoblog',
+        'USER': 'root',      # 通常是 root
+        'PASSWORD': '050322yyd*',    # MySQL安装时设置的密码
+        'HOST': 'localhost',
+        'PORT': '3306',
+        'OPTIONS':{
+            'charset': 'utf8mb4',
+        }
     }}
 
 # Password validation
@@ -160,14 +160,7 @@ USE_TZ = False
 # https://docs.djangoproject.com/en/1.10/howto/static-files/
 
 
-HAYSTACK_CONNECTIONS = {
-    'default': {
-        'ENGINE': 'djangoblog.whoosh_cn_backend.WhooshEngine',
-        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
-    },
-}
-# Automatically update searching index
-HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
+
 # Allow user login with username and password
 AUTHENTICATION_BACKENDS = [
     'accounts.user_login_backend.EmailOrUsernameModelBackend']
@@ -326,11 +319,7 @@ if os.environ.get('DJANGO_ELASTICSEARCH_HOST'):
             'hosts': os.environ.get('DJANGO_ELASTICSEARCH_HOST')
         },
     }
-    HAYSTACK_CONNECTIONS = {
-        'default': {
-            'ENGINE': 'djangoblog.elasticsearch_backend.ElasticSearchEngine',
-        },
-    }
+    
 
 # Plugin System
 PLUGINS_DIR = BASE_DIR / 'plugins'
diff --git a/djangoblog/urls.py b/djangoblog/urls.py
index 4aae58a..0e65d76 100644
--- a/djangoblog/urls.py
+++ b/djangoblog/urls.py
@@ -19,11 +19,10 @@ from django.conf.urls.static import static
 from django.contrib.sitemaps.views import sitemap
 from django.urls import path, include
 from django.urls import re_path
-from haystack.views import search_view_factory
 
-from blog.views import EsSearchView
+from blog.views import search_view
 from djangoblog.admin_site import admin_site
-from djangoblog.elasticsearch_backend import ElasticSearchModelSearchForm
+
 from djangoblog.feeds import DjangoBlogFeed
 from djangoblog.sitemap import ArticleSiteMap, CategorySiteMap, StaticViewSitemap, TagSiteMap, UserSiteMap
 
@@ -41,7 +40,8 @@ handler500 = 'blog.views.server_error_view'
 handle403 = 'blog.views.permission_denied_view'
 
 urlpatterns = [
-    path('i18n/', include('django.conf.urls.i18n')),
+    #path('i18n/', include('django.conf.urls.i18n')),
+    path('search/', search_view, name='search'),
 ]
 urlpatterns += i18n_patterns(
     re_path(r'^admin/', admin_site.urls),
@@ -54,8 +54,8 @@ urlpatterns += i18n_patterns(
             name='django.contrib.sitemaps.views.sitemap'),
     re_path(r'^feed/$', DjangoBlogFeed()),
     re_path(r'^rss/$', DjangoBlogFeed()),
-    re_path('^search', search_view_factory(view_class=EsSearchView, form_class=ElasticSearchModelSearchForm),
-            name='search'),
+    #path('search/', search_view, name='search'),
+    
     re_path(r'', include('servermanager.urls', namespace='servermanager')),
     re_path(r'', include('owntracks.urls', namespace='owntracks'))
     , prefix_default_language=False) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/djangoblog/whoosh_cn_backend.py b/djangoblog/whoosh_cn_backend.py
index 04e3f7f..c540b6a 100644
--- a/djangoblog/whoosh_cn_backend.py
+++ b/djangoblog/whoosh_cn_backend.py
@@ -14,14 +14,7 @@ from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from datetime import datetime
 from django.utils.encoding import force_str
-from haystack.backends import BaseEngine, BaseSearchBackend, BaseSearchQuery, EmptyResults, log_query
-from haystack.constants import DJANGO_CT, DJANGO_ID, ID
-from haystack.exceptions import MissingDependency, SearchBackendError, SkipDocument
-from haystack.inputs import Clean, Exact, PythonData, Raw
-from haystack.models import SearchResult
-from haystack.utils import get_identifier, get_model_ct
-from haystack.utils import log as logging
-from haystack.utils.app_loading import haystack_get_model
+
 from jieba.analyse import ChineseAnalyzer
 from whoosh import index
 from whoosh.analysis import StemmingAnalyzer
@@ -101,13 +94,12 @@ class WhooshSearchBackend(BaseSearchBackend):
                 "You must specify a 'PATH' in your settings for connection '%s'." %
                 connection_alias)
 
-        self.log = logging.getLogger('haystack')
-
+        
     def setup(self):
         """
         Defers loading until needed.
         """
-        from haystack import connections
+        
         new_index = False
 
         # Make sure the index is there.
@@ -150,7 +142,7 @@ class WhooshSearchBackend(BaseSearchBackend):
             DJANGO_CT: WHOOSH_ID(stored=True),
             DJANGO_ID: WHOOSH_ID(stored=True),
         }
-        # Grab the number of keys that are hard-coded into Haystack.
+        
         # We'll use this to (possibly) fail slightly more gracefully later.
         initial_key_count = len(schema_fields)
         content_field_name = ''
@@ -438,9 +430,7 @@ class WhooshSearchBackend(BaseSearchBackend):
         narrowed_results = None
         self.index = self.index.refresh()
 
-        if limit_to_registered_models is None:
-            limit_to_registered_models = getattr(
-                settings, 'HAYSTACK_LIMIT_TO_REGISTERED_MODELS', True)
+        
 
         if models and len(models):
             model_choices = sorted(get_model_ct(model) for model in models)
@@ -582,10 +572,7 @@ class WhooshSearchBackend(BaseSearchBackend):
         narrowed_results = None
         self.index = self.index.refresh()
 
-        if limit_to_registered_models is None:
-            limit_to_registered_models = getattr(
-                settings, 'HAYSTACK_LIMIT_TO_REGISTERED_MODELS', True)
-
+        
         if models and len(models):
             model_choices = sorted(get_model_ct(model) for model in models)
         elif limit_to_registered_models:
@@ -682,7 +669,7 @@ class WhooshSearchBackend(BaseSearchBackend):
             query_string='',
             spelling_query=None,
             result_class=None):
-        from haystack import connections
+        
         results = []
 
         # It's important to grab the hits first before slicing. Otherwise, this
@@ -701,7 +688,7 @@ class WhooshSearchBackend(BaseSearchBackend):
             score = raw_page.score(doc_offset) or 0
             app_label, model_name = raw_result[DJANGO_CT].split('.')
             additional_fields = {}
-            model = haystack_get_model(app_label, model_name)
+            
 
             if model and model in indexed_models:
                 for key, value in raw_result.items():
@@ -903,7 +890,7 @@ class WhooshSearchQuery(BaseSearchQuery):
         return ' '.join(cleaned_words)
 
     def build_query_fragment(self, field, filter_type, value):
-        from haystack import connections
+        
         query_frag = ''
         is_datetime = False
 
diff --git a/haystack/__init__.py b/haystack/__init__.py
new file mode 100644
index 0000000..a60141c
--- /dev/null
+++ b/haystack/__init__.py
@@ -0,0 +1 @@
+"" 
diff --git a/requirements.txt b/requirements.txt
index 9dc5c935191f166db408850beb747475a262f65f..fb769af62b8ed8a80277466dbf6f5f278289511f 100644
GIT binary patch
delta 261
zcmew*{7Ojr|Gy-L9EMbeM22LB3<h2XE`}tAe1;+*zha`fJfq3Pa79)N20aGjiS>bu
z#uG2vE1Lm%hG3O03|T;Rc?{`59kxJd0+cZV;mL-K+N=gZmf7S)#?sAfOg4<Hh9GT|
z-I+rtuVHTC1StcFm`=82k!LiV9Lb{1XfnB#B@(R7Wb$JcO`s?*t1>G{rNLxV*6aK^
zKx@(&iWy3PmKHN)Og3kWoxF%GU=q6=rzud8F%TO~R%gG>3SqHxSPO#OV8{S+zX90A
V%A5T;f*IKj89*A0Ca>fS1OUcxH7Ni9

delta 384
zcmX|-O-ch%49D}FFGd&y#YO3&6jx=iy!WQIg;KiFwG73D3m2`3#fl?N1wDYc9&!Xv
zAaj5oLqxoQM^OAoGEyE{yyTz!f62$@=T`6cX9|~a1`{}i84T%lp$(QoLj>zEg$!<}
zdMC9G<qbtr)EmkcgJvK<FvTQQrYJ|v{;G2yE~xJc&S?VA-J=T4#cdUP+@<kA-PUHL
zxrZDULNFI)!Vcw=8Y_=MEPkyWZSV+9zmC8eJaisH7IMzwyF)zq?Zm2wE%#Uq5`1)9
zs*BI=j>k%aukK5HO?C@fH6yfLT0JAc%0B-;K;_bgJ}$kJh<zEC!(!b}SDA`!?l(eS
fS~Q6Mo5x4em<NMM)|48ZvRnpZ6<7h*SPRoXy!}Xm

diff --git a/servermanager/api/blogapi.py b/servermanager/api/blogapi.py
index 8a4d6ac..d2d8afa 100644
--- a/servermanager/api/blogapi.py
+++ b/servermanager/api/blogapi.py
@@ -1,27 +1,43 @@
-from haystack.query import SearchQuerySet
+import logging
+from django.http import JsonResponse
+from django.db.models import Q 
 
 from blog.models import Article, Category
-
+logger = logging.getLogger(__name__)
 
 class BlogApi:
     def __init__(self):
-        self.searchqueryset = SearchQuerySet()
-        self.searchqueryset.auto_query('')
-        self.__max_takecount__ = 8
+       self.searchqueryset = Article.objects.all()
 
     def search_articles(self, query):
-        sqs = self.searchqueryset.auto_query(query)
-        sqs = sqs.load_all()
-        return sqs[:self.__max_takecount__]
+        if query:
+            # 使用 Q 对象进行多字段搜索
+            results = Article.objects.filter(
+                Q(title__icontains=query) | 
+                Q(body__icontains=query) |
+                Q(category__name__icontains=query) |
+                Q(tags__name__icontains=query)
+            ).filter(status='p')  # 只搜索已发布的文章
+            return results.distinct()[:self.__max_takecount__]
+        return Article.objects.none()
 
     def get_category_lists(self):
         return Category.objects.all()
 
     def get_category_articles(self, categoryname):
-        articles = Article.objects.filter(category__name=categoryname)
+        articles = Article.objects.filter(category__name=categoryname,status='p')
+
         if articles:
             return articles[:self.__max_takecount__]
         return None
 
     def get_recent_articles(self):
-        return Article.objects.all()[:self.__max_takecount__]
+       return Article.objects.filter(
+            status='p'
+        ).order_by('-pub_time')[:self.__max_takecount__]
+    
+    def get_popular_articles(self):
+        """获取热门文章（按浏览量排序）"""
+        return Article.objects.filter(
+            status='p'
+        ).order_by('-views')[:self.__max_takecount__]
\ No newline at end of file
diff --git a/templates/search/search.html b/templates/search/search.html
index 1404c60..19a153d 100644
--- a/templates/search/search.html
+++ b/templates/search/search.html
@@ -1,66 +1,233 @@
 {% extends 'share_layout/base.html' %}
 {% load blog_tags %}
+{% load static %}
+
 {% block header %}
-    <title>{{ SITE_NAME }} | {{ SITE_DESCRIPTION }}</title>
-    <meta name="description" content="{{ SITE_SEO_DESCRIPTION }}"/>
-    <meta name="keywords" content="{{ SITE_KEYWORDS }}"/>
+    <title>{% if query %}搜索 "{{ query }}" - {% endif %}{{ SITE_NAME }}</title>
+    <meta name="description" content="搜索{{ SITE_NAME }}的文章内容"/>
+    <meta name="keywords" content="搜索,{{ SITE_KEYWORDS }}"/>
     <meta property="og:type" content="blog"/>
-    <meta property="og:title" content="{{ SITE_NAME }}"/>
-    <meta property="og:description" content="{{ SITE_DESCRIPTION }}"/>
-    <meta property="og:url" content="{{ SITE_BASE_URL }}"/>
+    <meta property="og:title" content="搜索 - {{ SITE_NAME }}"/>
+    <meta property="og:description" content="搜索{{ SITE_DESCRIPTION }}"/>
+    <meta property="og:url" content="{{ SITE_BASE_URL }}/search/"/>
     <meta property="og:site_name" content="{{ SITE_NAME }}"/>
 {% endblock %}
+
 {% block content %}
     <div id="primary" class="site-content">
         <div id="content" role="main">
+            <!-- 搜索框 -->
+            <div class="search-box-container" style="margin-bottom: 30px;">
+                <form method="get" action="{% url 'search' %}" class="search-form">
+                    <div class="search-input-group">
+                        <input type="text" name="q" class="search-input" 
+                               placeholder="输入关键词搜索文章..." 
+                               value="{{ query|default:'' }}"
+                               aria-label="搜索">
+                        <button type="submit" class="search-button">
+                            <i class="fas fa-search"></i> 搜索
+                        </button>
+                    </div>
+                </form>
+            </div>
+
             {% if query %}
                 <header class="archive-header">
-                    {% if suggestion %}
-                        <h2 class="archive-title">
-                            已显示<span style="color: red"> “{{ suggestion }}” </span>的搜索结果。&nbsp;&nbsp;
-                            仍然搜索：<a style="text-transform: none;" href="/search/?q={{ query }}&is_suggest=no">{{ query }}</a> <br>
-                        </h2>
-                    {% else %}
-                        <h2 class="archive-title">
-                            搜索：<span style="color: red">{{ query }} </span> &nbsp;&nbsp;
-                        </h2>
-                    {% endif %}
+                    <h2 class="archive-title">
+                        搜索：<span style="color: red">"{{ query }}"</span> 
+                        {% if results_count %}
+                            <span style="font-size: 0.8em; color: #666; margin-left: 15px;">
+                                找到 {{ results_count }} 条结果
+                            </span>
+                        {% endif %}
+                    </h2>
                 </header><!-- .archive-header -->
             {% endif %}
-            {% if query and page.object_list %}
-                {% for article in page.object_list %}
-                    {% load_article_detail article.object True user %}
+
+            {% if query and results %}
+                <!-- 显示搜索结果 -->
+                {% for article in results %}
+                    {% load_article_detail article True user %}
                 {% endfor %}
-                {% if page.has_previous or page.has_next %}
+
+                <!-- 分页导航 -->
+                {% if page_obj.has_previous or page_obj.has_next %}
                     <nav id="nav-below" class="navigation" role="navigation">
                         <h3 class="assistive-text">文章导航</h3>
-                        {% if page.has_previous %}
-                            <div class="nav-previous"><a
-                                    href="?q={{ query }}&amp;page={{ page.previous_page_number }}"><span
-                                    class="meta-nav">&larr;</span> 早期文章</a></div>
+                        {% if page_obj.has_previous %}
+                            <div class="nav-previous">
+                                <a href="?q={{ query }}&amp;page={{ page_obj.previous_page_number }}">
+                                    <span class="meta-nav">&larr;</span> 上一页
+                                </a>
+                            </div>
                         {% endif %}
-                        {% if page.has_next %}
-                            <div class="nav-next"><a href="?q={{ query }}&amp;page={{ page.next_page_number }}">较新文章
-                                <span
-                                        class="meta-nav">→</span></a>
+                        
+                        <span class="page-numbers" style="margin: 0 15px;">
+                            第 {{ page_obj.number }} 页 / 共 {{ page_obj.paginator.num_pages }} 页
+                        </span>
+                        
+                        {% if page_obj.has_next %}
+                            <div class="nav-next">
+                                <a href="?q={{ query }}&amp;page={{ page_obj.next_page_number }}">
+                                    下一页 <span class="meta-nav">&rarr;</span>
+                                </a>
                             </div>
                         {% endif %}
                     </nav><!-- .navigation -->
-
                 {% endif %}
-            {% else %}
-                <header class="archive-header">
 
-                    <h1 class="archive-title">哎呀，关键字：<span>{{ query }}</span>没有找到结果，要不换个词再试试？</h1>
-                </header><!-- .archive-header -->
+            {% else %}
+                <!-- 无结果时的显示 -->
+                {% if query %}
+                    <header class="archive-header">
+                        <h1 class="archive-title">
+                            哎呀，关键字：<span style="color: red">{{ query }}</span>没有找到结果，要不换个词再试试？
+                        </h1>
+                        <div class="search-suggestions" style="margin-top: 20px;">
+                            <p>搜索建议：</p>
+                            <div class="suggestion-tags">
+                                <a href="?q=Django" class="tag">Django</a>
+                                <a href="?q=Python" class="tag">Python</a>
+                                <a href="?q=Web开发" class="tag">Web开发</a>
+                                <a href="?q=数据库" class="tag">数据库</a>
+                            </div>
+                        </div>
+                    </header>
+                {% else %}
+                    <header class="archive-header">
+                        <h1 class="archive-title">欢迎使用搜索功能</h1>
+                        <p>请在搜索框中输入关键词来查找您感兴趣的文章。</p>
+                    </header>
+                {% endif %}
             {% endif %}
         </div><!-- #content -->
     </div><!-- #primary -->
 {% endblock %}
 
-
 {% block sidebar %}
     {% load_sidebar request.user 'i' %}
 {% endblock %}
 
+{% block extra_css %}
+<style>
+.search-box-container {
+    background: #f8f9fa;
+    padding: 20px;
+    border-radius: 8px;
+    border: 1px solid #e9ecef;
+}
+
+.search-form {
+    margin: 0;
+}
+
+.search-input-group {
+    display: flex;
+    max-width: 600px;
+    margin: 0 auto;
+}
+
+.search-input {
+    flex: 1;
+    padding: 12px 15px;
+    border: 2px solid #007bff;
+    border-right: none;
+    border-radius: 4px 0 0 4px;
+    font-size: 16px;
+    outline: none;
+}
+
+.search-button {
+    padding: 12px 20px;
+    background: #007bff;
+    color: white;
+    border: 2px solid #007bff;
+    border-radius: 0 4px 4px 0;
+    cursor: pointer;
+    font-size: 16px;
+    transition: background 0.3s ease;
+}
+
+.search-button:hover {
+    background: #0056b3;
+    border-color: #0056b3;
+}
+
+.search-suggestions {
+    text-align: center;
+}
+
+.suggestion-tags {
+    margin-top: 10px;
+}
+
+.tag {
+    display: inline-block;
+    margin: 5px;
+    padding: 8px 15px;
+    background: #e9ecef;
+    color: #495057;
+    text-decoration: none;
+    border-radius: 20px;
+    transition: all 0.3s ease;
+}
+
+.tag:hover {
+    background: #007bff;
+    color: white;
+    text-decoration: none;
+}
+
+.navigation {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 30px 0;
+    padding: 20px 0;
+    border-top: 1px solid #eee;
+}
+
+.nav-previous, .nav-next {
+    margin: 0 10px;
+}
+
+.nav-previous a, .nav-next a {
+    padding: 10px 20px;
+    background: #f8f9fa;
+    border: 1px solid #dee2e6;
+    border-radius: 4px;
+    text-decoration: none;
+    color: #495057;
+    transition: all 0.3s ease;
+}
+
+.nav-previous a:hover, .nav-next a:hover {
+    background: #007bff;
+    color: white;
+    border-color: #007bff;
+}
+
+.page-numbers {
+    color: #6c757d;
+    font-size: 14px;
+}
+</style>
+{% endblock %}
 
+{% block extra_js %}
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    // 搜索框获得焦点时的事件
+    const searchInput = document.querySelector('.search-input');
+    if (searchInput) {
+        searchInput.addEventListener('focus', function() {
+            this.parentElement.style.boxShadow = '0 0 10px rgba(0, 123, 255, 0.3)';
+        });
+        
+        searchInput.addEventListener('blur', function() {
+            this.parentElement.style.boxShadow = 'none';
+        });
+    }
+});
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/share_layout/nav.html b/templates/share_layout/nav.html
index 24d4da6..3eb7da4 100644
--- a/templates/share_layout/nav.html
+++ b/templates/share_layout/nav.html
@@ -25,6 +25,120 @@
 
                 <a href="{% url "blog:archives" %}">{% trans 'Article archive' %}</a>
             </li>
+            <li class="menu-item menu-item-search">
+                <div class="nav-search-form">
+                    <form method="get" action="{% url 'search' %}">
+                        <div class="search-container">
+                            <input type="text" name="q" class="search-input" 
+                                   placeholder="{% trans 'Search articles...' %}" 
+                                   value="{{ request.GET.q|default:'' }}"
+                                   aria-label="{% trans 'Search' %}">
+                            <button type="submit" class="search-button" title="{% trans 'Search' %}">
+                                <i class="fas fa-search"></i>
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </li>
         </ul>
     </div>
-</nav><!-- #site-navigation -->
\ No newline at end of file
+</nav><!-- #site-navigation -->
+<style>
+.menu-item-search {
+    margin-left: auto;
+    padding: 0 10px;
+}
+
+.nav-search-form {
+    display: flex;
+    align-items: center;
+    height: 100%;
+}
+
+.search-container {
+    display: flex;
+    align-items: center;
+    background: #f5f5f5;
+    border: 1px solid #ddd;
+    border-radius: 20px;
+    overflow: hidden;
+    transition: all 0.3s ease;
+}
+
+.search-input {
+    border: none;
+    background: transparent;
+    padding: 8px 12px;
+    outline: none;
+    width: 150px;
+    font-size: 14px;
+    color: #333;
+}
+
+.search-input::placeholder {
+    color: #888;
+}
+
+.search-button {
+    border: none;
+    background: transparent;
+    padding: 8px 10px 8px 5px;
+    cursor: pointer;
+    color: #666;
+    transition: color 0.3s ease;
+}
+
+.search-button:hover {
+    color: #0073aa;
+}
+
+.search-container:focus-within {
+    border-color: #0073aa;
+    box-shadow: 0 0 5px rgba(0, 115, 170, 0.3);
+    background: #fff;
+}
+
+/* 响应式设计 - 移动设备适配 */
+@media (max-width: 768px) {
+    .menu-item-search {
+        order: 100; /* 确保在移动设备上显示在最后 */
+        width: 100%;
+        padding: 10px 0;
+        margin-left: 0;
+        border-top: 1px solid #eee;
+    }
+    
+    .search-container {
+        width: 100%;
+        max-width: 300px;
+        margin: 0 auto;
+    }
+    
+    .search-input {
+        width: 100%;
+        flex: 1;
+    }
+    
+    .nav-menu {
+        flex-wrap: wrap;
+    }
+}
+
+/* 桌面端的大屏幕适配 */
+@media (min-width: 1024px) {
+    .search-input {
+        width: 180px;
+    }
+}
+
+/* 小屏幕手机适配 */
+@media (max-width: 480px) {
+    .search-input {
+        font-size: 16px; /* 防止iOS缩放 */
+    }
+    
+    .search-container {
+        border-radius: 25px;
+    }
+}
+</style>
\ No newline at end of file