fix some bugs && change push way

apps/blog/admin.py

@@ -0,0 +1,38 @@
+from django.contrib import admin
+from .models import Post, Category, SiteSettings
+from django.db import models
+from mdeditor.widgets import MDEditorWidget
+
+
+class PostAdmin(admin.ModelAdmin):
+    # 使用MDEditor Markdown编辑器替换默认的Textarea
+    formfield_overrides = {
+        models.TextField: {'widget': MDEditorWidget},
+    }
+
+    # 设置列表显示字段
+    list_display = ('title', 'category', 'status', 'publish_date', 'created_at', 'updated_at')
+    # 设置过滤器
+    list_filter = ('status', 'category', 'publish_date')
+    # 设置搜索字段
+    search_fields = ('title', 'content')
+
+
+class SiteSettingsAdmin(admin.ModelAdmin):
+    # 保持所有字段在列表中显示，方便直接编辑
+    list_display = ('id', 'summary_length', 'contact_email', 'contact_wechat', 'contact_linkedin', 'contact_github')
+    list_display_links = ('id',)
+
+    def has_add_permission(self, request):
+        # 限制只能有一个站点设置实例
+        return not SiteSettings.objects.exists()
+
+    def has_delete_permission(self, request, obj=None):
+        # 禁止删除站点设置
+        return False
+
+
+# 注册自定义的PostAdmin
+admin.site.register(Post, PostAdmin)
+admin.site.register(Category)
+admin.site.register(SiteSettings, SiteSettingsAdmin)

apps/blog/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BlogConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'blog'

apps/blog/feeds.py

@@ -0,0 +1,96 @@
+from django.contrib.syndication.views import Feed
+from django.urls import reverse
+from django.shortcuts import get_object_or_404
+from .models import Post, Category
+
+
+class LatestPostsFeed(Feed):
+    title = "六桂流芳的com"
+    link = "/rss/"
+    description = "最新博客文章"
+    # 添加content_type使浏览器能正确显示RSS内容
+    content_type = 'application/xml; charset=utf-8'
+
+    def items(self):
+        return Post.objects.filter(status=Post.PUBLISHED).order_by('-publish_date')[:10]
+
+    def item_title(self, item):
+        return item.title
+
+    def item_description(self, item):
+        return item.get_markdown_content()
+
+    def item_link(self, item):
+        return reverse('detail', args=[item.pk])
+
+
+# 添加分类RSS Feed
+class CategoryPostsFeed(Feed):
+    # 添加content_type使浏览器能正确显示RSS内容
+    content_type = 'application/xml; charset=utf-8'
+
+    def get_object(self, request, category_id):
+        return get_object_or_404(Category, pk=category_id)
+
+    def title(self, obj):
+        return f"六桂流芳的com - {obj.name}分类"
+
+    def link(self, obj):
+        return reverse('category_feed', args=[obj.pk])
+
+    def description(self, obj):
+        return f"{obj.name}分类的最新博客文章"
+
+    def items(self, obj):
+        return Post.objects.filter(category=obj, status=Post.PUBLISHED).order_by('-publish_date')[:10]
+
+    def item_title(self, item):
+        return item.title
+
+    def item_description(self, item):
+        return item.get_markdown_content()
+
+    def item_link(self, item):
+        return reverse('detail', args=[item.pk])
+
+
+# 添加最新RSS Feed (与全部的区别在于数量限制)
+class RecentPostsFeed(Feed):
+    title = "六桂流芳的com - 最新文章"
+    link = "/rss/recent/"
+    description = "最新的博客文章"
+    # 添加content_type使浏览器能正确显示RSS内容
+    content_type = 'application/xml; charset=utf-8'
+
+    def items(self):
+        return Post.objects.filter(status=Post.PUBLISHED).order_by('-publish_date')[:20]
+
+    def item_title(self, item):
+        return item.title
+
+    def item_description(self, item):
+        return item.get_markdown_content()
+
+    def item_link(self, item):
+        return reverse('detail', args=[item.pk])
+
+
+# 添加全部RSS Feed
+class AllPostsFeed(Feed):
+    title = "六桂流芳的com - 全部文章"
+    link = "/rss/all/"
+    description = "全部博客文章"
+    # 添加content_type使浏览器能正确显示RSS内容
+    content_type = 'application/xml; charset=utf-8'
+
+    def items(self):
+        return Post.objects.filter(status=Post.PUBLISHED).order_by('-publish_date')
+
+    def item_title(self, item):
+        return item.title
+
+    def item_description(self, item):
+        return item.get_markdown_content()
+
+    def item_link(self, item):
+        return reverse('detail', args=[item.pk])

