Compare commits

...

No commits in common. 'master' and 'wjy_branch' have entirely different histories.

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pythonProject3)" project-jdk-type="Python SDK" />
</project>

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
<option name="TEMPLATE_FOLDERS">
<list>
<option value="$MODULE_DIR$/src/DjangoBlog-master/templates" />
</list>
</option>
</component>
</module>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="7ed1262e-2c2a-4083-b5bb-8ba2618e8817" name="更改" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="33KOopbv8QJVXNzKCTSOqOKd6ce" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
<option name="sortByType" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"WebServerToolWindowFactoryState": "false",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
<changelist id="7ed1262e-2c2a-4083-b5bb-8ba2618e8817" name="更改" comment="" />
<created>1759062474226</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1759062474226</updated>
<workItem from="1759062477593" duration="2599000" />
<workItem from="1760195066570" duration="236000" />
<workItem from="1760195469369" duration="1343000" />
<workItem from="1760277383195" duration="3938000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
</project>

@ -1 +0,0 @@
# Documentation

Binary file not shown.

@ -11,6 +11,8 @@ from .models import Article
class ArticleForm(forms.ModelForm):
# body = forms.CharField(widget=AdminPagedownWidget())
# 可以在这里添加自定义字段比如使用特定的widget
# body = forms.CharField(widget=AdminPagedownWidget())
class Meta:
model = Article
@ -53,10 +55,15 @@ class ArticlelAdmin(admin.ModelAdmin):
'status',
'type',
'article_order')
# 可点击进入编辑页的字段
list_display_links = ('id', 'title')
# 右侧过滤器选项
list_filter = ('status', 'type', 'category')
# 水平选择器(用于多对多字段)
filter_horizontal = ('tags',)
# 排除的字段(在编辑表单中不显示)
exclude = ('creation_time', 'last_modify_time')
# 是否显示"在站点查看"链接
view_on_site = True
actions = [
makr_article_publish,
@ -65,14 +72,19 @@ class ArticlelAdmin(admin.ModelAdmin):
open_article_commentstatus]
def link_to_category(self, obj):
# 获取分类模型的app和model名称
info = (obj.category._meta.app_label, obj.category._meta.model_name)
# 生成分类编辑页面的URL
link = reverse('admin:%s_%s_change' % info, args=(obj.category.id,))
# 返回HTML格式的链接
return format_html(u'<a href="%s">%s</a>' % (link, obj.category.name))
# 设置该字段在admin中的显示名称
link_to_category.short_description = _('category')
def get_form(self, request, obj=None, **kwargs):
form = super(ArticlelAdmin, self).get_form(request, obj, **kwargs)
# 限制作者字段只能选择超级用户
form.base_fields['author'].queryset = get_user_model(
).objects.filter(is_superuser=True)
return form
@ -82,8 +94,10 @@ class ArticlelAdmin(admin.ModelAdmin):
def get_view_on_site_url(self, obj=None):
if obj:
# 如果提供了文章对象返回文章的完整URL
url = obj.get_full_url()
return url
# 如果没有提供对象,返回站点域名
else:
from djangoblog.utils import get_current_site
site = get_current_site().domain
@ -91,20 +105,24 @@ class ArticlelAdmin(admin.ModelAdmin):
class TagAdmin(admin.ModelAdmin):
# 排除不需要在admin表单中显示的字段
exclude = ('slug', 'last_mod_time', 'creation_time')
class CategoryAdmin(admin.ModelAdmin):
list_display = ('name', 'parent_category', 'index')
# 排除不需要在admin表单中显示的字段
exclude = ('slug', 'last_mod_time', 'creation_time')
class LinksAdmin(admin.ModelAdmin):
# 排除不需要在admin表单中显示的字段
exclude = ('last_mod_time', 'creation_time')
class SideBarAdmin(admin.ModelAdmin):
list_display = ('name', 'content', 'is_enable', 'sequence')
# 排除不需要在admin表单中显示的字段
exclude = ('last_mod_time', 'creation_time')

@ -8,35 +8,50 @@ from blog.documents import ELASTICSEARCH_ENABLED, ElaspedTimeDocumentManager
logger = logging.getLogger(__name__)
# 获取当前模块的日志记录器
class OnlineMiddleware(object):
def __init__(self, get_response=None):
# 初始化中间件保存get_response函数引用
self.get_response = get_response
super().__init__()
def __call__(self, request):
''' page render time '''
# 记录请求开始时间
start_time = time.time()
# 调用后续中间件和视图处理请求,获取响应
response = self.get_response(request)
# 从请求头中获取用户代理信息
http_user_agent = request.META.get('HTTP_USER_AGENT', '')
# 获取客户端IP地址
ip, _ = get_client_ip(request)
# 解析用户代理字符串
user_agent = parse(http_user_agent)
# 只处理非流式响应
if not response.streaming:
try:
# 计算请求处理耗时
cast_time = time.time() - start_time
# 如果Elasticsearch功能启用记录详细访问信息
if ELASTICSEARCH_ENABLED:
# 将秒转换为毫秒并保留两位小数
time_taken = round((cast_time) * 1000, 2)
url = request.path
# 导入时间处理模块
from django.utils import timezone
# 创建Elasticsearch文档记录访问信息
ElaspedTimeDocumentManager.create(
url=url,
time_taken=time_taken,
log_datetime=timezone.now(),
useragent=user_agent,
ip=ip)
url=url,# 访问的URL路径
time_taken=time_taken, # 请求处理耗时(毫秒)
log_datetime=timezone.now(),# 记录时间
useragent=user_agent,# 用户代理信息
ip=ip)# 客户端IP地址
# 在响应内容中替换加载时间占位符
# 将处理时间插入到HTML模板的特定位置
response.content = response.content.replace(
b'<!!LOAD_TIMES!!>', str.encode(str(cast_time)[:5]))
except Exception as e:
# 记录处理过程中出现的任何错误
logger.error("Error OnlineMiddleware: %s" % e)
# 返回处理后的响应
return response

Binary file not shown.
Loading…
Cancel
Save