From ea9c3135d1264d34e890b7f663769dccc3779763 Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Sun, 2 Sep 2018 16:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E4=BD=BF=E7=94=A8go?= =?UTF-8?q?ogle=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=97=B6=E4=B8=8D=E8=83=BD=E5=A6=82=E6=9E=9C=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E4=BB=A50=E5=BC=80=E5=A4=B4=E4=BC=9A?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=EF=BC=9A=E4=BD=BF=E7=94=A8MySQL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=97=B6=EF=BC=8C=E4=B8=BB=E6=9C=BA=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=A8=A1=E7=B3=8A=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4web=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=B4=A9=E6=BA=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/www/teleport/static/js/auth/login.js | 22 +++++++++++++++------ server/www/teleport/webroot/app/base/db.py | 9 +++++++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/server/www/teleport/static/js/auth/login.js b/server/www/teleport/static/js/auth/login.js index 45718c2..352b2db 100644 --- a/server/www/teleport/static/js/auth/login.js +++ b/server/www/teleport/static/js/auth/login.js @@ -107,9 +107,9 @@ $app.on_init = function (cb_stack) { } }); - if($app.options.default_auth & TP_LOGIN_AUTH_USERNAME_PASSWORD_CAPTCHA) { + if ($app.options.default_auth & TP_LOGIN_AUTH_USERNAME_PASSWORD_CAPTCHA) { $app.dom.btn_login_type_password.click(); - } else if($app.options.default_auth & TP_LOGIN_AUTH_USERNAME_PASSWORD_OATH) { + } else if ($app.options.default_auth & TP_LOGIN_AUTH_USERNAME_PASSWORD_OATH) { $app.dom.btn_login_type_oath.click(); } @@ -156,7 +156,17 @@ $app.login_account = function () { return; } } else if ($app.login_type === TP_LOGIN_AUTH_USERNAME_PASSWORD_OATH) { - if (str_oath.length !== 6 || ('' + parseInt(str_oath)) !== str_oath) { + var test_oath = '' + parseInt(str_oath); + if(str_oath.length === 6) { + for (; ;) { + if (test_oath.length < 6) + test_oath = '0' + test_oath; + else + break; + } + } + + if (str_oath.length !== 6 || test_oath !== str_oath) { $app.show_op_box('error', '身份验证器动态验证码错误！'); setTimeout(function () { $app.dom.input_oath.attr('data-content', "身份验证器动态验证码为6位数字，请重新填写！").focus().select().popover('show'); @@ -235,12 +245,12 @@ $app.init_blur_bg = function () { setInterval($app._update_blur_bg, 20500); - setTimeout(function(){ + setTimeout(function () { $app.init_slogan(); }, 2000); - setTimeout(function(){ - $app.dom.auth_box.fadeIn(800, function(){ + setTimeout(function () { + $app.dom.auth_box.fadeIn(800, function () { $app.dom.input_username.focus(); }); }, 300); diff --git a/server/www/teleport/webroot/app/base/db.py b/server/www/teleport/webroot/app/base/db.py index 67b7f46..291964f 100644 --- a/server/www/teleport/webroot/app/base/db.py +++ b/server/www/teleport/webroot/app/base/db.py @@ -200,9 +200,12 @@ class TPDatabase: log.e('Unknown database type.\n') return None - def query(self, sql, args=()): + def query(self, sql, args=None): if self.need_create: return None + if self.db_type == self.DB_TYPE_SQLITE and args is None: + args = () + # log.d('[db] {}, {}\n'.format(sql, args)) # _start = datetime.datetime.utcnow().timestamp() ret = self._conn_pool.query(sql, args) @@ -210,7 +213,9 @@ class TPDatabase: # log.d('[db] cost {} seconds.\n'.format(_end - _start)) return ret - def exec(self, sql, args=()): + def exec(self, sql, args=None): + if self.db_type == self.DB_TYPE_SQLITE and args is None: + args = () # log.d('[db] {}\n'.format(sql, args)) # print('[db]', sql, args) # _start = datetime.datetime.utcnow().timestamp()