no message

routers/api/eventManagement/checkin.py

@@ -27,6 +27,7 @@ from extensions import logger
 
 router = APIRouter()
 
+'''
 @router.get('/qrcode', response_class=StreamingResponse)
 async def get_qrcode(
     request: Request,
@@ -63,18 +64,19 @@ async def get_qrcode2(
 ):    
     print('user_agent:', user_agent)
     redirect_url = "/yjxp/#/signPage?event_id={}".format(event_id) # 业务页面
-    '''
-    if "wxworklocal" in user_agent:
-        logger.info("redirect_url: {}", redirect_url)
+    
+    # if "wxworklocal" in user_agent:
+    #    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)
     else:
         # 120.241.74.139
-        detail_url = "http://yjxp.tjp.com.cn:8086/yjxp/#" + redirect_url
-    '''
-    detail_url = "{}{}".format(settings.YZY_WEB_ROOT, redirect_url)
+    #    detail_url = "http://yjxp.tjp.com.cn:8086/yjxp/#" + redirect_url
+    
+    #detail_url = "{}{}".format(settings.YZY_WEB_ROOT, redirect_url)
 
     return RedirectResponse(detail_url)
+'''
 
 @router.post("/getInfo")
 async def getInfo(

routers/api/qrcode/__init__.py

@@ -36,7 +36,7 @@ async def get_qrcode(
 ):
     url = str(request.url)
     print('url:', url)
-    url = settings.YZY_WEB_ROOT + f"/api/event_management/checkin/qrcode2?event_id={event_id}&r="+rnd()
+    url = settings.YZY_WEB_ROOT + f"/api/qrcode/event/checkin2?event_id={event_id}&r="+rnd()
     # url = url.replace("http://" + request.url.hostname, settings.YZY_WEB_ROOT)
     logger.info('替换到互联网ip: {}', url)   
 
@@ -54,3 +54,24 @@ async def get_qrcode(
     image.save(buf, 'png')
     img_data = buf.getvalue()
     return StreamingResponse(BytesIO(img_data), media_type="image/png")
+
+@router.get('/event/checkin2')
+async def get_qrcode2(
+    event_id: str,
+    user_agent: str = Header(default=''),
+    db: Session = Depends(get_db)
+):    
+    print('user_agent:', user_agent)
+    redirect_url = "/yjxp/#/signPage?event_id={}".format(event_id) # 业务页面
+    '''
+    if "wxworklocal" in user_agent:
+        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)
+    else:
+        # 120.241.74.139
+        detail_url = "http://yjxp.tjp.com.cn:8086/yjxp/#" + redirect_url
+    '''
+    detail_url = "{}{}".format(settings.YZY_WEB_ROOT, redirect_url)
+
+    return RedirectResponse(detail_url)