From ad94f919f53ff8def1287cda19e2f70b5814ece1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= Date: Fri, 18 Mar 2022 14:03:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=94=A8=E6=88=B7=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E8=87=B3v0.21?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- user/user_db.py | 24 ++++++++++++------------ user/user_impl.py | 29 ++++++----------------------- user/user_obj.py | 2 +- 4 files changed, 20 insertions(+), 37 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9bacf41..86a6756 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ flask flask_cors gunicorn gevent -Werkzeug~=1.0.1 +Werkzeug pymongo~=3.11.0 PyYAML~=5.4.1 requests~=2.25.1 diff --git a/user/user_db.py b/user/user_db.py index 34b3028..2846c77 100644 --- a/user/user_db.py +++ b/user/user_db.py @@ -2,10 +2,10 @@ import pymongo from bson import ObjectId from gridfs import GridFS -DB_USER = "root" -DB_PASS = "sromitdTW569kC#M" DB_HOST = "116.63.130.34" -DB_PORT = "27018" +DB_PASS = "UTlC9cCoglD1cI1*" +DB_USER = "root" +DB_PORT = "27021" client = pymongo.MongoClient('mongodb://{}:{}@{}:{}'.format(DB_USER, DB_PASS, DB_HOST, DB_PORT)) @@ -17,7 +17,7 @@ def FIND_VERIFY_CODE(param): Returns: record: 记录 """ - collection = client['用户']['验证记录'] + collection = client['应用端']['邮箱验证码记录'] data = collection.find(param, {'_id': False}) record = list(data) return record @@ -32,7 +32,7 @@ def UPDATE_VERIFY_CODE(email, data): Returns: record: 记录 """ - collection = client['用户']['验证记录'] + collection = client['应用端']['邮箱验证码记录'] collection.update_one({"邮箱": email}, {"$set": data}, upsert=True) @@ -55,7 +55,7 @@ def FIND_USER_INFO(param): Returns: record: 记录 """ - collection = client['用户']['用户信息'] + collection = client['应用端']['企业用户'] data = collection.find(param, {'_id': False}) record = list(data) return record @@ -69,7 +69,7 @@ def INSERT_USER_INFO(data): Returns: - """ - collection = client['用户']['用户信息'] + collection = client['应用端']['企业用户'] collection.insert_one(data) @@ -82,7 +82,7 @@ def UPDATE_USER_INFO_BY_CID(cid, data): Returns: info: 信息 """ - collection = client['用户']['用户信息'] + collection = client['应用端']['企业用户'] collection.update_one({"企业ID": cid}, {"$set": data}) @@ -96,7 +96,7 @@ def FIND_FILE(bucket, file_id): data 文件二进制 """ # 实例化一个文件存储器 - gfs = GridFS(client['用户'], collection=bucket) + gfs = GridFS(client['文件'], collection=bucket) # 二进制读取文件 data = gfs.get(ObjectId(file_id)).read() # 返回文件二进制流 @@ -110,7 +110,7 @@ def INSERT_FILE(bucket, file_stream, content_type, filename): obj_id 文件ID """ # 实例化一个文件存储器 - gfs = GridFS(client['用户'], bucket) + gfs = GridFS(client['文件'], bucket) # 保存文件 obj_id = gfs.put(file_stream, content_type=content_type, filename=filename) # 返回文件的obj_id @@ -119,7 +119,7 @@ def INSERT_FILE(bucket, file_stream, content_type, filename): def DELETE_FILE(bucket, file_id): # 实例化一个文件存储器 - gfs = GridFS(client['用户'], collection=bucket) + gfs = GridFS(client['文件'], collection=bucket) # 删除文件 gfs.delete(ObjectId(file_id)) @@ -132,7 +132,7 @@ def FIND_FID_IN_RATING_RECORD(cid): Returns: record: 记录 """ - collection = client['评价']['评价记录'] + collection = client['企业数据']['评价记录'] data = collection.find({"企业ID": cid}, {'_id': False, "报告fid": 1, "证书fid": 1}) record = list(data) return record diff --git a/user/user_impl.py b/user/user_impl.py index 376c0f1..54bc2a1 100644 --- a/user/user_impl.py +++ b/user/user_impl.py @@ -9,7 +9,7 @@ from werkzeug.security import check_password_hash, generate_password_hash from user.user_auth import create_token from user.user_utils import make_id, check_mail_fmt, check_pwd_fmt, check_registered, check_verify_code from user.user_db import FIND_USER_INFO, UPDATE_VERIFY_CODE, UPDATE_USER_INFO_BY_CID, INSERT_USER_INFO, \ - CLEAN_VERIFY_CODE, FIND_FILE, INSERT_FILE, DELETE_FILE + CLEAN_VERIFY_CODE, FIND_FILE from common.rsa import decrypt_data from common.text_recognition import id_card_recognition, business_license_recognition @@ -253,7 +253,7 @@ def get_avatar_impl(cid): filestream """ fid = FIND_USER_INFO({"企业ID": cid})[0]['头像fid'] - filestream = FIND_FILE('头像', fid) + filestream = FIND_FILE('企业用户头像', fid) return filestream @@ -297,16 +297,8 @@ def id_card_recognition_result(cid, image): if result == '伪造身份证': return result else: - # 图片识别正确，保存身份证图片 - new_file_id = INSERT_FILE('身份证', image.read(), image.content_type, result['姓名']) - # 删除原身份证图片 - old_file_id = FIND_USER_INFO({"企业ID": cid})[0]['认证信息']['身份证fid'] - if old_file_id is not None: - DELETE_FILE('身份证', old_file_id) - # 更新企业认证中身份证的信息 - UPDATE_USER_INFO_BY_CID(cid, {"认证信息.法人姓名": result['姓名'], - "认证信息.法人身份证": result['身份证号码'], - "认证信息.身份证fid": new_file_id}) + # 图片识别正确 更新企业认证中身份证的信息 + UPDATE_USER_INFO_BY_CID(cid, {"认证信息.法人姓名": result['姓名'], "认证信息.法人身份证": result['身份证号码']}) return '识别正确', {"姓名": result['姓名'], "身份证号码": result['身份证号码']} @@ -334,17 +326,8 @@ def business_license_recognition_result(cid, image): if result == '识别错误': return result else: - # 图片识别正确，保存图片 - new_file_id = INSERT_FILE('营业执照', image.read(), image.content_type, result['名称']) - # 删除原图片 - old_file_id = FIND_USER_INFO({"企业ID": cid})[0]['认证信息']['营业执照fid'] - if old_file_id is not None: - DELETE_FILE('营业执照', old_file_id) - # 更新企业认证中营业执照的信息 - UPDATE_USER_INFO_BY_CID(cid, {"认证信息.企业名称": result['名称'], - "认证信息.统一社会信用代码": result['统一社会信用代码'], - "认证信息.营业执照fid": new_file_id}) - + # 图片识别正确 更新企业认证中营业执照的信息 + UPDATE_USER_INFO_BY_CID(cid, {"认证信息.企业名称": result['名称'], "认证信息.统一社会信用代码": result['统一社会信用代码']}) return '识别正确', {"公司名称": result['名称'], "统一社会信用代码": result['统一社会信用代码']} diff --git a/user/user_obj.py b/user/user_obj.py index 1908fb9..d8597e0 100644 --- a/user/user_obj.py +++ b/user/user_obj.py @@ -43,7 +43,7 @@ class User: return "密码强度太低" # 检验邮箱是否存在 - if check_registered(self.email): + if not check_registered(self.email): return "该邮箱未注册" # 检验验证码是否正确