libushang há 3 semanas atrás
pai
commit
9ad3670136
3 ficheiros alterados com 18 adições e 14 exclusões
  1. 4 4
      models/yzy_base.py
  2. 11 10
      routers/api/yst/yhxx.py
  3. 3 0
      utils/sg_auth.py

+ 4 - 4
models/yzy_base.py

@@ -125,7 +125,7 @@ class YstYhpcsbEntity(Base):
     zhlx = Column(String, default='')
     status = Column(Integer, default=0)
     create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
-    update_time = Column(DateTime)
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')
 
     class Config:
         orm_mode = True
@@ -150,7 +150,7 @@ class YstQyjcxxEntity(Base):
     zrrdh = Column(String, default='')
     status = Column(Integer, default=0)
     create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
-    update_time = Column(DateTime)
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')
 
     class Config:
         orm_mode = True
@@ -181,7 +181,7 @@ class YstQyyjyaEntity(Base):
     yjxy = Column(String, default='')
     status = Column(Integer, default=0)
     create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
-    update_time = Column(DateTime)
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')
 
     class Config:
         orm_mode = True
@@ -208,7 +208,7 @@ class YstYjylzjEntity(Base):
     
     status = Column(Integer, default=0)
     create_time = Column(DateTime, default=datetime.now, comment='数据创建时间')
-    update_time = Column(DateTime)
+    update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='数据更新时间')
 
     class Config:
         orm_mode = True

+ 11 - 10
routers/api/yst/yhxx.py

@@ -23,6 +23,7 @@ def get_yst_user_info(
     x_tif_uid: str = Header(None),
     x_tif_uinfo: str = Header(None),
     x_tif_ext: str = Header(None),
+    db: Session = Depends(get_db)
 ):
     '''
     return yst_user_info_response(json.dumps({
@@ -63,16 +64,16 @@ def get_yst_user_info(
 
     corp = x_tif_ext["corp"]
     if corp is not None:
-        with get_share_db() as sharedb:
-            row = sharedb.query(ChemicalCompany).filter(ChemicalCompany.credit_code == corp["social_credit_code"]).first()
-            if row is not None:
-                qymc = row.company_name
-                qyjb = row.safe_level
-                qydz = row.formatted_address
-            else:
-                qymc = corp["name"]
-                qyjb = "-"
-                qydz = "-"
+        # with get_share_db() as sharedb:
+        row = db.query(ChemicalCompany).filter(ChemicalCompany.credit_code == corp["social_credit_code"]).first()
+        if row is not None:
+            qymc = row.company_name
+            qyjb = row.safe_level
+            qydz = row.formatted_address
+        else:
+            qymc = corp["name"]
+            qyjb = "-"
+            qydz = "-"
     
         corp = {
             "level": corp["level"],

+ 3 - 0
utils/sg_auth.py

@@ -213,9 +213,12 @@ def yst_pass_ext(
         }
     '''
 
+    logger.info("token: {}", token)
+
     redis_key = "yst_token_" + token
     redis_val = redis_get_json(redis_key)
     if redis_val is None:
+        logger.info("redis_key {} not exists", redis_key)
         raise TokenException()
     else:
         return redis_val