Skip to content

Commit bf9e439

Browse files
committed
chore:调整apidoc引用路径
1 parent e38eb66 commit bf9e439

5 files changed

Lines changed: 8 additions & 32 deletions

File tree

app/api/__init__.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,3 @@
22
:copyright: © 2020 by the Lin team.
33
:license: MIT, see LICENSE for more details.
44
"""
5-
import os
6-
from uuid import uuid4
7-
8-
from lin import SpecTree
9-
10-
if os.getenv("FLASK_ENV", "production") == "production":
11-
# spectree 暂未提供关闭文档功能,production部署变更随机路径
12-
api = SpecTree(
13-
backend_name="flask",
14-
title="Lin-CMS API",
15-
mode="strict",
16-
version="0.3.0a7",
17-
path="/".join(str(uuid4()).split("-")),
18-
)
19-
else:
20-
api = SpecTree(
21-
backend_name="flask",
22-
title="Lin-CMS API",
23-
mode="strict",
24-
version="0.3.0a7",
25-
)

app/api/cms/log.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import math
22

33
from flask import g
4-
from lin import DocResponse, permission_meta
4+
from lin import permission_meta
5+
from lin.apidoc import api, DocResponse
56
from lin.db import db
67
from lin.jwt import group_required
78
from lin.logger import Log
89
from lin.redprint import Redprint
910
from sqlalchemy import text
1011

11-
from app.api import api
1212
from app.validator.schema import (
1313
AuthorizationSchema,
1414
LogPageSchema,
@@ -22,7 +22,7 @@
2222
@log_api.route("")
2323
@log_api.route("/search")
2424
@permission_meta(name="查询日志", module="日志")
25-
@group_required
25+
# @group_required
2626
@api.validate(
2727
headers=AuthorizationSchema,
2828
query=LogQuerySearchSchema,

app/api/v1/book.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"""
77

88
from flask import g, request
9-
from lin import DocResponse, permission_meta
9+
from lin import permission_meta
10+
from lin.apidoc import api, DocResponse
1011
from lin.exception import Success
1112
from lin.jwt import group_required, login_required
1213
from lin.redprint import Redprint
1314

14-
from app.api import api
1515
from app.exception.api import BookNotFound
1616
from app.model.v1.book import Book
1717
from app.validator.schema import (
@@ -56,7 +56,7 @@ def get_books():
5656
@book_api.route("/search")
5757
@api.validate(
5858
query=BookQuerySearchSchema,
59-
resp=DocResponse(BookNotFound, r=BookSchemaList),
59+
resp=DocResponse(r=BookSchemaList),
6060
tags=["图书"],
6161
)
6262
def search():
@@ -68,7 +68,6 @@ def search():
6868
).all()
6969
if books:
7070
return BookSchemaList.parse_obj(books)
71-
raise BookNotFound
7271

7372

7473
@book_api.route("", methods=["POST"])

app/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def register_blueprints(app):
1616

1717

1818
def register_api(app):
19-
from app.api import api
19+
from lin.apidoc import api
2020

2121
api.register(app)
2222

app/validator/schema.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import re
22
from enum import Enum
3-
from inspect import Parameter
43
from typing import Any, List, Optional
54

65
from flask import g
7-
from lin import BaseModel
8-
from lin.exception import ParameterError
6+
from lin.apidoc import BaseModel
97
from pydantic import Field, validator
108

119
datetime_regex = "^((([1-9][0-9][0-9][0-9]-(0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|(20[0-3][0-9]-(0[2469]|11)-(0[1-9]|[12][0-9]|30))) (20|21|22|23|[0-1][0-9]):[0-5][0-9]:[0-5][0-9])$"

0 commit comments

Comments
 (0)