添加v2数据库与v1分割

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

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

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"]),

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
+get_db = common_db_v2.get_db
+Base = common_db_v2.Base

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)
 
-
-
 #########

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
 
 

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)