Merge branch 'develop'

Author: leafcoder

covid19/settings.py

@@ -150,12 +150,17 @@
 # 静态文件目录
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
+# 日志文件目录
+LOGS_DIR = os.path.join(BASE_DIR, 'var', 'logs')
+if not os.path.exists(LOGS_DIR):
+    os.makedirs(LOGS_DIR)
+
 # 配置 Scrapy 命令完整路径
 SCRAPY_CMD = '~/.virtualenvs/django-covid19/bin/scrapy'
 
 # Setting of Crontab
 CRONJOBS = (
     # 每分钟抓取一次
-    ('*/1 * * * *', 'ncovapi.cron.crawl_dxy', [], {}, '>> %s/var/logs/crontab.log' % BASE_DIR),
+    ('*/1 * * * *', 'ncovapi.cron.crawl_dxy', [], {}, '>> %s/crontab.log' % LOGS_DIR),
 )
 

ncovapi/serializers.py

@@ -81,8 +81,8 @@ class StatisticsSerializer(serializers.Serializer):
     wikis = WikiSerializer(many=True)
     goodsGuides = GoodsGuideSerializer(many=True)
     rumors = RumorSerializer(many=True)
-    modifyTime = serializers.IntegerField()
-    createTime = serializers.IntegerField()
+    modifyTime = serializers.DateTimeField()
+    createTime = serializers.DateTimeField()
 
 
 class ProvinceSerializer(serializers.HyperlinkedModelSerializer):

ncovapi/views.py

@@ -47,8 +47,8 @@ def get_object(self):
                 result['domesticStatistics'] = item
             elif countryType == Statistics.INTERNATIONAL:
                 result['internationalStatistics'] = item
-        result['createTime'] = crawler.createTime.timestamp()
-        result['modifyTime'] = crawler.modifyTime.timestamp()
+        result['createTime'] = crawler.createTime
+        result['modifyTime'] = crawler.modifyTime
         result['remarks'] = []
         result['notes'] = []
         result['generalRemark'] = ''