From 3e73f52203ad06015cbfd36c53804f90f19597c3 Mon Sep 17 00:00:00 2001 From: wcq <744800102@qq.com> Date: Fri, 1 Sep 2023 11:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0v2=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=8Ev1=E5=88=86=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/common.dev.ini | 7 ++++++ config/common.prod.ini | 7 ++++++ context/common.py | 8 +++++-- mods/rate/common.py | 6 ++--- mods/rate/mods/company_user/router.py | 12 ++++++---- mods/rate/mods/company_user/schemas.py | 32 ++++++++++++++++++-------- mods/router.py | 7 +++--- 7 files changed, 57 insertions(+), 22 deletions(-) diff --git a/config/common.dev.ini b/config/common.dev.ini index d366350..dcf3456 100644 --- a/config/common.dev.ini +++ b/config/common.dev.ini @@ -12,6 +12,13 @@ user = postgres password = 12345 db = wd_smebiz +[postgresql_v2] +host = 127.0.0.1 +post = 5432 +user = postgres +password = 12345 +db = wd_smebiz_v2 + [redis] host = 127.0.0.1 port = 6379 diff --git a/config/common.prod.ini b/config/common.prod.ini index 565a3d6..b3eba6f 100644 --- a/config/common.prod.ini +++ b/config/common.prod.ini @@ -12,6 +12,13 @@ user = postgres password = 12345 db = wd_smebiz +[postgresql_v2] +host = db +post = 5432 +user = postgres +password = 12345 +db = wd_smebiz_v2 + [redis] host = redis port = 6379 diff --git a/context/common.py b/context/common.py index 04ad564..daa3d43 100644 --- a/context/common.py +++ b/context/common.py @@ -25,7 +25,7 @@ conf = ConfigParser() start_model = "dev" if 'prod' in sys.argv: start_model = 'prod' -print("start_model",start_model) +print("start_model", start_model) conf.read(Path(__file__).parent.parent / 'config' / f'common{"." + start_model if start_model else ""}.ini', encoding='utf-8-sig') @@ -73,8 +73,12 @@ common_db = SqlalchemyConnect(common_db_base, host=conf['postgresql']['host'], user=conf['postgresql']['user'], password=conf['postgresql']['password'], db=conf['postgresql']['db'], db_type='postgresql') +common_db_base_v2 = declarative_base() - +common_db_v2 = SqlalchemyConnect(common_db_base_v2, host=conf['postgresql_v2']['host'], + user=conf['postgresql_v2']['user'], + password=conf['postgresql_v2']['password'], + db=conf['postgresql_v2']['db'], db_type='postgresql') # mongo db mg_db = MongoConnect(conf["mongo"]["host"], int(conf["mongo"]["port"]), diff --git a/mods/rate/common.py b/mods/rate/common.py index 8e77b90..1b23292 100644 --- a/mods/rate/common.py +++ b/mods/rate/common.py @@ -1,4 +1,4 @@ -from context.common import common_db +from context.common import common_db,common_db_v2 -get_db = common_db.get_db -Base = common_db.Base \ No newline at end of file +get_db = common_db_v2.get_db +Base = common_db_v2.Base \ No newline at end of file diff --git a/mods/rate/mods/company_user/router.py b/mods/rate/mods/company_user/router.py index 2f566ec..9a2aa5f 100644 --- a/mods/rate/mods/company_user/router.py +++ b/mods/rate/mods/company_user/router.py @@ -1,6 +1,8 @@ from fastapi import APIRouter, Depends, HTTPException from sqlalchemy.orm import Session +from utils.passwd_utils import get_encrypt_password +from utils.validate_utils import Validate from ...common import get_db from . import crud from . import schemas @@ -10,6 +12,10 @@ router = APIRouter(tags=["企业用户"], prefix='/company_user') @router.post("/add", summary="添加企业用户", response_model=schemas.CompanyUserAddRes) def company_user_add(req: schemas.CompanyUserAddReq, db: Session = Depends(get_db)): + if not Validate.password(req.passwd): + raise HTTPException(detail="密码格式不规范", status_code=303) + else: + req.passwd = get_encrypt_password(req.passwd) item = crud.company_user_add(db, req) return schemas.CompanyUserAddRes(**item.to_dict()) @@ -38,10 +44,8 @@ def company_user_get(req: schemas.CompanyUserGetReq, db: Session = Depends(get_d def company_user_query(req: schemas.CompanyUserQueryReq, db: Session = Depends(get_db)): count, query = crud.company_user_query(db, req) items = [schemas.CompanyUserInfo(**item.to_full_dict(include=req.include, - ex_include=req.ex_include, - relation_use_id=req.relation_use_id)) for item in query] + ex_include=req.ex_include, + relation_use_id=req.relation_use_id)) for item in query] return schemas.CompanyUserQueryRes(count=count, items=items) - - ######### diff --git a/mods/rate/mods/company_user/schemas.py b/mods/rate/mods/company_user/schemas.py index bf62607..ddf0991 100644 --- a/mods/rate/mods/company_user/schemas.py +++ b/mods/rate/mods/company_user/schemas.py @@ -10,18 +10,30 @@ class CompanyUserId(BaseModel): class CompanyUserAdd(BaseModel): - name: str - company: Optional[dict] = None - email: Optional[str] = None - phone: Optional[str] = None - passwd: str - enable: Optional[bool] = None - config: Optional[dict] = {} - company_id: Optional[str] = None - create_time: Optional[datetime] = None + name: str + company: Optional[dict] = None + email: Optional[str] = None + phone: Optional[str] = None + passwd: str + enable: Optional[bool] = None + config: Optional[dict] = {} + company_id: Optional[str] = None + create_time: Optional[datetime] = None -class CompanyUserAddOptional(CompanyUserAdd, metaclass=AllOptional): +class CompanyUserWithoutPasswordAdd(BaseModel): + name: str + company: Optional[dict] = None + email: Optional[str] = None + phone: Optional[str] = None + enable: Optional[bool] = None + config: Optional[dict] = {} + company_id: Optional[str] = None + create_time: Optional[datetime] = None + + +# 去掉密码 +class CompanyUserAddOptional(CompanyUserWithoutPasswordAdd, metaclass=AllOptional): pass diff --git a/mods/router.py b/mods/router.py index ae5b58e..5d305f5 100644 --- a/mods/router.py +++ b/mods/router.py @@ -1,9 +1,10 @@ from fastapi import APIRouter from .user.router import router as user_router -from .smebiz_rate.router import router as smebiz_rate_router -# from .rate.router import router as rate_router +# from .smebiz_rate.router import router as smebiz_rate_router +from .rate.router import router as rate_router router = APIRouter(prefix="") router.include_router(user_router) -router.include_router(smebiz_rate_router) +router.include_router(rate_router) +# router.include_router(smebiz_rate_router)