5 месяцев назад · 2d4479e688
--- a/.env
+++ b/.env
@@ -19,8 +19,7 @@ DEV_YJHTGL_WEB_ROOT_PATH = "http://127.0.0.1:8086/yjzp/#"
 
				 #小屏地址
			
 
				 DEV_YJXP_WEB_ROOT_PATH = "http://127.0.0.1:8086/yjxp/#"
			
 
				 #粤政易APP回调地址
			
 
				-# DEV_YJXP_CALLBACK_WEB_PATH = "http://127.0.0.1:9988/yzy/callback.html"
			
 
				-DEV_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/yjxp/#/yzy/callback"
			
 
				+DEV_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/api/yzy/callback.html"
			
 
				 
			
 
				 #########################################################################
			
 
				 # 预发布环境配置
			
@@ -45,9 +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://120.241.74.139:8086/yzy/callback.html"
			
 
				-STAGE_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/yjxp/#/yzy/callback"
			
 
				+STAGE_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/api/yzy/callback.html"
			
 
				+# STAGE_YJXP_CALLBACK_WEB_PATH = "http://120.241.74.139:8086/api/yzy/callback.html"
			
 
				 
			
 
				 #########################################################################
			
 
				 # 生产环境配置
			
--- a/routers/api/__init__.py
+++ b/routers/api/__init__.py
@@ -1,9 +1,10 @@
 
				 #!/usr/bin/env python3
			
 
				 # -*- coding: utf-8 -*-
			
 
				-from fastapi import APIRouter, Depends
			
 
				+from fastapi import APIRouter, Request, Depends
			
 
				+from starlette.templating import Jinja2Templates
			
 
				+from fastapi.responses import RedirectResponse
			
 
				 from common.security import valid_access_token
			
 
				 from .login import router as login_router
			
 
				-
			
 
				 from . import gateway
			
 
				 from . import dataAnalysis
			
 
				 from . import resourceMonitoring
			
@@ -35,6 +36,12 @@ from routers.prod_api import auth
 
				 
			
 
				 router = APIRouter()
			
 
				 
			
 
				+@router.get("/yzy/callback.html")
			
 
				+async def callback(request: Request, code: str, state: str):
			
 
				+    # 转会vue URL格式
			
 
				+    url="/yjxp/#/yzy/callback?code="+code+"&state="+state
			
 
				+    return RedirectResponse(url)
			
 
				+
			
 
				 router.include_router(auth.router, prefix="/auth")
			
 
				 
			
 
				 router.include_router(system.router, prefix="/system")#, dependencies=[Depends(valid_access_token)])
			
--- a/routers/prod_api/__init__.py
+++ b/routers/prod_api/__init__.py
@@ -5,7 +5,6 @@ from common.security import valid_access_token
 
				 from routers.api import upload_file
			
 
				 from . import system
			
 
				 from . import auth
			
 
				-from . import yzy
			
 
				 from . import zwrz
			
 
				 
			
 
				 router = APIRouter()
			
@@ -16,6 +15,4 @@ router.include_router(system.router, prefix="/system")#, dependencies=[Depends(v
 
				 
			
 
				 router.include_router(upload_file.router, prefix="/file")
			
 
				 
			
 
				-router.include_router(yzy.router, prefix="/yzy")
			
 
				-
			
 
				 router.include_router(zwrz.router)
			
--- a/routers/prod_api/yzy.py
+++ b/routers/prod_api/yzy.py
@@ -1,14 +0,0 @@
 
				-# -*- coding: utf-8 -*-
			
 
				-
			
 
				-from fastapi import APIRouter, Request
			
 
				-from starlette.templating import Jinja2Templates
			
 
				-
			
 
				-router = APIRouter()
			
 
				-
			
 
				-templates = Jinja2Templates(directory="templates")
			
 
				-
			
 
				-@router.get("/callback.html")
			
 
				-async def callback(request: Request):
			
 
				-    return templates.TemplateResponse("yzy/callback.html", {
			
 
				-            "request": request
			
 
				-        })
			
--- a/static/jquery-3.7.1.min.js
+++ b/static/jquery-3.7.1.min.js
--- a/templates/yzy/callback.html
+++ b/templates/yzy/callback.html
@@ -3,7 +3,7 @@
 
				     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			
 
				     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				     <title>粤政易验证回调</title>
			
 
				-	<script src="/static/jquery-3.7.1.min.js"></script>
			
 
				+	<script src="./static/jquery-3.7.1.min.js"></script>
			
 
				 </head>
			
 
				 <body>
			
 
				 加载中...