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 1/2] =?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 2/2] =?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