添加项目文件

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/DjangoBlog2.iml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="djangoblog/settings.py" />
+        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.10" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/templates" />
+      </list>
+    </option>
+  </component>
+</module>

.idea/inspectionProfiles/profiles_settings.xml

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

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.10" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/DjangoBlog2.iml" filepath="$PROJECT_DIR$/.idea/DjangoBlog2.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

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

README.md

@@ -10,7 +10,7 @@
 <p align="center">
   <b>一款功能强大、设计优雅的现代化博客系统</b>
   <br>
-  <a href="/docs/README-en.md">English</a> • <b>简体中文</b>
+  <a href="/src/docs/README-en.md">English</a> • <b>简体中文</b>
 </p>
 
 ---
@@ -80,7 +80,7 @@ pip install -r requirements.txt
   ```
 
 - **更多配置**:
-  关于邮件发送、OAuth 登录、缓存等更多高级配置，请参阅我们的 [详细配置文档](/docs/config.md)。
+  关于邮件发送、OAuth 登录、缓存等更多高级配置，请参阅我们的 [详细配置文档](/src/docs/config.md)。
 
 ### 4. 初始化数据库
 
@@ -111,8 +111,8 @@ python manage.py runserver
 ## 部署
 
 - **传统部署**: 我们为您准备了非常详细的 [服务器部署教程](https://www.lylinux.net/article/2019/8/5/58.html)。
-- **Docker 部署**: 项目已全面支持 Docker。如果您熟悉容器化技术，请参考 [Docker 部署文档](/docs/docker.md) 来快速启动。
-- **Kubernetes 部署**: 我们也提供了完整的 [Kubernetes 部署指南](/docs/k8s.md)，助您轻松上云。
+- **Docker 部署**: 项目已全面支持 Docker。如果您熟悉容器化技术，请参考 [Docker 部署文档](/src/docs/docker.md) 来快速启动。
+- **Kubernetes 部署**: 我们也提供了完整的 [Kubernetes 部署指南](/src/docs/k8s.md)，助您轻松上云。
 
 ## 🧩 插件系统
 
@@ -128,7 +128,7 @@ python manage.py runserver
 
 ## 📄 许可证
 
-本项目基于 [MIT License](LICENSE) 开源。
+本项目基于 [MIT License](src/LICENSE) 开源。
 
 ---
 
@@ -137,8 +137,8 @@ python manage.py runserver
 如果您觉得这个项目对您有帮助，并且希望支持我继续维护和开发新功能，欢迎请我喝杯咖啡！您的每一份支持都是我前进的最大动力。
 
 <p align="center">
-  <img src="/docs/imgs/alipay.jpg" width="150" alt="支付宝赞助">
-  <img src="/docs/imgs/wechat.jpg" width="150" alt="微信赞助">
+  <img src="/src/docs/imgs/alipay.jpg" width="150" alt="支付宝赞助">
+  <img src="/src/docs/imgs/wechat.jpg" width="150" alt="微信赞助">
 </p>
 <p align="center">
   <i>(左) 支付宝 / (右) 微信</i>
@@ -150,7 +150,7 @@ python manage.py runserver
 
 <p align="center">
   <a href="https://www.jetbrains.com/?from=DjangoBlog">
-    <img src="/docs/imgs/pycharm_logo.png" width="150" alt="JetBrains Logo">
+    <img src="/src/docs/imgs/pycharm_logo.png" width="150" alt="JetBrains Logo">
   </a>
 </p>
 

djangoblog/settings.py

@@ -54,12 +54,12 @@ INSTALLED_APPS = [
     'django.contrib.sitemaps',
     'mdeditor',
     'haystack',
-    'blog',
-    'accounts',
-    'comments',
-    'oauth',
-    'servermanager',
-    'owntracks',
+    'src.blog',
+    'src.accounts',
+    'src.comments',
+    'src.oauth',
+    'src.servermanager',
+    'src.owntracks',
     'compressor',
     'djangoblog'
 ]
@@ -78,7 +78,7 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.http.ConditionalGetMiddleware',
-    'blog.middleware.OnlineMiddleware'
+    'src.blog.middleware.OnlineMiddleware'
 ]
 
 ROOT_URLCONF = 'djangoblog.urls'
@@ -86,7 +86,7 @@ ROOT_URLCONF = 'djangoblog.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'templates')],
+        'DIRS': [os.path.join(BASE_DIR, 'src/templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -94,7 +94,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'blog.context_processors.seo_processor'
+                'src.blog.context_processors.seo_processor'
             ],
         },
     },
@@ -143,7 +143,7 @@ LANGUAGES = (
     ('zh-hant', _('Traditional Chinese')),
 )
 LOCALE_PATHS = (
-    os.path.join(BASE_DIR, 'locale'),
+    os.path.join(BASE_DIR, 'src/locale'),
 )
 
 LANGUAGE_CODE = 'zh-hans'
@@ -170,7 +170,7 @@ HAYSTACK_CONNECTIONS = {
 HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
 # Allow user login with username and password
 AUTHENTICATION_BACKENDS = [
-    'accounts.user_login_backend.EmailOrUsernameModelBackend']
+    'src.accounts.user_login_backend.EmailOrUsernameModelBackend']
 
 STATIC_ROOT = os.path.join(BASE_DIR, 'collectedstatic')
 
@@ -179,10 +179,10 @@ STATICFILES = os.path.join(BASE_DIR, 'static')
 
 # 添加插件静态文件目录
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, 'plugins'),  # 让Django能找到插件的静态文件
+    os.path.join(BASE_DIR, 'src/plugins'),  # 让Django能找到插件的静态文件
 ]
 
-AUTH_USER_MODEL = 'accounts.BlogUser'
+AUTH_USER_MODEL = 'src.accounts.BlogUser'
 LOGIN_URL = '/login/'
 
 TIME_FORMAT = '%Y-%m-%d %H:%M:%S'

djangoblog/urls.py

@@ -59,19 +59,19 @@ urlpatterns = [
 ]
 urlpatterns += i18n_patterns(
     re_path(r'^admin/', admin_site.urls),
-    re_path(r'', include('blog.urls', namespace='blog')),
+    re_path(r'', include('src.blog.urls', namespace='blog')),
     re_path(r'mdeditor/', include('mdeditor.urls')),
-    re_path(r'', include('comments.urls', namespace='comment')),
-    re_path(r'', include('accounts.urls', namespace='account')),
-    re_path(r'', include('oauth.urls', namespace='oauth')),
+    re_path(r'', include('src.comments.urls', namespace='comment')),
+    re_path(r'', include('src.accounts.urls', namespace='account')),
+    re_path(r'', include('src.oauth.urls', namespace='oauth')),
     re_path(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps},
             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'),
-    re_path(r'', include('servermanager.urls', namespace='servermanager')),
-    re_path(r'', include('owntracks.urls', namespace='owntracks'))
+    re_path(r'', include('src.servermanager.urls', namespace='servermanager')),
+    re_path(r'', include('src.owntracks.urls', namespace='owntracks'))
     , prefix_default_language=False) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL,

src/.dockerignore

@@ -1,12 +1,12 @@
-bin/data/
-# virtualenv
-venv/
-collectedstatic/
-djangoblog/whoosh_index/
-uploads/
-settings_production.py
-*.md
-docs/
-logs/
-static/
-.github/
+bin/data/
+# virtualenv
+venv/
+collectedstatic/
+djangoblog/whoosh_index/
+uploads/
+settings_production.py
+*.md
+docs/
+logs/
+static/
+.github/

src/.gitignore

@@ -52,7 +52,7 @@ coverage.xml
 logs/
 
 # Sphinx documentation
-docs/_build/
+src/docs/_build/
 
 # PyBuilder
 target/
@@ -60,7 +60,7 @@ target/
 
 # PyCharm
 # http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
+../.idea
 .iml
 # virtualenv
 venv/

src/Dockerfile

@@ -10,6 +10,6 @@ RUN pip install --upgrade pip  && \
         pip install --no-cache-dir gunicorn[gevent] && \
         pip cache purge
         
-ADD . .
+ADD .. .
 RUN chmod +x /code/djangoblog/deploy/entrypoint.sh
 ENTRYPOINT ["/code/djangoblog/deploy/entrypoint.sh"]