Merge pull request 'master' (#6) from master into dev

Reviewed-on: #6

apps/blog/templates/blog/base.html

@@ -15,8 +15,8 @@
     {% endblock %}
     <link rel="shortcut icon" href="{% static 'blog/img/favicon.png' %}" type="image/x-icon"/>
     <!-- Bootstrap and font-awesome CSS -->
-    <link href="https://file.lynchow.com/bootstrap.min.css" rel="stylesheet">
-    <link href="https://file.lynchow.com/font-awesome.min.css" rel="stylesheet">
+    <link href="https://files.lynchow.com/bootstrap.min.css" rel="stylesheet">
+    <link href="https://files.lynchow.com/font-awesome.min.css" rel="stylesheet">
     <script src="{% static 'blog/js/headroom.min.js' %}"></script>
     <!-- blog CSS -->
     <link href="{% static 'blog/css/base.css' %}" rel="stylesheet">
@@ -38,8 +38,7 @@
 {% if messages %}
     <div class="container">
         {% for message in messages %}
-            <div class="alert {% if message.tags %}alert-
-                {{ message.tags }}{% else %}alert-secondary{% endif %} alert-dismissible rounded-0 fade show"
+            <div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-secondary{% endif %} alert-dismissible rounded-0 fade show"
                  role="alert">
                 {{ message }}
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -59,11 +58,11 @@
 <main>{% block base_content %}{% endblock %}</main>
 <!-- Optional JavaScript -->
 <!-- jQuery first, then Popper.js, then Bootstrap JS -->
-<script src="https://file.lynchow.com/jquery.min.js"></script>
+<script src="https://files.lynchow.com/jquery.min.js"></script>
 <!--js cookie 插件-->
 <script src="{% static 'blog/js/js.cookie.min.js' %}"></script>
-<script src="https://file.lynchow.com/popper.min.js"></script>
-<script src="https://file.lynchow.com/bootstrap.min.js"></script>
+<script src="https://files.lynchow.com/popper.min.js"></script>
+<script src="https://files.lynchow.com/bootstrap.min.js"></script>
 <script>
     $(function () {
         var myElement = document.querySelector(".blog-navbar");

apps/blog/templates/blog/tags/navbar.html

@@ -1,6 +1,6 @@
 {% load static oauth_tags comment_tags %}
 <nav class="navbar navbar-expand-md bg-white fixed-top blog-navbar py-md-0">
-    <a class="navbar-brand d-md-none d-lg-block" id="site-logo-name" href="http://www.lynchow.com">
+    <a class="navbar-brand d-md-none d-lg-block" id="site-logo-name" href="https://www.lynchow.com">
         <img src="{% static 'blog/img/logo.png' %}" height="50px" alt="{{ site_end_title }}">
     </a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"

it_blog/settings.py

@@ -21,6 +21,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    "corsheaders",
     'django.contrib.humanize',  # 添加人性化过滤器
     'django.contrib.sitemaps',  # 网站地图
 
@@ -64,6 +65,7 @@ CRISPY_TEMPLATE_PACK = 'bootstrap4'
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    "corsheaders.middleware.CorsMiddleware",
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -224,3 +226,7 @@ HAO_CONSOLE = {
     'name': os.getenv('IZONE_HAO_NAME', '微草导航'),
     'url': os.getenv('IZONE_HAO_URL', 'https://hao.tendcode.com')
 }
+
+CORS_ALLOW_CREDENTIALS = True
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ALLOW_HEADERS = ['*']

templates/admin/base.html

@@ -7,7 +7,7 @@
   <title>{% block title %}{% endblock %}</title>
 
   {% block bootstrap_admin_css %}
-    <link rel="stylesheet" href="https://file.lynchow.com/bootstrap3.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://files.lynchow.com/bootstrap3.min.css"> <!--integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">-->
   {% endblock bootstrap_admin_css %}
 
   <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static 'admin/css/base.css' %}{% endblock %}" />
@@ -188,10 +188,10 @@
 
 {% block bootstrap_admin_js %}
   <script>if (typeof jQuery === 'undefined' && django && django.jQuery) {jQuery = django.jQuery;}</script>
-  <script src="https://file.lynchow.com/bootstrap3.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+  <script src="https://files.lynchow.com/bootstrap3.min.js"></script> <!--integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>-->
   <script src="{% static 'bootstrap_admin/js/base.js' %}"></script>
 {% endblock bootstrap_admin_js %}
 
 {% block js %}{% endblock js %}
 </body>
-</html>
+</html>