apps/blog/migrations/0001_initial.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.4 on 2025-07-26 10:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Post',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('content', models.TextField()),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+        ),
+    ]

apps/blog/migrations/0002_post_publish_date.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.4 on 2025-07-26 12:10
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='publish_date',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

apps/blog/migrations/0003_post_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-07-26 13:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0002_post_publish_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to='post_images/'),
+        ),
+    ]

apps/blog/migrations/0004_alter_post_content.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.4 on 2025-07-26 15:26
+
+import mdeditor.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0003_post_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='content',
+            field=mdeditor.fields.MDTextField(),
+        ),
+    ]

apps/blog/migrations/0005_remove_post_image.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.4 on 2025-07-26 15:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0004_alter_post_content'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='post',
+            name='image',
+        ),
+    ]

apps/blog/migrations/0006_category.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1 on 2025-07-27 13:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0005_remove_post_image'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, unique=True)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                'verbose_name_plural': 'Categories',
+            },
+        ),
+    ]

apps/blog/migrations/0007_post_category.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1 on 2025-07-27 13:32
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0006_category'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='category',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='posts', to='blog.category'),
+        ),
+    ]

apps/blog/migrations/0008_sitesettings.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1 on 2025-07-27 15:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0007_post_category'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SiteSettings',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('summary_length', models.IntegerField(default=50, help_text='文章摘要字符长度')),
+            ],
+            options={
+                'verbose_name': '站点设置',
+                'verbose_name_plural': '站点设置',
+            },
+        ),
+    ]

apps/blog/migrations/0009_sitesettings_contact_email_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.1 on 2025-07-27 15:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0008_sitesettings'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='contact_email',
+            field=models.EmailField(blank=True, help_text='联系邮箱', max_length=254, null=True),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='contact_github',
+            field=models.URLField(blank=True, help_text='GitHub链接', null=True),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='contact_linkedin',
+            field=models.URLField(blank=True, help_text='LinkedIn链接', null=True),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='contact_wechat',
+            field=models.CharField(blank=True, help_text='微信号', max_length=100, null=True),
+        ),
+    ]

apps/blog/migrations/0010_post_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1 on 2025-07-31 15:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0009_sitesettings_contact_email_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='status',
+            field=models.CharField(choices=[('draft', '草稿'), ('published', '已发布')], default='draft', max_length=10),
+        ),
+    ]

apps/blog/migrations/0011_alter_post_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1 on 2026-08-25 10:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0010_post_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='status',
+            field=models.CharField(choices=[('draft', '草稿'), ('published', '已发布')], default='published', max_length=10),
+        ),
+    ]

apps/blog/models.py

