ok

models/ry_sys_base.py

@@ -2,9 +2,10 @@
 from sqlalchemy import String, Column, Integer,DateTime,Text,BigInteger,Boolean,PrimaryKeyConstraint,Index,UniqueConstraint,CHAR,LargeBinary,TIMESTAMP
 from sqlalchemy.dialects.mysql import TINYINT
 from sqlalchemy.sql import func
+from sqlalchemy import event
 from database import Base
 from datetime import datetime
-
+from common.enc import mpfun
 
 '''社会化关系表'''
 class SysSocial(Base):
@@ -154,9 +155,38 @@ class SysUser(Base):
     yzy_account = Column(String(50), default=None, comment='粤政易账号')
     sign = Column(String, server_default='', default='', comment='HMACSM3数值')
 
+    @property
+    def plain_user_name(self):
+        return mpfun.dec_data(self.user_name)
+    
+    @property
+    def plain_password(self):
+        return mpfun.dec_data(self.password)
+    
+    @property
+    def plain_phonenumber(self):
+        return mpfun.dec_data(self.phonenumber)
+    
+    @property
+    def plain_email(self):
+        return mpfun.dec_data(self.email)
+    
+    @property
+    def plain_yzy_account(self):
+        return mpfun.dec_data(self.yzy_account)
     class Config:
         orm_mode = True
 
+'''
+@event.listens_for(SysUser, 'before_insert')
+@event.listens_for(SysUser, 'before_update')
+def calculate_sys_user_sign(mapper, connection, target):
+    """在保存前自动计算并更新sign字段"""
+    sign_data = ",".join([target.user_id, target.user_name, target.password, target.nick_name, target.dept_id, target.dept_name, target.email, target.phonenumber, target.status, target.del_flag, target.yzy_account])
+    sign_hmac = mpfun.sign_data(sign_data)
+    target.sign = sign_hmac
+'''
+
 '''岗位信息表'''
 
 

routers/api/emergencyPlans/__init__.py

@@ -15,11 +15,12 @@ from utils import *
 import json
 import traceback
 
-from . import event, response, unit, doc, contact
+from .event import router as event_router
+from . import response, unit, doc, contact
 
 router = APIRouter()
 
-router.include_router(event.router, prefix="/event", tags=["事件相关"])
+router.include_router(event_router, prefix="/event", tags=["事件相关"])
 router.include_router(response.router, prefix="/response", tags=["响应相关"])
 router.include_router(unit.router, prefix="/unit", tags=["单位职责相关"])
 router.include_router(doc.router, prefix="/doc", tags=["结构化文档相关"])

routers/apiz/common.py

@@ -52,6 +52,7 @@ async def uploadfile(
             certificate_no=certificate_no, 
             file_name=file_name, 
             save_filepath=file_path, 
+            file_type=suffix,
             from_type=from_type, 
             upload_time=datetime.now())
         db.add(db_entity)

routers/prod_api/auth.py

@@ -130,7 +130,7 @@ async def login(
 
             raise AppException(500, "帐号或者密码错误")
 
-        logger.info('row.password: {}', row.password)
+        logger.info('row.plain_user_name: {}', row.plain_user_name)
        
         # bcrypt 加密校验
         # if verify_password(password, row.password) == False: