libushang 6 meses atrás
pai
commit
a9044ebcc4
3 arquivos alterados com 12 adições e 3 exclusões
  1. 2 1
      .env
  2. 6 1
      routers/api/eventManagement/checkin.py
  3. 4 1
      templates/yzy/callback.html

+ 2 - 1
.env

@@ -44,7 +44,8 @@ STAGE_YJHTGL_WEB_ROOT_PATH = "http://19.155.220.206:8086/yjzp/#"
 STAGE_YJXP_WEB_ROOT_PATH = "http://120.241.74.139:8086/yjxp/#"
 
 # 粤政易APP回调地址(域名和端口不能随便改,申请时定下来)
-STAGE_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/yzy/callback.html"
+# STAGE_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/yzy/callback.html"
+STAGE_YJXP_CALLBACK_WEB_PATH = "http://120.241.74.139:8086/yzy/callback.html"
 
 #########################################################################
 # 生产环境配置

+ 6 - 1
routers/api/eventManagement/checkin.py

@@ -35,6 +35,11 @@ async def get_qrcode(
     url = str(request.url)
     url = url.replace("qrcode", "qrcode2")
 
+    if settings.IS_STAGE:
+        url = url.replace(request.url.hostname, "120.241.74.139:8086")
+        logger.info('替换到互联网ip: {}', url)
+        
+
     qr = qrcode.QRCode(
         version=1,
         error_correction=qrcode.constants.ERROR_CORRECT_M,
@@ -55,7 +60,7 @@ async def get_qrcode2(
     event_id: str,
     db: Session = Depends(get_db)
 ):    
-    redirect_url = "{}/#/signPage?event_id={}".format(settings.YJXP_WEB_ROOT_PATH, event_id) # 业务页面
+    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}"

+ 4 - 1
templates/yzy/callback.html

@@ -32,7 +32,10 @@ $(function() {
 			var access_token = result.data.access_token;
 			var redirect_url = result.data.redirect_url;
 			localStorage.setItem('Admin-Token', access_token);
-			window.location.href = redirect_url;
+			console.log('redirect_url:', redirect_url);
+			setTimeout(function() {
+				window.location.href = redirect_url;
+			}, 100);
 		}
 		else {
 			alert(result.msg);