From 7203bcfecc5b1e8a9d5ec70b73b7f4550b6be52f Mon Sep 17 00:00:00 2001 From: zhengxinonly Date: Fri, 22 Dec 2023 22:46:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(passport):=20=E4=BF=AE=E5=A4=8D=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E4=B9=9F=E5=8F=AF=E4=BB=A5=E7=99=BB=E5=BD=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pear_admin/apis/passport.py | 2 +- pear_admin/extensions/init_script.py | 5 ++++- templates/login.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pear_admin/apis/passport.py b/pear_admin/apis/passport.py index 370705e..3752553 100644 --- a/pear_admin/apis/passport.py +++ b/pear_admin/apis/passport.py @@ -29,7 +29,7 @@ def login_in(): if not user: return {"message": "用户不存在", "code": -1}, 401 - if user.check_password(data["password"]): + if not user.check_password(data["password"]): return {"message": "用户密码错误", "code": -1}, 401 access_token = create_access_token(user) diff --git a/pear_admin/extensions/init_script.py b/pear_admin/extensions/init_script.py index 12b3baf..864237b 100644 --- a/pear_admin/extensions/init_script.py +++ b/pear_admin/extensions/init_script.py @@ -9,7 +9,10 @@ from pear_admin.orms import DepartmentORM, RightsORM, RoleORM, UserORM def dict_to_orm(d, o): for k, v in d.items(): - setattr(o, k, v or None) + if k == "password": + o.password = v + else: + setattr(o, k, v or None) def csv_to_databases(path, orm): diff --git a/templates/login.html b/templates/login.html index 559a5b4..4d2c5c9 100644 --- a/templates/login.html +++ b/templates/login.html @@ -61,7 +61,7 @@