From ee0d0458452bfb5d09aa1e346e8457b70595c449 Mon Sep 17 00:00:00 2001 From: Jalin Date: Thu, 2 Jan 2020 13:35:34 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20db=20=E6=96=87=E4=BB=B6=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- py12306/app/app.py | 2 +- py12306/app/models.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/py12306/app/app.py b/py12306/app/app.py index b4dfe95..8f211e0 100644 --- a/py12306/app/app.py +++ b/py12306/app/app.py @@ -52,7 +52,7 @@ class ConfigInstance: self._configs = SuperDict(configs) self.REDIS.update(configs.get('redis', {})) db = configs.get('db', {}) - if db and not db.get('db_url'): + if db and db.get('engine') in ['mysql']: db['db_url'] = f"{db.get('engine')}://{db.get('user')}:{db.get('password')}@{db.get('host')}:{db.get('port')}/{db.get('database')}" self.DATABASE.update(configs.get('db', {})) self.DEBUG = self._configs.get('app.debug', self.DEBUG) diff --git a/py12306/app/models.py b/py12306/app/models.py index e7bcd0d..4cc9c1d 100644 --- a/py12306/app/models.py +++ b/py12306/app/models.py @@ -96,7 +96,7 @@ class QueryJob(TimestampMixin, BaseModel): """ 验证当前任务是否可查询""" if self.left_date < datetime.datetime.now().date(): return False - if self.left_date > (datetime.datetime.now().date() + datetime.timedelta(days=31)): + if self.left_date > (datetime.datetime.now().date() + datetime.timedelta(days=30)): return False return True @@ -230,8 +230,6 @@ class Ticket(TimestampMixin, BaseModel): def __init__(self, **kwargs) -> None: super().__init__(**kwargs) - self.left_date_order = lambda: self.left_date.strftime('%Y-%m-%d') - self.secret_str_unquote = lambda: urllib.parse.unquote(self.secret_str) class Meta: table = 'tickets'