From 4c2d17e68839b7aa9fe55664a7ddf66bfc47d237 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Fri, 22 Apr 2022 15:09:59 +0800 Subject: [PATCH 01/10] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rating/Credit/CreditImpl.py | 19 ++++++++++--------- Rating/Credit/CreditRoutes.py | 7 ++++--- Rating/Esg/EsgImpl.py | 1 + Rating/Esg/EsgRoutes.py | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Rating/Credit/CreditImpl.py b/Rating/Credit/CreditImpl.py index d139c02..6138ff8 100644 --- a/Rating/Credit/CreditImpl.py +++ b/Rating/Credit/CreditImpl.py @@ -600,22 +600,23 @@ class CreditRating(CreditInputData, CreditUtils): gen_certified() company_index() update_rating_records() + return '执行成功', 200 __main__() def choose_industry(self): """选择行业""" + name = self.db.find_single_data('企业数据', '企业数据_更新汇总', {"企业ID": self.cid}, ['一级行业'])['一级行业'] industry = self.db.find_single_data('模型端', '综信评价行业分类', {}, ['行业']) new_industry = list() - for k, v in industry['行业'].items(): - insert_dict = dict() - insert_dict['value'] = k - insert_dict['children'] = list() - for item in v: - _dict = dict() - _dict['value'] = item - insert_dict['children'].append(_dict) - new_industry.append(insert_dict) + insert_dict = dict() + insert_dict['value'] = name + insert_dict['children'] = list() + for item in industry['行业'][name]: + _dict = dict() + _dict['value'] = item + insert_dict['children'].append(_dict) + new_industry.append(insert_dict) return new_industry def questionnaire_obj(self): diff --git a/Rating/Credit/CreditRoutes.py b/Rating/Credit/CreditRoutes.py index 102ca99..ce8d5f8 100644 --- a/Rating/Credit/CreditRoutes.py +++ b/Rating/Credit/CreditRoutes.py @@ -80,7 +80,7 @@ def save_cc_rating_input_route(**kwargs): @verify_token def submit_general_rating_input(**kwargs): """ - 提交填报数据，开始评 + 提交填报数据，开始评价 Parameters: cid 企业ID Returns: @@ -89,8 +89,8 @@ def submit_general_rating_input(**kwargs): try: credit = CreditRating() credit.cid = kwargs['cid'] - credit.exec_cc_rating() - return {"info": "执行成功"}, 200 + info, status = credit.exec_cc_rating() + return {"info": info}, status except ReturnConditionCheckFailed as e: e.log_error() return {"info": e.__str__()}, e.status_code @@ -110,6 +110,7 @@ def choose_industry_route(**kwargs): """ try: credit = CreditRating() + credit.cid = kwargs['cid'] result = credit.choose_industry() return {"info": "查询成功", "result": result} except KeyError: diff --git a/Rating/Esg/EsgImpl.py b/Rating/Esg/EsgImpl.py index fcfb536..71b93d5 100644 --- a/Rating/Esg/EsgImpl.py +++ b/Rating/Esg/EsgImpl.py @@ -621,5 +621,6 @@ class EsgRating(EsgInputData, CreditUtils): gen_certified() esg_index() update_rating_records() + return '执行成功', 200 __main__() diff --git a/Rating/Esg/EsgRoutes.py b/Rating/Esg/EsgRoutes.py index 04a4c6e..c56dde4 100644 --- a/Rating/Esg/EsgRoutes.py +++ b/Rating/Esg/EsgRoutes.py @@ -64,8 +64,8 @@ def submit_general_rating_input(**kwargs): try: esg = EsgRating() esg.cid = kwargs['cid'] - esg.exec_esg_rating() - return {"info": '执行成功'}, 200 + info, status = esg.exec_esg_rating() + return {"info": info}, status except ReturnConditionCheckFailed as e: e.log_error() return {"info": e.__str__()}, e.status_code From 464fdb47ee6c4222c2ee4a34ed45e40c51199f55 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Fri, 22 Apr 2022 16:24:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?update=20ReturnConditionCheckFailed?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rating/Credit/CreditImpl.py | 10 +++++----- Rating/Esg/EsgImpl.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Rating/Credit/CreditImpl.py b/Rating/Credit/CreditImpl.py index 6138ff8..9598775 100644 --- a/Rating/Credit/CreditImpl.py +++ b/Rating/Credit/CreditImpl.py @@ -8,7 +8,7 @@ from Rating.Credit.CreditObj import RatingRecord, CreditInputData, FinancialRepo IncomeSheet, AppendixDataSheet from Rating.Process.ProcessObj import CreditProcess from Rating.Questionnaire.QuestionObj import SingleChoiceQuestion, MultipleChoiceQuestion, FillInTheBlank -from Utils.ErrorUtil import LogConditionCheckFailed +from Utils.ErrorUtil import ReturnConditionCheckFailed, ReturnConditionCheckFailed class CreditUtils: @@ -525,7 +525,7 @@ class CreditRating(CreditInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.模型打分": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.模型打分": -1}) - raise LogConditionCheckFailed("模型" + raise ReturnConditionCheckFailed("模型" "打分失败", 200) def gen_report(): @@ -547,7 +547,7 @@ class CreditRating(CreditInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.报告生成": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.报告生成": -1}) - raise LogConditionCheckFailed("生成报告失败", 200) + raise ReturnConditionCheckFailed("生成报告失败", 200) def gen_certified(): """生成证书""" @@ -568,7 +568,7 @@ class CreditRating(CreditInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.证书生成": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.证书生成": -1}) - raise LogConditionCheckFailed("生成证书失败", 200) + raise ReturnConditionCheckFailed("生成证书失败", 200) def company_index(): """生成主页数据""" @@ -585,7 +585,7 @@ class CreditRating(CreditInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.公司风险分析主页": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.综合信用评价主页": -1}) - raise LogConditionCheckFailed("生成主页数据失败", 200) + raise ReturnConditionCheckFailed("生成主页数据失败", 200) def update_rating_records(): """更新完成时间和进行状态""" diff --git a/Rating/Esg/EsgImpl.py b/Rating/Esg/EsgImpl.py index 71b93d5..0f9007c 100644 --- a/Rating/Esg/EsgImpl.py +++ b/Rating/Esg/EsgImpl.py @@ -8,7 +8,7 @@ from Rating.Esg.EsgObj import RatingRecord, EnvironmentQuestionnaire, ThreeYearD ThreeYearDataByS, SocietyQuestionnaire, OtherTypeDataByS, ThreeYearDataByG, GovernanceQuestionnaire, \ OtherTypeDataByG, EsgInputData from Rating.Process.ProcessObj import EsgProcess -from Utils.ErrorUtil import LogConditionCheckFailed +from Utils.ErrorUtil import ReturnConditionCheckFailed class CreditUtils: @@ -549,7 +549,7 @@ class EsgRating(EsgInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.模型打分": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.模型打分": -1}) - raise LogConditionCheckFailed("模型打分失败", 200) + raise ReturnConditionCheckFailed("模型打分失败", 200) def gen_report(): """报告生成""" @@ -570,7 +570,7 @@ class EsgRating(EsgInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.报告生成": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.报告生成": -1}) - raise LogConditionCheckFailed("报告生成失败", 200) + raise ReturnConditionCheckFailed("报告生成失败", 200) def gen_certified(): """证书生成""" @@ -592,7 +592,7 @@ class EsgRating(EsgInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.证书生成": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.证书生成": -1}) - raise LogConditionCheckFailed("证书生成失败", 200) + raise ReturnConditionCheckFailed("证书生成失败", 200) def esg_index(): url = "http://api.fecribd.com/etl_tfse/company/esg_index_etl" @@ -606,7 +606,7 @@ class EsgRating(EsgInputData, CreditUtils): self.update_process_status(rid['评价ID'], {"评价流程.主页ESG数据生成": 1}) else: self.update_process_status(rid['评价ID'], {"评价流程.主页ESG数据生成": -1}) - raise LogConditionCheckFailed("主页ESG数据生成失败", 200) + raise ReturnConditionCheckFailed("主页ESG数据生成失败", 200) def update_rating_records(): """更新完成时间和进行状态""" From 05fa2463f0d444cd82cd910ecd736f32e1663329 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Sun, 24 Apr 2022 10:09:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?update=20=E8=BF=94=E5=9B=9Einfo=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rating/Credit/CreditImpl.py | 2 +- Rating/Esg/EsgImpl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rating/Credit/CreditImpl.py b/Rating/Credit/CreditImpl.py index 9598775..ce8093a 100644 --- a/Rating/Credit/CreditImpl.py +++ b/Rating/Credit/CreditImpl.py @@ -600,9 +600,9 @@ class CreditRating(CreditInputData, CreditUtils): gen_certified() company_index() update_rating_records() - return '执行成功', 200 __main__() + return '执行成功', 200 def choose_industry(self): """选择行业""" diff --git a/Rating/Esg/EsgImpl.py b/Rating/Esg/EsgImpl.py index 0f9007c..274a4da 100644 --- a/Rating/Esg/EsgImpl.py +++ b/Rating/Esg/EsgImpl.py @@ -621,6 +621,6 @@ class EsgRating(EsgInputData, CreditUtils): gen_certified() esg_index() update_rating_records() - return '执行成功', 200 __main__() + return '执行成功', 200 From f16bb8647c50bd09c8c17e40849faaa07575c1a8 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Sun, 24 Apr 2022 10:27:43 +0800 Subject: [PATCH 04/10] =?UTF-8?q?update=20esg=E4=BF=9D=E5=AD=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rating/Esg/EsgImpl.py | 55 +++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/Rating/Esg/EsgImpl.py b/Rating/Esg/EsgImpl.py index 274a4da..bbaa01e 100644 --- a/Rating/Esg/EsgImpl.py +++ b/Rating/Esg/EsgImpl.py @@ -387,16 +387,17 @@ class EsgRating(EsgInputData, CreditUtils): def other_type_data_script(): """其他类型问卷""" - other_type_data = OtherTypeDataByE() - other_type_data.question_01 = questionnaire['其他类型问卷'][0][0] - other_type_data.question_02 = questionnaire['其他类型问卷'][1][0] - other_type_data.question_03 = questionnaire['其他类型问卷'][2][0] - other_type_data.question_04 = questionnaire['其他类型问卷'][3][0] - other_type_data.question_05 = questionnaire['其他类型问卷'][4][0] - other_type_data.question_06 = questionnaire['其他类型问卷'][5][0] - other_type_data.question_07 = questionnaire['其他类型问卷'][6][0] - other_type_data.question_08 = questionnaire['其他类型问卷'][7][0] - other_type_data.list_to_save() + if questionnaire['其他类型问卷']: + other_type_data = OtherTypeDataByE() + other_type_data.question_01 = questionnaire['其他类型问卷'][0][0] + other_type_data.question_02 = questionnaire['其他类型问卷'][1][0] + other_type_data.question_03 = questionnaire['其他类型问卷'][2][0] + other_type_data.question_04 = questionnaire['其他类型问卷'][3][0] + other_type_data.question_05 = questionnaire['其他类型问卷'][4][0] + other_type_data.question_06 = questionnaire['其他类型问卷'][5][0] + other_type_data.question_07 = questionnaire['其他类型问卷'][6][0] + other_type_data.question_08 = questionnaire['其他类型问卷'][7][0] + other_type_data.list_to_save() return questionnaire['其他类型问卷'] eq = EnvironmentQuestionnaire() @@ -429,12 +430,13 @@ class EsgRating(EsgInputData, CreditUtils): def other_type_data_script(): """其他类型问卷""" - other_type_data = OtherTypeDataByS() - other_type_data.question_01 = questionnaire['其他类型问卷'][0] - other_type_data.question_02 = questionnaire['其他类型问卷'][1] - other_type_data.question_03 = questionnaire['其他类型问卷'][2] - other_type_data.question_04 = questionnaire['其他类型问卷'][3] - other_type_data.list_to_save() + if questionnaire['其他类型问卷']: + other_type_data = OtherTypeDataByS() + other_type_data.question_01 = questionnaire['其他类型问卷'][0] + other_type_data.question_02 = questionnaire['其他类型问卷'][1] + other_type_data.question_03 = questionnaire['其他类型问卷'][2] + other_type_data.question_04 = questionnaire['其他类型问卷'][3] + other_type_data.list_to_save() return questionnaire['其他类型问卷'] sq = SocietyQuestionnaire() @@ -459,16 +461,17 @@ class EsgRating(EsgInputData, CreditUtils): def other_type_data_script(): """其他类型问卷""" - other_type_data = OtherTypeDataByG() - other_type_data.question_01 = questionnaire['其他类型问卷'][0] - other_type_data.question_02 = questionnaire['其他类型问卷'][1] - other_type_data.question_03 = int(questionnaire['其他类型问卷'][2]) - other_type_data.question_04 = int(questionnaire['其他类型问卷'][3]) - other_type_data.question_05 = questionnaire['其他类型问卷'][4] - other_type_data.question_06 = questionnaire['其他类型问卷'][5] - other_type_data.question_07 = questionnaire['其他类型问卷'][6] - other_type_data.question_08 = questionnaire['其他类型问卷'][7] - other_type_data.list_to_save() + if questionnaire['其他类型问卷']: + other_type_data = OtherTypeDataByG() + other_type_data.question_01 = questionnaire['其他类型问卷'][0] + other_type_data.question_02 = questionnaire['其他类型问卷'][1] + other_type_data.question_03 = int(questionnaire['其他类型问卷'][2]) + other_type_data.question_04 = int(questionnaire['其他类型问卷'][3]) + other_type_data.question_05 = questionnaire['其他类型问卷'][4] + other_type_data.question_06 = questionnaire['其他类型问卷'][5] + other_type_data.question_07 = questionnaire['其他类型问卷'][6] + other_type_data.question_08 = questionnaire['其他类型问卷'][7] + other_type_data.list_to_save() return questionnaire['其他类型问卷'] gq = GovernanceQuestionnaire() From 8a7fbf1b63b2c4ca7aeab6a214be9c2940b22d04 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Mon, 25 Apr 2022 13:46:19 +0800 Subject: [PATCH 05/10] =?UTF-8?q?update=20testforadmin=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TestForAdmin/APIAuth.py | 21 +++++++++++++++++++++ TestForAdmin/__init__.py | 0 TestForAdmin/route.py | 23 +++++++++++++++++++++++ app.py | 2 ++ 4 files changed, 46 insertions(+) create mode 100644 TestForAdmin/APIAuth.py create mode 100644 TestForAdmin/__init__.py create mode 100644 TestForAdmin/route.py diff --git a/TestForAdmin/APIAuth.py b/TestForAdmin/APIAuth.py new file mode 100644 index 0000000..2568c19 --- /dev/null +++ b/TestForAdmin/APIAuth.py @@ -0,0 +1,21 @@ +import functools + +from flask import request + + +def api_secret(func): + """ + 校验接口请求密钥 + """ + secret = "EZgo9ykxrYuBMYnYmmKIh" # 接口密钥 + + @functools.wraps(func) + def internal(*args, **kwargs): + try: + token = request.headers.get('secret') + if token != secret: + return {"info": "接口密钥错误"}, 401 + except Exception: + return {"info": "请求异常"}, 401 + return func(*args, **kwargs) + return internal diff --git a/TestForAdmin/__init__.py b/TestForAdmin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/TestForAdmin/route.py b/TestForAdmin/route.py new file mode 100644 index 0000000..c23f7e3 --- /dev/null +++ b/TestForAdmin/route.py @@ -0,0 +1,23 @@ +from flask import Blueprint, request, Response + +from CompanyUser.CompanyUserImpl import CompanyVerifyThreeFactorsImpl +from TestForAdmin.APIAuth import api_secret +from Utils.ErrorUtil import ReturnConditionCheckFailed + +test_admin_route = Blueprint('test_admin', __name__) + + +@test_admin_route.route('/company_verify', methods=['GET']) +@api_secret +def company_verify_route(): + """企业认证""" + try: + company_verify = CompanyVerifyThreeFactorsImpl() + company_verify.cid = request.args['cid'] + company_verify.company_verify() + return {"info": "认证成功"}, 200 + except ReturnConditionCheckFailed as e: + e.log_error() + return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400 diff --git a/app.py b/app.py index dcfc8de..876b436 100644 --- a/app.py +++ b/app.py @@ -7,6 +7,7 @@ from CompanyUser.CompanyUserRoute import company_user_route from file.file_routes import file_route from Rating.Credit.CreditRoutes import credit_route from Rating.Esg.EsgRoutes import esg_route +from TestForAdmin.route import test_admin_route app = Flask(__name__) CORS(app, supports_credentials=True) @@ -18,6 +19,7 @@ app.register_blueprint(company_user_route, url_prefix='/app/user') app.register_blueprint(credit_route, url_prefix='/app/input') app.register_blueprint(company_route, url_prefix='/app/company') app.register_blueprint(esg_route, url_prefix='/app/esg') +app.register_blueprint(test_admin_route, url_prefix='/app/test') @app.route('/app/version') From ab08a6f4fef060ee064d6cdc2e1b0833dcce2ca6 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Mon, 25 Apr 2022 14:36:47 +0800 Subject: [PATCH 06/10] =?UTF-8?q?update=20testforadmin=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CompanyUser/CompanyUserImpl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CompanyUser/CompanyUserImpl.py b/CompanyUser/CompanyUserImpl.py index 5a2033a..a78b300 100644 --- a/CompanyUser/CompanyUserImpl.py +++ b/CompanyUser/CompanyUserImpl.py @@ -459,8 +459,6 @@ class CompanyVerifyThreeFactorsImpl(CompanyVerifyThreeFactors): res = json.loads(response.text) if res['info'] == "企业数据初始化成功": - raise ReturnConditionCheckFailed("企业数据初始化异常", 200) - else: company_user = CompanyUser() company_user.cid = self.cid company_user.name = self.name @@ -472,6 +470,8 @@ class CompanyVerifyThreeFactorsImpl(CompanyVerifyThreeFactors): {"企业ID": self.cid}, company_user.dict_to_save(columns=["企业名称", "已认证"]) ) + else: + raise ReturnConditionCheckFailed("企业数据初始化异常", 200) def __main__(): get_verify_info() From 61abcf12a61109d73e269a84fa6b6c32a6a1c362 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Mon, 25 Apr 2022 15:40:24 +0800 Subject: [PATCH 07/10] =?UTF-8?q?update=20testforadmin=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rating/Credit/CreditObj.py | 3 ++- TestForAdmin/route.py | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Rating/Credit/CreditObj.py b/Rating/Credit/CreditObj.py index a2cd12d..60a7d9d 100644 --- a/Rating/Credit/CreditObj.py +++ b/Rating/Credit/CreditObj.py @@ -81,7 +81,7 @@ class IncomeSheet(SpecObject): "total_profit": "利润总额", "net_profit": "净利润" } - + class AppendixDataSheet(SpecObject): """补充数据表""" @@ -119,6 +119,7 @@ class BusinessQuestionnaire(object): """列表保存""" return self.questionnaire + class CreditInputData(SpecObject): """填报数据""" rid = ValidateAttr(field='rid', type=str, length=8) diff --git a/TestForAdmin/route.py b/TestForAdmin/route.py index c23f7e3..c26a897 100644 --- a/TestForAdmin/route.py +++ b/TestForAdmin/route.py @@ -1,6 +1,8 @@ from flask import Blueprint, request, Response from CompanyUser.CompanyUserImpl import CompanyVerifyThreeFactorsImpl +from Rating.Credit.CreditImpl import CreditRating +from Rating.Esg.EsgImpl import EsgRating from TestForAdmin.APIAuth import api_secret from Utils.ErrorUtil import ReturnConditionCheckFailed @@ -21,3 +23,27 @@ def company_verify_route(): return {"info": e.failed_info}, e.status_code except KeyError: return {"info": "参数异常"}, 400 + + +@test_admin_route.route('/general_rating', methods=['POST']) +@api_secret +def company_verify_route(): + """评价打分""" + try: + project = request.json['评价项目'] + cid = request.json['企业ID'] + if project == '综合信用评价': + credit = CreditRating() + credit.cid = cid + info, status = credit.exec_cc_rating() + return {"info": info}, status + else: + esg = EsgRating() + esg.cid = cid + info, status = esg.exec_esg_rating() + return {"info": info}, status + except ReturnConditionCheckFailed as e: + e.log_error() + return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400 From b80f719ebdc139036fe05f508b23a0770ae67d14 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Mon, 25 Apr 2022 15:41:22 +0800 Subject: [PATCH 08/10] =?UTF-8?q?update=20testforadmin=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TestForAdmin/route.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestForAdmin/route.py b/TestForAdmin/route.py index c26a897..71e4bb6 100644 --- a/TestForAdmin/route.py +++ b/TestForAdmin/route.py @@ -27,7 +27,7 @@ def company_verify_route(): @test_admin_route.route('/general_rating', methods=['POST']) @api_secret -def company_verify_route(): +def general_rating(): """评价打分""" try: project = request.json['评价项目'] From 34a567a6b32d177eece19336691b4ca592e96986 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Mon, 25 Apr 2022 17:04:17 +0800 Subject: [PATCH 09/10] =?UTF-8?q?update=20testforadmin=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TestForAdmin/route.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/TestForAdmin/route.py b/TestForAdmin/route.py index 71e4bb6..64eee7f 100644 --- a/TestForAdmin/route.py +++ b/TestForAdmin/route.py @@ -1,6 +1,6 @@ from flask import Blueprint, request, Response -from CompanyUser.CompanyUserImpl import CompanyVerifyThreeFactorsImpl +from CompanyUser.CompanyUserImpl import CompanyVerifyThreeFactorsImpl, CompanyUserImpl from Rating.Credit.CreditImpl import CreditRating from Rating.Esg.EsgImpl import EsgRating from TestForAdmin.APIAuth import api_secret @@ -47,3 +47,22 @@ def general_rating(): return {"info": e.failed_info}, e.status_code except KeyError: return {"info": "参数异常"}, 400 + + +@test_admin_route.route('/register', methods=['POST']) +@api_secret +def register(): + """用户注册""" + try: + req = request.json + company_user = CompanyUserImpl() + company_user.email = req['email'] + company_user.pwd = req['pwd'] + company_user.register(req['code']) + response = {"info": "注册成功"}, 200 + return response + except ReturnConditionCheckFailed as e: + e.log_error() + return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400 \ No newline at end of file From 6d4c6f58de99cc506648b5ea9bef05af94955cad Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Wed, 27 Apr 2022 09:38:39 +0800 Subject: [PATCH 10/10] =?UTF-8?q?update=20testforadmin=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TestForAdmin/route.py | 52 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/TestForAdmin/route.py b/TestForAdmin/route.py index 64eee7f..b5575d3 100644 --- a/TestForAdmin/route.py +++ b/TestForAdmin/route.py @@ -1,6 +1,7 @@ from flask import Blueprint, request, Response +from werkzeug.security import generate_password_hash -from CompanyUser.CompanyUserImpl import CompanyVerifyThreeFactorsImpl, CompanyUserImpl +from CompanyUser.CompanyUserImpl import CompanyVerifyThreeFactorsImpl, CompanyUserImpl, EmailVerifyCodeRecordImpl from Rating.Credit.CreditImpl import CreditRating from Rating.Esg.EsgImpl import EsgRating from TestForAdmin.APIAuth import api_secret @@ -49,20 +50,49 @@ def general_rating(): return {"info": "参数异常"}, 400 -@test_admin_route.route('/register', methods=['POST']) +@test_admin_route.route('/verify_email', methods=['POST']) @api_secret -def register(): - """用户注册""" +def verify_email(): + """ + 新注册企业 + 1.调用发送注册邮箱，获取验证码 + 2.使用邮箱、密码、验证码进行注册 + 3.使用认证接口进行认证、初始化企业数据 + """ try: req = request.json - company_user = CompanyUserImpl() - company_user.email = req['email'] - company_user.pwd = req['pwd'] - company_user.register(req['code']) - response = {"info": "注册成功"}, 200 - return response + # 发送验证码 + email_verify = EmailVerifyCodeRecordImpl() + email_verify.email = req['email'] + email_verify.v_type = 'register' + email_verify.send_email() + return {"info": "邮件已发送"}, 200 except ReturnConditionCheckFailed as e: e.log_error() return {"info": e.failed_info}, e.status_code except KeyError: - return {"info": "参数异常"}, 400 \ No newline at end of file + return {"info": "参数异常"}, 400 + + +@test_admin_route.route('/register', methods=['POST']) +@api_secret +def register(): + """ + 新注册企业 + 1.调用发送注册邮箱，获取验证码 + 2.使用邮箱、密码、验证码进行注册 + 3.使用认证接口进行认证、初始化企业数据 + """ + try: + req = request.json + # 注册 + company_user = CompanyUserImpl() + company_user.email = req['email'] + company_user.pwd = generate_password_hash("Fecr1988.") + company_user.register(req['code']) + return {"info": "注册成功"}, 200 + except ReturnConditionCheckFailed as e: + e.log_error() + return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400