@@ -0,0 +1,111 @@
+from django.conf import settings
+from django.db import models
+from django.utils import timezone
+import re
+import emoji
+import markdown
+from django.utils.safestring import mark_safe
+from mdeditor.fields import MDTextField
+
+
+# 添加 Category 模型
+class Category(models.Model):
+    name = models.CharField(max_length=100, unique=True)
+    description = models.TextField(blank=True, null=True)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name_plural = "Categories"
+
+
+# 添加站点设置模型
+class SiteSettings(models.Model):
+    summary_length = models.IntegerField(default=50, help_text="文章摘要字符长度")
+    contact_email = models.EmailField(blank=True, null=True, help_text="联系邮箱")
+    contact_wechat = models.CharField(max_length=100, blank=True, null=True, help_text="微信号")
+    contact_linkedin = models.URLField(blank=True, null=True, help_text="LinkedIn链接")
+    contact_github = models.URLField(blank=True, null=True, help_text="GitHub链接")
+
+    class Meta:
+        verbose_name = "站点设置"
+        verbose_name_plural = "站点设置"
+
+    def __str__(self):
+        return "站点设置"
+
+
+class Post(models.Model):
+    # 添加状态选项
+    DRAFT = 'draft'
+    PUBLISHED = 'published'
+    STATUS_CHOICES = [
+        (DRAFT, '草稿'),
+        (PUBLISHED, '已发布'),
+    ]
+
+    title = models.CharField(max_length=100)
+    content = MDTextField()
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    publish_date = models.DateTimeField(default=timezone.now)
+    # 添加分类字段，建立外键关系
+    category = models.ForeignKey(Category, on_delete=models.SET_NULL, null=True, blank=True, related_name='posts')
+    # 添加状态字段
+    status = models.CharField(max_length=10, choices=STATUS_CHOICES, default=PUBLISHED)
+
+    def __str__(self):
+        return f"{self.title}"
+
+    def get_markdown_content(self):
+        content = self.content
+        media_url = settings.MEDIA_URL.rstrip('/')
+
+        # 统一处理所有可能的图片路径格式
+        # 处理Markdown格式的图片 ![alt](path)
+        def replace_md_image(match):
+            alt_text = match.group(1)
+            img_path = match.group(2)
+            # 如果路径已经包含媒体URL则不处理
+            if img_path.startswith(media_url):
+                return match.group(0)
+            # 如果是相对路径，则添加媒体URL前缀
+            if not img_path.startswith(('http://', 'https://', '/')):
+                return f'![{alt_text}]({media_url}/{img_path})'
+            return match.group(0)
+
+        # 处理HTML格式的图片 <img src="path">
+        def replace_html_image(match):
+            quote = match.group(1) or ''
+            img_path = match.group(2)
+            # 如果路径已经包含媒体URL则不处理
+            if img_path.startswith(media_url):
+                return match.group(0)
+            # 如果是相对路径，则添加媒体URL前缀
+            if not img_path.startswith(('http://', 'https://', '/')):
+                return f'src="{media_url}/{img_path}"'
+            return match.group(0)
+
+        # 使用函数替换处理所有Markdown图片
+        content = re.sub(
+            r'!\[([^\]]*)\]\(([^)]+)\)',
+            replace_md_image,
+            content
+        )
+
+        # 使用函数替换处理所有HTML图片
+        content = re.sub(
+            r'src=(["\']?)([^"\'>\s]+)\1',
+            replace_html_image,
+            content
+        )
+
+        # 先转换markdown到HTML
+        html_content = markdown.markdown(content)
+
+        # 将emoji shortcode转换为实际的emoji字符
+        html_content = emoji.emojize(html_content, language='alias')
+
+        return mark_safe(html_content)

apps/blog/static/blog/style.css

