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 @@