Skip to content

Commit cc06a68

Browse files
flytrapflytrap
committed
new: 增加api前缀
1 parent eeb70c7 commit cc06a68

6 files changed

Lines changed: 109 additions & 149 deletions

File tree

‎.github/workflows/docker-image.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,27 @@ name: Build and push Docker image
33
on:
44
workflow_dispatch:
55
push:
6-
branches:
7-
- master
6+
tags:
7+
- "v*.*.*"
88

99
jobs:
1010
buildx:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
with:
1616
submodules: true
1717

1818
- name: Set up QEMU
1919
uses: docker/setup-qemu-action@v2
2020

2121
- name: Set up Docker Buildx
22-
uses: docker/setup-buildx-action@v2
22+
uses: docker/setup-buildx-action@v3
23+
24+
- name: Extract tag name
25+
id: tag
26+
run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
2327

2428
- name: Cache Docker layers
2529
uses: actions/cache@v3
@@ -30,18 +34,20 @@ jobs:
3034
${{ runner.os }}-buildx-
3135
3236
- name: Login to DockerHub
33-
uses: docker/login-action@v2
37+
uses: docker/login-action@v3
3438
with:
35-
username: ${{ secrets.DOCKER_USERNAME }}
36-
password: ${{ secrets.DOCKER_PASSWORD }}
39+
username: ${{ secrets.DOCKERHUB_USERNAME }}
40+
password: ${{ secrets.DOCKERHUB_TOKEN }}
3741

3842
- name: Build and push
39-
uses: docker/build-push-action@v4
43+
uses: docker/build-push-action@v6
4044
with:
4145
context: .
4246
platforms: linux/amd64,linux/arm64
4347
push: true
44-
tags: ${{ secrets.DOCKER_USERNAME }}/filecodebox:beta
48+
tags: |
49+
${{ secrets.DOCKERHUB_USERNAME }}/filecodebox:${{ env.TAG }}
50+
${{ secrets.DOCKERHUB_USERNAME }}/filecodebox:latest
4551
cache-from: type=local,src=/tmp/.buildx-cache
4652
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
4753
- name: Move cache

‎.github/workflows/docs.yml‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.10.17

‎apps/admin/views.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from apps.admin.dependencies import create_token
1919
from core.settings import settings
2020

21-
admin_api = APIRouter(prefix="/admin", tags=["管理"])
21+
admin_api = APIRouter(prefix="/api/admin", tags=["管理"])
2222

2323

2424
@admin_api.post("/login")
@@ -63,21 +63,21 @@ async def dashboard(admin: bool = Depends(admin_required)):
6363

6464
@admin_api.delete("/file/delete")
6565
async def file_delete(
66-
data: IDData,
67-
file_service: FileService = Depends(get_file_service),
68-
admin: bool = Depends(admin_required),
66+
data: IDData,
67+
file_service: FileService = Depends(get_file_service),
68+
admin: bool = Depends(admin_required),
6969
):
7070
await file_service.delete_file(data.id)
7171
return APIResponse()
7272

7373

7474
@admin_api.get("/file/list")
7575
async def file_list(
76-
page: int = 1,
77-
size: int = 10,
78-
keyword: str = "",
79-
file_service: FileService = Depends(get_file_service),
80-
admin: bool = Depends(admin_required),
76+
page: int = 1,
77+
size: int = 10,
78+
keyword: str = "",
79+
file_service: FileService = Depends(get_file_service),
80+
admin: bool = Depends(admin_required),
8181
):
8282
files, total = await file_service.list_files(page, size, keyword)
8383
return APIResponse(
@@ -92,17 +92,17 @@ async def file_list(
9292

9393
@admin_api.get("/config/get")
9494
async def get_config(
95-
config_service: ConfigService = Depends(get_config_service),
96-
admin: bool = Depends(admin_required),
95+
config_service: ConfigService = Depends(get_config_service),
96+
admin: bool = Depends(admin_required),
9797
):
9898
return APIResponse(detail=config_service.get_config())
9999

100100

101101
@admin_api.patch("/config/update")
102102
async def update_config(
103-
data: dict,
104-
config_service: ConfigService = Depends(get_config_service),
105-
admin: bool = Depends(admin_required),
103+
data: dict,
104+
config_service: ConfigService = Depends(get_config_service),
105+
admin: bool = Depends(admin_required),
106106
):
107107
data.pop("themesChoices")
108108
await config_service.update_config(data)
@@ -111,47 +111,47 @@ async def update_config(
111111

112112
@admin_api.get("/file/download")
113113
async def file_download(
114-
id: int,
115-
file_service: FileService = Depends(get_file_service),
116-
admin: bool = Depends(admin_required),
114+
id: int,
115+
file_service: FileService = Depends(get_file_service),
116+
admin: bool = Depends(admin_required),
117117
):
118118
file_content = await file_service.download_file(id)
119119
return file_content
120120

121121

122122
@admin_api.get("/local/lists")
123123
async def get_local_lists(
124-
local_file_service: LocalFileService = Depends(get_local_file_service),
125-
admin: bool = Depends(admin_required),
124+
local_file_service: LocalFileService = Depends(get_local_file_service),
125+
admin: bool = Depends(admin_required),
126126
):
127127
files = await local_file_service.list_files()
128128
return APIResponse(detail=files)
129129

130130

131131
@admin_api.delete("/local/delete")
132132
async def delete_local_file(
133-
item: DeleteItem,
134-
local_file_service: LocalFileService = Depends(get_local_file_service),
135-
admin: bool = Depends(admin_required),
133+
item: DeleteItem,
134+
local_file_service: LocalFileService = Depends(get_local_file_service),
135+
admin: bool = Depends(admin_required),
136136
):
137137
result = await local_file_service.delete_file(item.filename)
138138
return APIResponse(detail=result)
139139

140140

141141
@admin_api.post("/local/share")
142142
async def share_local_file(
143-
item: ShareItem,
144-
file_service: FileService = Depends(get_file_service),
145-
admin: bool = Depends(admin_required),
143+
item: ShareItem,
144+
file_service: FileService = Depends(get_file_service),
145+
admin: bool = Depends(admin_required),
146146
):
147147
share_info = await file_service.share_local_file(item)
148148
return APIResponse(detail=share_info)
149149

150150

151151
@admin_api.patch("/file/update")
152152
async def update_file(
153-
data: UpdateFileData,
154-
admin: bool = Depends(admin_required),
153+
data: UpdateFileData,
154+
admin: bool = Depends(admin_required),
155155
):
156156
file_code = await FileCodes.filter(id=data.id).first()
157157
if not file_code:

0 commit comments

Comments
 (0)