diff --git a/CompanyUser/CompanyUser_impl.py b/CompanyUser/CompanyUser_impl.py index 210b4dc..1087b73 100644 --- a/CompanyUser/CompanyUser_impl.py +++ b/CompanyUser/CompanyUser_impl.py @@ -21,7 +21,7 @@ class CompanyUserImpl(CompanyUser): "应用端", "企业用户", {"邮箱": self.email}, - ["企业ID", "企业名称", "邮箱", "密码"] + ["企业ID", "企业名称", "邮箱", "密码", "已认证"] ) def check_user_existed(): @@ -39,11 +39,10 @@ class CompanyUserImpl(CompanyUser): check_user_existed() check_password_correct() - self.cid = company_user['企业ID'] self.name = company_user['企业名称'] - self.email = company_user['邮箱'] + self.verify_status = company_user['已认证'] - return_body = self.dict_to_show() + return_body = self.dict_to_show(columns=["企业名称", "认证状态", "token"]) return_body['token'] = create_token({"cid": self.cid}) return return_body @@ -128,3 +127,36 @@ class CompanyUserImpl(CompanyUser): ) __main__() + + def get_company_user_info(self): + """获取企业用户信息""" + company_user_data = self.db.find_single_data( + "应用端", + "企业用户", + {"企业ID": self.cid}, + ["企业ID", "企业名称", "邮箱", "已认证"] + ) + + self.name = company_user_data['企业名称'] + self.email = company_user_data['邮箱'] + self.verify_status = company_user_data['已认证'] + + return self.dict_to_show(columns=["企业ID", "企业名称", "邮箱", "认证状态"]) + + def get_avatar(self): + """获取用户头像""" + + self.avatar_id = self.db.find_single_column( + "应用端", + "企业用户", + {"企业ID": self.cid}, + "头像fid" + ) + + avatar = self.db.find_file( + "文件", + "企业用户头像", + self.avatar_id + ) + + return avatar diff --git a/CompanyUser/CompanyUser_obj.py b/CompanyUser/CompanyUser_obj.py index 2e2fc0e..9f39000 100644 --- a/CompanyUser/CompanyUser_obj.py +++ b/CompanyUser/CompanyUser_obj.py @@ -42,7 +42,7 @@ class CompanyUser(object): "企业ID": self.cid, "企业名称": self.name, "邮箱": self.email, - "认证状态": self.verify_status, + "认证状态": "已认证" if self.verify_status == "是" else "未认证", "token": None } diff --git a/CompanyUser/CompanyUser_route.py b/CompanyUser/CompanyUser_route.py index 33b2a74..adcec8d 100644 --- a/CompanyUser/CompanyUser_route.py +++ b/CompanyUser/CompanyUser_route.py @@ -3,7 +3,7 @@ from flask import Blueprint, request, Response from CompanyUser.CompanyUser_impl import CompanyUserImpl from Utils.ErrorUtil import ReturnConditionCheckFailed from common.rsa import decrypt_data -from user.user_auth import check_block +from user.user_auth import check_block, verify_token company_user_route = Blueprint('user', __name__) @@ -43,3 +43,35 @@ def register(): return response except ReturnConditionCheckFailed as e: return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400 + + +@company_user_route.route('/user_info', methods=['GET']) +@verify_token +def user_info(**kwargs): + """获取企业用户信息""" + try: + company_user = CompanyUserImpl() + company_user.cid = kwargs['cid'] + result = company_user.get_company_user_info() + return {"info": "查询结果", "result": result} + except ReturnConditionCheckFailed as e: + return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400 + + +@company_user_route.route('/get_avatar', methods=['GET']) +@verify_token +def get_avatar(**kwargs): + """获取头像""" + try: + company_user = CompanyUserImpl() + company_user.cid = kwargs['cid'] + response = Response(company_user.get_avatar(), content_type='image/jpeg') + return response + except ReturnConditionCheckFailed as e: + return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400 diff --git a/Utils/ValidateUtil.py b/Utils/ValidateUtil.py index f431ad6..50d6e40 100644 --- a/Utils/ValidateUtil.py +++ b/Utils/ValidateUtil.py @@ -64,7 +64,7 @@ class ValidateAttr(object): else: for item in value: if not isinstance(item, self.kwargs['instance_list']): - ReturnConditionCheckFailed(self.kwargs['error_info'], self.kwargs['error_code']) + raise ReturnConditionCheckFailed(self.kwargs['error_info'], self.kwargs['error_code']) if 'func' in self.kwargs: """属性检查函数""" diff --git a/common/rsa.py b/common/rsa.py index 1c247e3..b7e3880 100644 --- a/common/rsa.py +++ b/common/rsa.py @@ -47,7 +47,3 @@ def check_encrypt_decrypt(**kwargs): return True else: return False - - -if __name__ == '__main__': - print(encrypt_data(msg='Fecr1988.')) \ No newline at end of file