diff --git a/README.md b/README.md
index 89159bd..0e46bcd 100644
--- a/README.md
+++ b/README.md
@@ -56,4 +56,11 @@ python manage.py runserver 9999
2025年6月23日
新增
1.友联管理
- 2.站点设置
\ No newline at end of file
+ 2.站点设置
+
+###### 1.2.3
+ 2025年6月234日
+ 新增
+ 1.分类管理
+ 2.文章分类的设置
+ 3.分类文章的列表
\ No newline at end of file
diff --git a/db.sqlite3 b/db.sqlite3
index b05c069..106d491 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/home/__pycache__/admin.cpython-39.pyc b/home/__pycache__/admin.cpython-39.pyc
index 69620bd..3ab786e 100644
Binary files a/home/__pycache__/admin.cpython-39.pyc and b/home/__pycache__/admin.cpython-39.pyc differ
diff --git a/home/__pycache__/models.cpython-39.pyc b/home/__pycache__/models.cpython-39.pyc
index 1772015..241facc 100644
Binary files a/home/__pycache__/models.cpython-39.pyc and b/home/__pycache__/models.cpython-39.pyc differ
diff --git a/home/__pycache__/urls.cpython-39.pyc b/home/__pycache__/urls.cpython-39.pyc
index 8e664a1..19caa6e 100644
Binary files a/home/__pycache__/urls.cpython-39.pyc and b/home/__pycache__/urls.cpython-39.pyc differ
diff --git a/home/__pycache__/views.cpython-39.pyc b/home/__pycache__/views.cpython-39.pyc
index 2414368..5f99fed 100644
Binary files a/home/__pycache__/views.cpython-39.pyc and b/home/__pycache__/views.cpython-39.pyc differ
diff --git a/home/admin.py b/home/admin.py
index a4e55c1..6154cf6 100644
--- a/home/admin.py
+++ b/home/admin.py
@@ -22,4 +22,8 @@ class ArticlesLikeAdmin(admin.ModelAdmin):
# 分页显示，一页的数量
list_per_page = 10
- actions_on_top = True
\ No newline at end of file
+ actions_on_top = True
+
+@admin.register(ArticleTag)
+class ArticleTagAdmin(admin.ModelAdmin):
+ list_display = ('id', 'tag')
\ No newline at end of file
diff --git a/home/migrations/0007_articletag_articles_tag_id.py b/home/migrations/0007_articletag_articles_tag_id.py
new file mode 100644
index 0000000..e307afc
--- /dev/null
+++ b/home/migrations/0007_articletag_articles_tag_id.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.2.23 on 2025-06-24 01:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('home', '0006_alter_articles_table_alter_articleslike_table'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='ArticleTag',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('tag', models.CharField(max_length=120)),
+ ],
+ options={
+ 'verbose_name': '标签',
+ 'verbose_name_plural': '标签管理',
+ 'db_table': 'ArticleTag',
+ },
+ ),
+ migrations.AddField(
+ model_name='articles',
+ name='tag_id',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='home.articletag', verbose_name='文章标签'),
+ ),
+ ]
diff --git a/home/migrations/__pycache__/0007_articletag_articles_tag_id.cpython-39.pyc b/home/migrations/__pycache__/0007_articletag_articles_tag_id.cpython-39.pyc
new file mode 100644
index 0000000..f767136
Binary files /dev/null and b/home/migrations/__pycache__/0007_articletag_articles_tag_id.cpython-39.pyc differ
diff --git a/home/models.py b/home/models.py
index c0397c2..f996b00 100644
--- a/home/models.py
+++ b/home/models.py
@@ -2,15 +2,25 @@ from django.db import models
# Create your models here.
+class ArticleTag(models.Model):
+ id = models.AutoField(primary_key=True)
+ tag = models.CharField(max_length=120)
+ def __str__(self):
+ return self.tag
+ class Meta:
+ verbose_name = "标签"
+ verbose_name_plural = "标签管理"
+ db_table = 'ArticleTag'
+
class Articles(models.Model):
title = models.CharField(max_length=100,verbose_name="文章标题")
content = models.TextField(verbose_name="文章内容")
abstract = models.TextField(verbose_name="文章摘要")
author = models.TextField(default="admin", verbose_name="文章作者")
- # created = models.DateTimeField(auto_now_add=True,verbose_name="发布时间")
created = models.DateTimeField(verbose_name="发布时间")
stat = models.IntegerField(default=0,verbose_name="点赞数量")
read = models.IntegerField(default=0,verbose_name="阅读数量")
+ tag_id = models.ForeignKey(ArticleTag, on_delete=models.SET_NULL, null=True, blank=True, verbose_name="文章标签")
class Meta:
diff --git a/home/templates/bottom.html b/home/templates/bottom.html
index ad2dd68..e7b8795 100644
--- a/home/templates/bottom.html
+++ b/home/templates/bottom.html
@@ -19,11 +19,9 @@
@@ -56,11 +54,9 @@
diff --git a/home/urls.py b/home/urls.py
index acf768b..3732f66 100644
--- a/home/urls.py
+++ b/home/urls.py
@@ -4,5 +4,6 @@ from home import views as v
urlpatterns = [
path('',v.index),
- path('archives/', v.archives)
+ path('archives/', v.archives),
+ path('category/', v.category)
]
\ No newline at end of file
diff --git a/home/views.py b/home/views.py
index d16ac7d..ffdb570 100644
--- a/home/views.py
+++ b/home/views.py
@@ -1,9 +1,11 @@
from django.shortcuts import render, HttpResponse
+from pip._vendor.rich.markup import Tag
+
from home.models import *
from comment.models import *
from siteconfig.models import *
# Create your views here.
-
+# 获取站点信息的函数
def get_site_config():
siteconf = SiteConfig.objects.all()[0]
siteconfig = {
@@ -14,47 +16,30 @@ def get_site_config():
"icp": siteconf.icp,
}
return siteconfig
-
+# 获取标签列表的函数
+def get_tag_list():
+ taginfos = ArticleTag.objects.all()
+ tags = []
+ for taginfo in taginfos:
+ tags.append({"name":taginfo.tag,"id":taginfo.id})
+ return tags
+# 获取友情链接列表的函数
def get_friendship_links():
friendship_links = []
FriendshipLinks = FriendshipLink.objects.all()
for link in FriendshipLinks:
friendship_links.append({"link": link.friendship_site_link,"name": link.friendship_site_name})
return friendship_links
-def index(request):
- artchle = Articles.objects.all()
-
- artchles = {
- "artchles": [],
- "site_config": get_site_config(),
- "FriendshipLinks": get_friendship_links()
- }
- for i in artchle:
- a = {
- "id":i.id,
- "title": i.title,
- "abstract": i.abstract,
- "created": i.created,
- "stat": i.stat,
- "read": i.read,
- }
- artchles["artchles"].append(a)
-
- return render(request, 'index.html', context=artchles)
-
-
-def archives(request, id):
+# 获取文章详情的函数
+def get_archives_info(id):
i = Articles.objects.get(id=id)
- i.read += 1
- i.save()
previous_article = Articles.objects.filter(id__lt=id).order_by('-id').first()
previous_id = previous_article.id if previous_article else id
previous_id_title = previous_article.title if previous_article else "暂无上一篇"
next_article = Articles.objects.filter(id__gt=id).order_by('id').first()
next_id = next_article.id if next_article else id
next_id_title = next_article.title if next_article else "暂无下一篇"
- comments = Comment.objects.filter(archives_id=id).order_by("-comment_time").all()
- a = {
+ return {
"id": i.id,
"title": i.title,
"abstract": i.abstract,
@@ -71,9 +56,44 @@ def archives(request, id):
"id": next_id,
"title": next_id_title,
},"comments": [],
- "FriendshipLinks": get_friendship_links()
+ "FriendshipLinks": get_friendship_links(),
+ "tags": get_tag_list()
}
- print(a)
+# 获取文章列表的函数(option不为1时以tag_id进行查询)
+def get_artchle(option=1,id=None):
+ if option == 1:
+ artchle = Articles.objects.all()
+ else:
+ artchle = Articles.objects.filter(tag_id=id).all()
+
+ artchles = {
+ "artchles": [],
+ "site_config": get_site_config(),
+ "FriendshipLinks": get_friendship_links(),
+ "tags": get_tag_list()
+ }
+ for i in artchle:
+ a = {
+ "id": i.id,
+ "title": i.title,
+ "abstract": i.abstract,
+ "created": i.created,
+ "stat": i.stat,
+ "read": i.read,
+ }
+ artchles["artchles"].append(a)
+ return artchles
+# 首页视图函数
+def index(request):
+ return render(request, 'index.html', context=get_artchle())
+# 文章页视图函数
+def archives(request, id):
+ i = Articles.objects.get(id=id)
+ i.read += 1
+ i.save()
+
+ comments = Comment.objects.filter(archives_id=id).order_by("-comment_time").all()
+ a = get_archives_info(id)
for c in comments:
com = {
"id": c.id,
@@ -83,4 +103,7 @@ def archives(request, id):
"qq": c.qq,
}
a["comments"].append(com)
- return render(request, 'archives.html', a)
\ No newline at end of file
+ return render(request, 'archives.html', a)
+# 分类页视图函数
+def category(request,id):
+ return render(request, 'index.html', context=get_artchle(option=2,id=id))
\ No newline at end of file