Почетна Преглед Помоћ
Пријавите се
maoming
/
python-fastapi-mm-zhcs-yj-api
3
1
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

no message

libushang пре 5 месеци
родитељ
5f1db07095
комит
2d4479e688
6 измењених фајлова са 13 додато и 26 уклоњено
Један поглед Покажи статистику Diff
  1. 3 5
      .env
  2. 9 2
      routers/api/__init__.py
  3. 0 3
      routers/prod_api/__init__.py
  4. 0 14
      routers/prod_api/yzy.py
  5. 0 1
      static/jquery-3.7.1.min.js
  6. 1 1
      templates/yzy/callback.html

+ 3 - 5
.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/#"
 
 DEV_YJXP_WEB_ROOT_PATH = "http://127.0.0.1:8086/yjxp/#"
 
 #粤政易APP回调地址
 
 #粤政易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/#"
 
 STAGE_YJXP_WEB_ROOT_PATH = "http://120.241.74.139:8086/yjxp/#"
 
 
 
 # 粤政易APP回调地址（域名和端口不能随便改，申请时定下来）
 
 # 粤政易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"
 
 
 
 #########################################################################
 
 #########################################################################
 
 # 生产环境配置
 
 # 生产环境配置

+ 9 - 2
routers/api/__init__.py
Прегледај датотеку 

@@ -1,9 +1,10 @@
 
 #!/usr/bin/env python3
 
 #!/usr/bin/env python3
 
 # -*- coding: utf-8 -*-
 
 # -*- 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 common.security import valid_access_token
 
 from .login import router as login_router
 
 from .login import router as login_router
 
-
 
 from . import gateway
 
 from . import gateway
 
 from . import dataAnalysis
 
 from . import dataAnalysis
 
 from . import resourceMonitoring
 
 from . import resourceMonitoring
 
@@ -35,6 +36,12 @@ from routers.prod_api import auth
 
 
 
 router = APIRouter()
 
 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(auth.router, prefix="/auth")
 
 
 
 router.include_router(system.router, prefix="/system")#, dependencies=[Depends(valid_access_token)])
 
 router.include_router(system.router, prefix="/system")#, dependencies=[Depends(valid_access_token)])

+ 0 - 3
routers/prod_api/__init__.py
Прегледај датотеку 

@@ -5,7 +5,6 @@ from common.security import valid_access_token
 
 from routers.api import upload_file
 
 from routers.api import upload_file
 
 from . import system
 
 from . import system
 
 from . import auth
 
 from . import auth
 
-from . import yzy
 
 from . import zwrz
 
 from . import zwrz
 
 
 
 router = APIRouter()
 
 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(upload_file.router, prefix="/file")
 
 
 
-router.include_router(yzy.router, prefix="/yzy")
 
-
 
 router.include_router(zwrz.router)
 
 router.include_router(zwrz.router)

+ 0 - 14
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
 
-        })

Разлика између датотеке није приказан због своје велике величине
+ 0 - 1
static/jquery-3.7.1.min.js


+ 1 - 1
templates/yzy/callback.html
Прегледај датотеку 

@@ -3,7 +3,7 @@
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <title>粤政易验证回调</title>
 
     <title>粤政易验证回调</title>
 
-	<script src="/static/jquery-3.7.1.min.js"></script>
 
+	<script src="./static/jquery-3.7.1.min.js"></script>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 加载中...
 
 加载中...

Неке датотеке нису приказане због велике количине промена