@@ -0,0 +1,340 @@
+body {
+    font-family: Arial, sans-serif;
+    margin: 0;
+    padding: 0;
+}
+
+.top-nav {
+    background-color: #007cba;
+    padding: 10px 0;
+    margin-bottom: 20px;
+}
+
+.nav-container {
+    max-width: 1200px;
+    margin: 0 auto;
+    padding: 0 20px;
+}
+
+.nav-links {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+}
+
+.nav-links li {
+    margin-right: 20px;
+}
+
+.nav-links li a {
+    color: white;
+    text-decoration: none;
+    padding: 8px 12px;
+    border-radius: 4px;
+    transition: background-color 0.3s;
+}
+
+.nav-links li a:hover {
+    background-color: rgba(255, 255, 255, 0.2);
+}
+
+.container {
+    display: flex;
+    max-width: 1200px;
+    margin: 0 auto;
+    padding: 20px;
+    min-height: 100vh;
+}
+
+.sidebar {
+    width: 250px;
+    padding-right: 20px;
+    border-right: 1px solid #eee;
+    position: -webkit-sticky;
+    position: sticky;
+    top: 20px;
+    align-self: flex-start;
+    height: fit-content;
+}
+
+.sidebar h3 {
+    color: #333;
+    border-bottom: 2px solid #007cba;
+    padding-bottom: 10px;
+}
+
+.sidebar ul {
+    list-style: none;
+    padding: 0;
+}
+
+.sidebar ul li {
+    margin: 10px 0;
+}
+
+.sidebar ul li a {
+    text-decoration: none;
+    color: #666;
+    display: block;
+    padding: 8px 12px;
+    border-radius: 4px;
+    transition: all 0.3s;
+}
+
+.sidebar ul li a:hover,
+.sidebar ul li a.active {
+    background-color: #007cba;
+    color: white;
+}
+
+.search-box {
+    margin-bottom: 20px;
+}
+
+.search-box input[type="text"] {
+    width: 100%;
+    padding: 8px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    box-sizing: border-box;
+}
+
+.search-box input[type="submit"] {
+    width: 100%;
+    padding: 8px;
+    background-color: #007cba;
+    color: white;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    margin-top: 5px;
+}
+
+.search-box input[type="submit"]:hover {
+    background-color: #005a87;
+}
+
+.search-type {
+    margin: 10px 0;
+}
+
+.search-type label {
+    display: block;
+    margin: 5px 0;
+    font-size: 14px;
+    color: #666;
+}
+
+.search-type input[type="radio"] {
+    margin-right: 5px;
+}
+
+.main-content {
+    flex: 1;
+    padding-left: 20px;
+}
+
+.main-content h1 {
+    color: #333;
+    border-bottom: 2px solid #eee;
+    padding-bottom: 10px;
+}
+
+footer {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    text-align: center;
+    font-size: 12px;
+    color: #999;
+    background-color: white;
+    padding: 5px 0;
+}
+
+.posts-list {
+    list-style: none;
+    padding: 0;
+}
+
+.posts-list li {
+    padding: 15px 0;
+    border-bottom: 1px solid #eee;
+}
+
+.posts-list li:last-child {
+    border-bottom: none;
+}
+
+.post-title {
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+.post-title a {
+    text-decoration: none;
+    color: #007cba;
+}
+
+.post-meta {
+    font-size: 14px;
+    color: #999;
+}
+
+.post-category {
+    display: inline-block;
+    background-color: #f0f0f0;
+    padding: 2px 6px;
+    border-radius: 3px;
+    font-size: 12px;
+    margin-top: 5px;
+}
+
+.post-summary {
+    margin: 10px 0;
+    line-height: 1.6;
+    color: #666;
+}
+
+.pagination {
+    margin-top: 20px;
+    text-align: center;
+}
+
+.pagination a {
+    display: inline-block;
+    padding: 8px 12px;
+    margin: 0 4px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    text-decoration: none;
+    color: #007cba;
+}
+
+.pagination a:hover {
+    background-color: #007cba;
+    color: white;
+}
+
+.pagination .current {
+    display: inline-block;
+    padding: 8px 12px;
+    margin: 0 4px;
+    background-color: #007cba;
+    color: white;
+    border-radius: 4px;
+}
+
+.post-content img {
+    max-width: 100%;
+    height: auto;
+    display: block;
+    margin: 10px 0;
+}
+
+.post-content pre {
+    background-color: #f4f4f4;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 10px;
+    overflow-x: auto;
+    margin: 10px 0;
+}
+
+.post-content code {
+    font-family: 'Courier New', Courier, monospace;
+    background-color: #f4f4f4;
+    padding: 2px 4px;
+    border-radius: 3px;
+    font-size: 0.9em;
+}
+
+.post-content pre code {
+    background-color: transparent;
+    padding: 0;
+    border-radius: 0;
+    font-size: 0.9em;
+}
+
+.contact-main,
+.rss-main {
+    background-color: #f9f9f9;
+    padding: 20px;
+    border-radius: 5px;
+    border: 1px solid #eee;
+}
+
+.contact-main h2,
+.rss-main h2 {
+    color: #333;
+    border-bottom: 2px solid #007cba;
+    padding-bottom: 10px;
+}
+
+.rss-main h2 {
+    border-bottom-color: #ff6600;
+}
+
+.contact-description,
+.rss-description {
+    margin: 15px 0;
+    line-height: 1.6;
+    color: #666;
+}
+
+.contact-details {
+    list-style: none;
+    padding: 0;
+}
+
+.contact-details li {
+    padding: 10px 0;
+    border-bottom: 1px solid #eee;
+}
+
+.contact-details li:last-child {
+    border-bottom: none;
+}
+
+.contact-label {
+    font-weight: bold;
+    color: #333;
+    display: inline-block;
+    width: 80px;
+}
+
+.contact-value {
+    color: #666;
+}
+
+.rss-feed-list {
+    list-style: none;
+    padding: 0;
+}
+
+.rss-feed-list li {
+    padding: 10px 0;
+    border-bottom: 1px solid #eee;
+}
+
+.rss-feed-list li:last-child {
+    border-bottom: none;
+}
+
+.rss-feed-link {
+    font-size: 16px;
+    font-weight: bold;
+    color: #007cba;
+    text-decoration: none;
+}
+
+.rss-feed-link:hover {
+    text-decoration: underline;
+}
+
+.rss-feed-description {
+    font-size: 14px;
+    color: #999;
+    margin-top: 5px;
+}

apps/blog/templates/blog/base.html

@@ -0,0 +1,72 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <title>{% block title %}六桂流芳的com{% endblock %}</title>
+    <link rel="stylesheet" href="{% static 'blog/style.css' %}">
+</head>
+<body>
+<div class="top-nav">
+    <div class="nav-container">
+        <h1 style="text-align: left; margin: 0; padding: 0;">
+            <a href="{% url 'index' %}" style="text-decoration: none; color: white;">六桂流芳的com</a>
+        </h1>
+        <ul class="nav-links">
+            <li><a href="{% url 'index' %}">首页</a></li>
+            <li><a href="{% url 'rss_page' %}">RSS订阅</a></li>
+            <li><a href="{% url 'contact_page' %}">联系我</a></li>
+        </ul>
+    </div>
+</div>
+
+<div class="container">
+    <div class="sidebar">
+        <div class="search-box">
+            <form method="get" action="{% url 'index' %}">
+                <input type="text" name="q" placeholder="搜索文章..." value="{{ query|default:'' }}">
+                <div class="search-type">
+                    <label>
+                        <input type="radio" name="search_type" value="all"
+                               {% if search_type != 'title' and search_type != 'content' %}checked{% endif %}>
+                        全文搜索
+                    </label>
+                    <label>
+                        <input type="radio" name="search_type" value="title"
+                               {% if search_type == 'title' %}checked{% endif %}>
+                        标题搜索
+                    </label>
+                    <label>
+                        <input type="radio" name="search_type" value="content"
+                               {% if search_type == 'content' %}checked{% endif %}>
+                        内容搜索
+                    </label>
+                </div>
+                <input type="submit" value="搜索">
+            </form>
+        </div>
+
+        <h3>文章分类</h3>
+        <ul>
+            <li><a href="{% url 'index' %}" {% if not selected_category %}class="active"{% endif %}>全部文章</a></li>
+            {% for category in categories %}
+                <li>
+                    <a href="{% url 'index' %}?category={{ category.id }}"
+                       {% if selected_category == category.id|stringformat:"s" %}class="active"{% endif %}>
+                        {{ category.name }}
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+    </div>
+
+    <div class="main-content">
+        {% block content %}{% endblock %}
+    </div>
+</div>
+
+<footer>
+    <a href="https://beian.miit.gov.cn/" target="_blank">闽ICP备2023010767号-2</a>
+</footer>
+</body>
+</html>

apps/blog/templates/blog/contact.html

@@ -0,0 +1,37 @@
+{% extends "blog/base.html" %}
+{% block title %}联系我 - 六桂流芳的com{% endblock %}
+{% block content %}
+<div class="contact-main">
+    <h2>联系我</h2>
+    <div class="contact-description">
+        如果您有任何问题或想与我交流，可以通过以下方式联系我：
+    </div>
+
+    <ul class="contact-details">
+        {% if site_settings.contact_email %}
+            <li>
+                <span class="contact-label">邮箱:</span>
+                <span class="contact-value">{{ site_settings.contact_email }}</span>
+            </li>
+        {% endif %}
+        {% if site_settings.contact_wechat %}
+            <li>
+                <span class="contact-label">微信:</span>
+                <span class="contact-value">{{ site_settings.contact_wechat }}</span>
+            </li>
+        {% endif %}
+        {% if site_settings.contact_linkedin %}
+            <li>
+                <span class="contact-label">LinkedIn:</span>
+                <span class="contact-value">{{ site_settings.contact_linkedin }}</span>
+            </li>
+        {% endif %}
+        {% if site_settings.contact_github %}
+            <li>
+                <span class="contact-label">GitHub:</span>
+                <span class="contact-value">{{ site_settings.contact_github }}</span>
+            </li>
+        {% endif %}
+    </ul>
+</div>
+{% endblock %}

apps/blog/templates/blog/detail.html

@@ -0,0 +1,13 @@
+{% extends "blog/base.html" %}
+{% block title %}{{ post.title }} - 六桂流芳的com{% endblock %}
+{% block content %}
+<h1 style="text-align: center;">{{ post.title }}</h1>
+<div class="post-meta">
+    <div style="display: flex; justify-content: space-between; align-items: center;">
+        <span>发布时间：{{ post.publish_date|date:"Y年n月j日 H:i" }}</span>
+        <a href="{% url 'index' %}" style="white-space: nowrap;">返回首页</a>
+    </div>
+</div>
+<div class="post-content">{{ post.get_markdown_content }}</div>
+<br>
+{% endblock %}

apps/blog/templates/blog/index.html

@@ -0,0 +1,46 @@
+{% extends "blog/base.html" %}
+{% block title %}六桂流芳的com{% endblock %}
+{% block content %}
+<ul class="posts-list">
+    {% for post in page_obj %}
+        <li>
+            <div class="post-title">
+                <a href="{% url 'detail' post.id %}">{{ post.title }}</a>
+            </div>
+            <div class="post-meta">
+                发布时间：{{ post.publish_date|date:"Y年n月j日 H:i" }}
+            </div>
+            <div class="post-summary">
+                {{ post.summary|safe }}
+            </div>
+            {% if post.category %}
+                <div class="post-category">
+                    {{ post.category.name }}
+                </div>
+            {% endif %}
+        </li>
+    {% endfor %}
+</ul>
+
+{% if page_obj.paginator.num_pages > 1 %}
+<div class="pagination">
+    {% if page_obj.has_previous %}
+        <a href="?page=1{% if query %}&q={{ query }}{% endif %}{% if search_type %}&search_type={{ search_type }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">&laquo;</a>
+        <a href="?page={{ page_obj.previous_page_number }}{% if query %}&q={{ query }}{% endif %}{% if search_type %}&search_type={{ search_type }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">&lsaquo;</a>
+    {% endif %}
+
+    {% for num in page_obj.paginator.page_range %}
+        {% if page_obj.number == num %}
+            <span class="current">{{ num }}</span>
+        {% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %}
+            <a href="?page={{ num }}{% if query %}&q={{ query }}{% endif %}{% if search_type %}&search_type={{ search_type }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">{{ num }}</a>
+        {% endif %}
+    {% endfor %}
+
+    {% if page_obj.has_next %}
+        <a href="?page={{ page_obj.next_page_number }}{% if query %}&q={{ query }}{% endif %}{% if search_type %}&search_type={{ search_type }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">&rsaquo;</a>
+        <a href="?page={{ page_obj.paginator.num_pages }}{% if query %}&q={{ query }}{% endif %}{% if search_type %}&search_type={{ search_type }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">&raquo;</a>
+    {% endif %}
+</div>
+{% endif %}
+{% endblock %}

apps/blog/templates/blog/rss.html

@@ -0,0 +1,33 @@
+{% extends "blog/base.html" %}
+{% block title %}RSS订阅 - 六桂流芳的com{% endblock %}
+{% block content %}
+<div class="rss-main">
+    <h2>RSS订阅</h2>
+    <div class="rss-description">
+        RSS是一种用于发布经常更新的内容的网页格式。通过RSS阅读器，您可以订阅我们的内容，及时获取最新文章更新。
+        点击下面的链接可以在浏览器中查看RSS内容，使用RSS阅读器订阅时请复制链接地址。
+    </div>
+
+    <ul class="rss-feed-list">
+        <li>
+            <a href="{% url 'rss_feed' %}" class="rss-feed-link" target="_blank">最新文章</a>
+            <div class="rss-feed-description">包含最新的10篇博客文章</div>
+        </li>
+        <li>
+            <a href="{% url 'recent_feed' %}" class="rss-feed-link" target="_blank">最近更新</a>
+            <div class="rss-feed-description">包含最新的20篇博客文章</div>
+        </li>
+        <li>
+            <a href="{% url 'all_feed' %}" class="rss-feed-link" target="_blank">全部文章</a>
+            <div class="rss-feed-description">包含所有博客文章</div>
+        </li>
+        {% for category in categories %}
+            <li>
+                <a href="{% url 'category_feed' category.id %}" class="rss-feed-link"
+                   target="_blank">{{ category.name }}分类</a>
+                <div class="rss-feed-description">{{ category.name }}分类下的最新博客文章</div>
+            </li>
+        {% endfor %}
+    </ul>
+</div>
+{% endblock %}

apps/blog/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

apps/blog/urls.py

@@ -0,0 +1,16 @@
+from django.urls import path
+from . import views
+from .feeds import LatestPostsFeed, CategoryPostsFeed, RecentPostsFeed, AllPostsFeed
+
+urlpatterns = [
+    path('', views.index, name='index'),
+    path('post/<int:post_id>/', views.detail, name='detail'),
+    # 添加RSS页面路由
+    path('rss/page/', views.rss_page, name='rss_page'),
+    # 添加联系我页面路由
+    path('contact/', views.contact_page, name='contact_page'),
+    path('rss/', LatestPostsFeed(), name='rss_feed'),
+    path('rss/category/<int:category_id>/', CategoryPostsFeed(), name='category_feed'),
+    path('rss/recent/', RecentPostsFeed(), name='recent_feed'),
+    path('rss/all/', AllPostsFeed(), name='all_feed'),
+]

apps/blog/views.py

@@ -0,0 +1,73 @@
+import re
+
+from django.shortcuts import render, get_object_or_404
+from django.core.paginator import Paginator
+from .models import Post, Category, SiteSettings
+
+
+def index(request):
+    categories = Category.objects.all()
+    site_settings = SiteSettings.objects.first()
+    summary_length = site_settings.summary_length if site_settings else 50
+
+    category_id = request.GET.get('category')
+    query = request.GET.get('q')
+    search_type = request.GET.get('search_type', 'all')
+
+    if query:
+        if search_type == 'title':
+            posts = Post.objects.filter(title__icontains=query, status=Post.PUBLISHED)
+        elif search_type == 'content':
+            posts = Post.objects.filter(content__icontains=query, status=Post.PUBLISHED)
+        else:
+            posts = Post.objects.filter(title__icontains=query, status=Post.PUBLISHED) | Post.objects.filter(content__icontains=query, status=Post.PUBLISHED)
+    elif category_id:
+        posts = Post.objects.filter(category_id=category_id, status=Post.PUBLISHED)
+    else:
+        posts = Post.objects.filter(status=Post.PUBLISHED)
+
+    posts = posts.order_by('-publish_date').distinct()
+
+    paginator = Paginator(posts, 10)
+    page_number = request.GET.get('page')
+    page_obj = paginator.get_page(page_number)
+
+    for post in page_obj:
+        clean_content = re.sub(r'<[^>]+>', '', post.get_markdown_content())
+        post.summary = clean_content[:summary_length] + '...' if len(clean_content) > summary_length else clean_content
+
+    return render(request, 'blog/index.html', {
+        'page_obj': page_obj,
+        'categories': categories,
+        'selected_category': category_id,
+        'query': query,
+        'search_type': search_type,
+        'site_settings': site_settings,
+    })
+
+
+def detail(request, post_id):
+    post = get_object_or_404(Post, pk=post_id, status=Post.PUBLISHED)
+    categories = Category.objects.all()
+    site_settings = SiteSettings.objects.first()
+    return render(request, 'blog/detail.html', {
+        'post': post,
+        'categories': categories,
+        'site_settings': site_settings,
+    })
+
+
+def rss_page(request):
+    categories = Category.objects.all()
+    site_settings = SiteSettings.objects.first()
+    return render(request, 'blog/rss.html', {
+        'categories': categories,
+        'site_settings': site_settings,
+    })
+
+
+def contact_page(request):
+    site_settings = SiteSettings.objects.first()
+    return render(request, 'blog/contact.html', {
+        'site_settings': site_settings,
+    })