Merge pull request #147 from liangliangyy/dev

去掉文章slug配置， close #144

DjangoBlog/settings.py

@@ -19,22 +19,21 @@
 # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY')
+SECRET_KEY = 'n9ceqv38)#&mwuat@(mjb_p%em$e8$qyr#fw9ot!=ba6lijx-6'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 # DEBUG = False
 TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'
 
 # ALLOWED_HOSTS = []
-ALLOWED_HOSTS = ['*', 'www.lylinux.net', '127.0.0.1', 'example.com']
+ALLOWED_HOSTS = ['*', '127.0.0.1', 'example.com']
 # Application definition
 
 
 SITE_ROOT = os.path.dirname(os.path.abspath(__file__))
 SITE_ROOT = os.path.abspath(os.path.join(SITE_ROOT, '../'))
 
-
 INSTALLED_APPS = [
     # 'django.contrib.admin',
     'django.contrib.admin.apps.SimpleAdminConfig',
@@ -45,7 +44,6 @@
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.sitemaps',
-    'raven.contrib.django.raven_compat',
     'pagedown',
     'haystack',
     'blog',
@@ -214,8 +212,8 @@
     'version': 1,
     'disable_existing_loggers': False,
     'root': {
-        'level': 'WARNING',
-        'handlers': ['sentry', 'console', 'log_file'],
+        'level': 'INFO',
+        'handlers': ['console', 'log_file'],
     },
     'formatters': {
         'verbose': {
@@ -251,34 +249,19 @@
             'level': 'ERROR',
             'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
-        },
-        'sentry': {
-            'level': 'ERROR',  # To capture more than ERROR, change to WARNING, INFO, etc.
-            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-            'tags': {'custom-tag': 'x'},
-        },
+        }
     },
     'loggers': {
         'djangoblog': {
-            'handlers': ['log_file', 'console', 'sentry'],
+            'handlers': ['log_file', 'console'],
             'level': 'INFO',
             'propagate': True,
         },
         'django.request': {
-            'handlers': ['mail_admins', 'sentry'],
+            'handlers': ['mail_admins'],
             'level': 'ERROR',
             'propagate': False,
-        },
-        'raven': {
-            'level': 'DEBUG',
-            'handlers': ['console'],
-            'propagate': False,
-        },
-        'sentry.errors': {
-            'level': 'DEBUG',
-            'handlers': ['console'],
-            'propagate': False,
-        },
+        }
     }
 }
 

README.md

@@ -42,9 +42,6 @@ windows电脑：
 
 有详细的部署介绍.
 
-为了安全起见，没有把`SECRET_KEY`上传到Github中而是在环境变量中配置的，如果你想要正常运行的话，需要修改`settings.py`中的`SECRET_KEY`为你自己的就可以了。  
-如：`SECRET_KEY = 'n9ceqv38)#&mwuat@(mjb_p%em$e8$qyr#fw9ot!=ba6lijx-6'`
-
 
 ## 运行
 

blog/models.py

@@ -14,15 +14,15 @@
 
 
 class BaseModel(models.Model):
-    slug = models.SlugField(default='no-slug', max_length=160, blank=True)
     created_time = models.DateTimeField('创建时间', default=now)
     last_mod_time = models.DateTimeField('修改时间', default=now)
 
     def save(self, *args, **kwargs):
         from DjangoBlog.blog_signals import article_save_signal
-        if not self.slug or self.slug == 'no-slug' or not self.id:
-            slug = self.title if 'title' in self.__dict__ else self.name
-            self.slug = slugify(slug)
+        if not isinstance(self, Article):
+            if not self.slug or self.slug == 'no-slug' or not self.id:
+                slug = self.title if 'title' in self.__dict__ else self.name
+                self.slug = slugify(slug)
         super().save(*args, **kwargs)
         # type = self.__class__.__name__
         is_update_views = 'update_fields' in kwargs and len(kwargs['update_fields']) == 1 and kwargs['update_fields'][
@@ -89,10 +89,6 @@ def get_category_tree(self):
         return names
 
     def save(self, *args, **kwargs):
-        if not self.slug or self.slug == 'no-slug' or not self.id:
-            # Only set the slug when the object is created.
-            self.slug = slugify(self.title)
-
         super().save(*args, **kwargs)
 
     def viewed(self):
@@ -130,6 +126,7 @@ class Category(BaseModel):
     """文章分类"""
     name = models.CharField('分类名', max_length=30, unique=True)
     parent_category = models.ForeignKey('self', verbose_name="父级分类", blank=True, null=True, on_delete=models.CASCADE)
+    slug = models.SlugField(default='no-slug', max_length=60, blank=True)
 
     class Meta:
         ordering = ['name']
@@ -183,6 +180,7 @@ def parse(category):
 class Tag(BaseModel):
     """文章标签"""
     name = models.CharField('标签名', max_length=30, unique=True)
+    slug = models.SlugField(default='no-slug', max_length=60, blank=True)
 
     def __str__(self):
         return self.name