소스 검색

no message

libushang 8 달 전
부모
커밋
b5d14162db
3개의 변경된 파일8개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      .env
  2. 2 1
      common/YzyApi.py
  3. 5 2
      routers/api/eventManagement/checkin.py

+ 1 - 1
.env

@@ -15,7 +15,7 @@ DEV_YJHTGL_WEB_ROOT_PATH = "http://127.0.0.1"
 #小屏地址
 DEV_YJXP_WEB_ROOT_PATH = "http://127.0.0.1/yjxp"
 #粤政易APP回调地址
-DEV_YJXP_CALLBACK_WEB_PATH = "-"
+DEV_YJXP_CALLBACK_WEB_PATH = "http://127.0.0.1/yzy/callback.html"
 
 #########################################################################
 # 预发布环境配置

+ 2 - 1
common/YzyApi.py

@@ -12,6 +12,7 @@ import base64
 from utils import *
 from exceptions import YzyException
 from extensions import logger
+from config import settings
 
 # 应用名称:茂名市智慧应急平台
 # https://open.weixin.qq.com/connect/Oauth2/authorize?appid=wld341060039&redirect_uri=https://www.baidu.com/#/&response_type=code&scope=snsapi_base&agentid=1004302&state=xxxxxx#wechat_redirect
@@ -196,7 +197,7 @@ def format_redirect_url(redirect_url: str) -> str:
         "rnd": new_guid()
     }
     state_str = json.dumps(state_json)
-    print(state_str)
+    # print(state_str)
     state = base64.b64encode(state_str.encode('utf-8')).decode('utf-8')
     detail_url = "https://open.weixin.qq.com/connect/Oauth2/authorize?appid={}&redirect_uri={}&response_type=code&scope=snsapi_base&agentid={}&state={}#wechat_redirect".format(
         YZY_CORPID,

+ 5 - 2
routers/api/eventManagement/checkin.py

@@ -26,11 +26,13 @@ from extensions import logger
 router = APIRouter()
 
 @router.get('/qrcode', response_class=StreamingResponse)
-async def get_event_list(
+async def get_qrcode(
     event_id: str,
     db: Session = Depends(get_db)
 ):
     redirect_url = "{}/#/signPage?event_id={}".format(settings.YJXP_WEB_ROOT_PATH, event_id) # 业务页面
+    logger.info("redirect_url: {}", redirect_url)
+    
     # qrcode_str = f"http://19.155.220.209/api/event_management/event?event_id={event_id}"
     detail_url = YzyApi.format_redirect_url(redirect_url)
 
@@ -201,7 +203,8 @@ async def get_event_list(
                 "dept_name": row.dept_name,
                 "sign_time": get_datetime_str(row.sign_time),
                 "yzy_account": row.yzy_account,
-                "duties": row.duties
+                "duties": row.duties,
+                "phone": row.phone
             }
             for row in rows
         ]